diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopUser.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopUser.java index f1cd9ada3..832027941 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopUser.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopUser.java @@ -152,6 +152,8 @@ public class ShopUser implements Serializable { private LocalDateTime nextDeliverTime; // 是否分销员 private String distributionShops; + private String memberCircleName; + private Integer memberCircleReward; @Column(ignore = true) private String memberName; diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/vo/MemberDetailVO.java b/cash-common/cash-common-service/src/main/java/com/czg/market/vo/MemberDetailVO.java index 17f6fc225..49606a2cc 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/vo/MemberDetailVO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/vo/MemberDetailVO.java @@ -34,4 +34,6 @@ public class MemberDetailVO implements Serializable { private LocalDateTime endTime; private String memberName; + private String memberCircleName; + private Integer memberCircleReward; } diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AShopUserServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AShopUserServiceImpl.java index c309823ca..6967bc7a9 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AShopUserServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AShopUserServiceImpl.java @@ -99,6 +99,7 @@ public class AShopUserServiceImpl implements AShopUserService { PageInfo shopUserDTOPageInfo = new PageInfo<>(shopUserMapper.selectPageByKeyAndIsVip(mainIdByShopId, isVip, key, amount)); shopUserDTOPageInfo.getList().forEach(item -> { item.setNew(consumeDiscountService.isNewUser(item, StpKit.USER.getShopId())); + setUserDiscount(item); }); return PageUtil.convert(shopUserDTOPageInfo); } @@ -182,6 +183,16 @@ public class AShopUserServiceImpl implements AShopUserService { return shopUserService.save(shopUser); } + private void setUserDiscount(ShopUserDTO shopUserDTO) { + if (shopUserDTO.getMemberLevelId() != null) { + MemberLevelConfig memberLevelConfig = memberLevelConfigService.getById(shopUserDTO.getMemberLevelId()); + shopUserDTO.setMemberLevelName(memberLevelConfig == null ? null : memberLevelConfig.getName()); + if (memberLevelConfig != null) { + shopUserDTO.setDiscount(memberLevelConfig.getDiscount()); + } + } + } + @Override public ShopUser getDetail(Integer id, Integer userId) { Long mainId = shopInfoService.getMainIdByShopId(StpKit.USER.getShopId()); diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/TbMemberConfigServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/TbMemberConfigServiceImpl.java index 9a292db5d..b42a2d005 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/TbMemberConfigServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/TbMemberConfigServiceImpl.java @@ -331,7 +331,9 @@ public class TbMemberConfigServiceImpl extends ServiceImpl 0) { + memberPointsService.addPoints(shopUser.getId(), points, "会员消费送积分", null); + } } } case RECHARGE -> { @@ -441,7 +443,7 @@ public class TbMemberConfigServiceImpl extends ServiceImpl