cxc/yshopb2c
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

#I1FP6U 修复bug：确认收货 等操作完成后，直接检查升级，不需要用户再到会员中心看两次才能升级；

Browse Source
This commit is contained in:
xwb
2020-04-29 11:18:52 +08:00
parent 2e49b9b971
commit 730fa1766e
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
yshop-api/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java
View File

@ -52,10 +52,7 @@ import co.yixiang.modules.shop.web.vo.YxSystemStoreQueryVo;
import co.yixiang.modules.user.entity.YxUser; import co.yixiang.modules.user.entity.YxUser;
import co.yixiang.modules.user.entity.YxUserBill; import co.yixiang.modules.user.entity.YxUserBill;
import co.yixiang.modules.user.entity.YxWechatUser; import co.yixiang.modules.user.entity.YxWechatUser;
import co.yixiang.modules.user.service.YxUserAddressService; import co.yixiang.modules.user.service.*;
import co.yixiang.modules.user.service.YxUserBillService;
import co.yixiang.modules.user.service.YxUserService;
import co.yixiang.modules.user.service.YxWechatUserService;
import co.yixiang.modules.user.web.vo.YxUserAddressQueryVo; import co.yixiang.modules.user.web.vo.YxUserAddressQueryVo;
import co.yixiang.modules.user.web.vo.YxUserQueryVo; import co.yixiang.modules.user.web.vo.YxUserQueryVo;
import co.yixiang.modules.user.web.vo.YxWechatUserQueryVo; import co.yixiang.modules.user.web.vo.YxWechatUserQueryVo;
@ -164,8 +161,8 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl<YxStoreOrderMapper,
private YxMiniPayService miniPayService; private YxMiniPayService miniPayService;
@Autowired @Autowired
private YxTemplateService templateService; private YxTemplateService templateService;
@Autowired
private YxUserLevelService userLevelService;
/** /**
@ -590,6 +587,8 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl<YxStoreOrderMapper,
//分销计算 //分销计算
userService.backOrderBrokerage(order); userService.backOrderBrokerage(order);
//检查是否符合会员升级条件
userLevelService.setLevelComplete(uid);
} }
/** /**
@ -614,6 +613,9 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl<YxStoreOrderMapper,
//分销计算 //分销计算
userService.backOrderBrokerage(order); userService.backOrderBrokerage(order);
//检查是否符合会员升级条件
userLevelService.setLevelComplete(order.getUid());
} }
/** /**

6
yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserSignServiceImpl.java
View File

@ -22,6 +22,7 @@ import co.yixiang.modules.user.entity.YxUserSign;
import co.yixiang.modules.user.mapper.YxUserBillMapper; import co.yixiang.modules.user.mapper.YxUserBillMapper;
import co.yixiang.modules.user.mapper.YxUserSignMapper; import co.yixiang.modules.user.mapper.YxUserSignMapper;
import co.yixiang.modules.user.service.YxUserBillService; import co.yixiang.modules.user.service.YxUserBillService;
import co.yixiang.modules.user.service.YxUserLevelService;
import co.yixiang.modules.user.service.YxUserService; import co.yixiang.modules.user.service.YxUserService;
import co.yixiang.modules.user.service.YxUserSignService; import co.yixiang.modules.user.service.YxUserSignService;
import co.yixiang.modules.user.web.dto.SignDTO; import co.yixiang.modules.user.web.dto.SignDTO;
@ -65,8 +66,7 @@ public class YxUserSignServiceImpl extends BaseServiceImpl<YxUserSignMapper, YxU
private YxSystemGroupDataService systemGroupDataService; private YxSystemGroupDataService systemGroupDataService;
private YxUserService yxUserService; private YxUserService yxUserService;
private YxUserBillService billService; private YxUserBillService billService;
private YxUserLevelService userLevelService;
/** /**
* 用户签到 * 用户签到
@ -132,6 +132,8 @@ public class YxUserSignServiceImpl extends BaseServiceImpl<YxUserSignMapper, YxU
userBill.setAddTime(OrderUtil.getSecondTimestampTwo()); userBill.setAddTime(OrderUtil.getSecondTimestampTwo());
billService.save(userBill); billService.save(userBill);
//检查是否符合会员升级条件
userLevelService.setLevelComplete(uid);
return signNumber; return signNumber;
} }