超级会员购买相关

cash-common/cash-common-service/src/main/java/com/czg/market/dto/MemberLevelDTO.java

@@ -79,6 +79,8 @@ public class MemberLevelDTO {
      */
 
     private List<ConfigCoupon> cycleRewardCouponList;
+    @NotNull(message = "是否启用消费送积分不为空")
+    private Integer isCostRewardPoints;
 
     @Data
     public static class ConfigCoupon {

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

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;
+
+
 }

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;
 }

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<TbMemberConfigMapper,
     private MemberPointsService memberPointsService;
     @Resource
     private MemberOrderService memberOrderService;
+    @Resource
+    private MemberExpFlowService memberExpFlowService;
 
     @Override
     public MemberConfigVO detail(Long shopId) {
@@ -225,15 +228,14 @@ public class TbMemberConfigServiceImpl extends ServiceImpl<TbMemberConfigMapper,
 
 
         long exp = 0;
-        int points = 0;
         switch (type) {
             case COST -> {
                 if (memberConfig.getCostReward() != null) {
                     exp = money.longValue() * memberConfig.getCostReward();
                 }
                 // 消费送积分
-                if (levelConfig.getCostRewardPoints() != null) {
+                if (levelConfig.getIsCostRewardPoints() == 1 && levelConfig.getCostRewardPoints() != null) {
-                    points = (int) (money.floatValue() / levelConfig.getCostRewardPoints());
+                    int points = (int) (money.floatValue() / levelConfig.getCostRewardPoints());
                     memberPointsService.addPoints(shopUser.getId(), points, "会员消费送积分", null);
                 }
             }
@@ -242,19 +244,27 @@ public class TbMemberConfigServiceImpl extends ServiceImpl<TbMemberConfigMapper,
                     exp = money.longValue() * memberConfig.getRechargeReward();
                 }
             }
-            case PAY -> {
+            case PAY -> exp = expVal;
-                exp = expVal;
-            }
 
         }
 
-        MemberExpFlow expFlow = new MemberExpFlow();
+        if (exp > 0) {
-        expFlow.setContent(type.getMsg() + 1);
+            MemberExpFlow expFlow = new MemberExpFlow();
-        expFlow.setType("+");
+            expFlow.setContent(type.getMsg() + exp);
-        expFlow.setUserId(userId);
+            expFlow.setType("+");
-        expFlow.setShopId(shopId);
+            expFlow.setUserId(userId);
-        expFlow.setMoney(money);
+            expFlow.setShopId(shopId);
-        return false;
+            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