From 449db66e2ca662cdc1a69131a38211daa91c776e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Fri, 12 Sep 2025 10:52:55 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B6=85=E7=BA=A7=E4=BC=9A=E5=91=98=E8=B4=AD?= =?UTF-8?q?=E4=B9=B0=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/czg/market/dto/MemberLevelDTO.java | 2 ++ .../com/czg/market/entity/MemberExpFlow.java | 2 +- .../czg/market/entity/MemberLevelConfig.java | 3 ++ .../java/com/czg/market/vo/MemberLevelVO.java | 2 ++ .../impl/TbMemberConfigServiceImpl.java | 36 ++++++++++++------- 5 files changed, 31 insertions(+), 14 deletions(-) diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MemberLevelDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MemberLevelDTO.java index 7c9d10f6..1e5f8d06 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MemberLevelDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MemberLevelDTO.java @@ -79,6 +79,8 @@ public class MemberLevelDTO { */ private List cycleRewardCouponList; + @NotNull(message = "是否启用消费送积分不为空") + private Integer isCostRewardPoints; @Data public static class ConfigCoupon { diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MemberExpFlow.java b/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MemberExpFlow.java index ee12d0ff..3711d70e 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MemberExpFlow.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MemberExpFlow.java @@ -52,7 +52,7 @@ public class MemberExpFlow implements Serializable { /** * 赠送数量 */ - private Integer value; + private Long value; /** * 来源id diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MemberLevelConfig.java b/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MemberLevelConfig.java index 5f0fc23e..68f71ab1 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MemberLevelConfig.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MemberLevelConfig.java @@ -101,4 +101,7 @@ public class MemberLevelConfig implements Serializable { @Column(onInsertValue = "now()", onUpdateValue = "now()") private LocalDateTime updateTime; + private Integer isCostRewardPoints; + + } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/vo/MemberLevelVO.java b/cash-common/cash-common-service/src/main/java/com/czg/market/vo/MemberLevelVO.java index 54a6708e..9094127e 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/vo/MemberLevelVO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/vo/MemberLevelVO.java @@ -83,4 +83,6 @@ public class MemberLevelVO implements Serializable { * 修改时间 */ private LocalDateTime updateTime; + + private Integer isCostRewardPoints; } 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 a8850e02..cdf2be70 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 @@ -12,6 +12,7 @@ import com.czg.market.dto.MemberLevelDTO; import com.czg.account.entity.*; import com.czg.account.service.*; import com.czg.market.entity.*; +import com.czg.market.service.MemberExpFlowService; import com.czg.market.service.MemberOrderService; import com.czg.market.vo.MemberConfigVO; import com.czg.market.vo.MemberLevelVO; @@ -63,6 +64,8 @@ public class TbMemberConfigServiceImpl extends ServiceImpl { if (memberConfig.getCostReward() != null) { exp = money.longValue() * memberConfig.getCostReward(); } // 消费送积分 - if (levelConfig.getCostRewardPoints() != null) { - points = (int) (money.floatValue() / levelConfig.getCostRewardPoints()); + if (levelConfig.getIsCostRewardPoints() == 1 && levelConfig.getCostRewardPoints() != null) { + int points = (int) (money.floatValue() / levelConfig.getCostRewardPoints()); memberPointsService.addPoints(shopUser.getId(), points, "会员消费送积分", null); } } @@ -242,19 +244,27 @@ public class TbMemberConfigServiceImpl extends ServiceImpl { - exp = expVal; - } + case PAY -> exp = expVal; } - MemberExpFlow expFlow = new MemberExpFlow(); - expFlow.setContent(type.getMsg() + 1); - expFlow.setType("+"); - expFlow.setUserId(userId); - expFlow.setShopId(shopId); - expFlow.setMoney(money); - return false; + if (exp > 0) { + MemberExpFlow expFlow = new MemberExpFlow(); + expFlow.setContent(type.getMsg() + exp); + expFlow.setType("+"); + expFlow.setUserId(userId); + expFlow.setShopId(shopId); + expFlow.setMoney(money); + expFlow.setValue(exp); + memberExpFlowService.save(expFlow); + + // 修改会员等级 + levelConfigService.getOne(new QueryWrapper().eq(MemberLevelConfig::getShopId, shopId).gt(MemberLevelConfig::getExperienceValue, levelConfig.getExperienceValue())); + + shopUser.setExperience(shopUser.getExperience() + exp); + } + + return true; } @Override