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

bug--后台修改会员的折扣，老会员不会生效的问题

Browse Source
This commit is contained in:
xuwenbo
2020-05-26 09:20:32 +08:00
parent f3f0b248cf
commit 935e6da667
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,15 +32,9 @@ import co.yixiang.modules.security.service.OnlineUserService;
import co.yixiang.modules.shop.service.YxStoreCouponUserService; import co.yixiang.modules.shop.service.YxStoreCouponUserService;
import co.yixiang.modules.shop.service.YxSystemConfigService; import co.yixiang.modules.shop.service.YxSystemConfigService;
import co.yixiang.modules.shop.service.YxSystemStoreStaffService; import co.yixiang.modules.shop.service.YxSystemStoreStaffService;
import co.yixiang.modules.user.entity.YxUser; import co.yixiang.modules.user.entity.*;
import co.yixiang.modules.user.entity.YxUserBill;
import co.yixiang.modules.user.entity.YxUserLevel;
import co.yixiang.modules.user.entity.YxWechatUser;
import co.yixiang.modules.user.mapper.YxUserMapper; import co.yixiang.modules.user.mapper.YxUserMapper;
import co.yixiang.modules.user.service.YxUserBillService; import co.yixiang.modules.user.service.*;
import co.yixiang.modules.user.service.YxUserLevelService;
import co.yixiang.modules.user.service.YxUserService;
import co.yixiang.modules.user.service.YxWechatUserService;
import co.yixiang.modules.user.web.dto.PromUserDTO; import co.yixiang.modules.user.web.dto.PromUserDTO;
import co.yixiang.modules.user.web.param.PromParam; import co.yixiang.modules.user.web.param.PromParam;
import co.yixiang.modules.user.web.param.YxUserQueryParam; import co.yixiang.modules.user.web.param.YxUserQueryParam;
@ -101,6 +95,8 @@ public class YxUserServiceImpl extends BaseServiceImpl<YxUserMapper, YxUser> imp
@Autowired @Autowired
private YxUserLevelService userLevelService; private YxUserLevelService userLevelService;
@Autowired @Autowired
private YxSystemUserLevelService systemUserLevelService;
@Autowired
private YxStoreCouponUserService storeCouponUserService; private YxStoreCouponUserService storeCouponUserService;
@Autowired @Autowired
private YxSystemStoreStaffService systemStoreStaffService; private YxSystemStoreStaffService systemStoreStaffService;
@ -134,8 +130,10 @@ public class YxUserServiceImpl extends BaseServiceImpl<YxUserMapper, YxUser> imp
wrapper.eq("is_del",0).eq("status",1) wrapper.eq("is_del",0).eq("status",1)
.eq("uid",uid).orderByDesc("grade").last("limit 1"); .eq("uid",uid).orderByDesc("grade").last("limit 1");
YxUserLevel userLevel = userLevelService.getOne(wrapper); YxUserLevel userLevel = userLevelService.getOne(wrapper);
YxSystemUserLevel systemUserLevel = new YxSystemUserLevel();
if(ObjectUtil.isNotNull(userLevel)) systemUserLevel= systemUserLevelService.getById(userLevel.getLevelId());
int discount = 100; int discount = 100;
if(ObjectUtil.isNotNull(userLevel)) discount = userLevel.getDiscount(); if(ObjectUtil.isNotNull(userLevel)) discount = systemUserLevel.getDiscount().intValue();
return NumberUtil.mul(NumberUtil.div(discount,100),price); return NumberUtil.mul(NumberUtil.div(discount,100),price);
} }

2
yshop-api/src/main/java/co/yixiang/modules/user/web/vo/YxUserQueryVo.java
View File

@ -155,4 +155,4 @@ public class YxUserQueryVo implements Serializable {
private String vipName; private String vipName;
} }