礼品管理网点，积分字段修改

yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/mq/consumer/score/core/RecommendStrategy.java

@@ -10,7 +10,6 @@ import cn.iocoder.yudao.module.member.mq.message.ScoreMessage;
 import cn.iocoder.yudao.module.member.service.scoreLog.MemberUserScoreLogService;
 import cn.iocoder.yudao.module.member.service.scoreRule.ScoreRuleService;
 import cn.iocoder.yudao.module.member.service.user.MemberUserService;
-import cn.iocoder.yudao.module.member.util.ReferralCodeUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 

yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/service/scoreRule/ScoreRuleServiceImpl.java

@@ -417,7 +417,6 @@ public class ScoreRuleServiceImpl extends AbstractService<ScoreRuleMapper, Score
                 return null;
             }
             scoreRuleRedisDao.setEnableScoreRule(enableScoreRule);
-            // 校验一下活动开始结束时间
         }
         if (!enableScoreRule.getEndTime().after(new Date()) || !enableScoreRule.getStartTime().before(new Date())) {
             return null;
@@ -457,6 +456,7 @@ public class ScoreRuleServiceImpl extends AbstractService<ScoreRuleMapper, Score
         );
         return list.stream().map(this::convertToSimpleVO).collect(Collectors.toList());
     }
+
     private WarehouseTreeRegionSimpleVO convertToSimpleVO(WarehouseTreeRegionVO regionVO) {
         WarehouseTreeRegionSimpleVO simpleVO = new WarehouseTreeRegionSimpleVO();
         simpleVO.setId(regionVO.getGuojia());

yudao-module-reward/yudao-module-reward-impl/src/main/java/cn/iocoder/yudao/module/reward/controller/admin/reward/RewardController.java

@@ -88,6 +88,10 @@ public class RewardController {
     public CommonResult<PageResult<RewardBackVO>> getPage(@Valid @RequestBody RewardQueryVO query, PageVO page) {
         PageResult<RewardDO> pageResult = rewardService.getPage(query, page);
         PageResult<RewardBackVO> rewardBackVOPageResult = RewardConvert.INSTANCE.convertPage(pageResult);
+        // 转换nodeId和points
+        rewardBackVOPageResult.getList().forEach(rewardBackVO -> {
+            rewardBackVO.getNodeIds().add(new RewardBackVO.NodeAndPoints(rewardBackVO.getNodeId(), rewardBackVO.getPointsRequire()));
+        });
         return success(rewardBackVOPageResult);
     }
 

yudao-module-reward/yudao-module-reward-impl/src/main/java/cn/iocoder/yudao/module/reward/service/reward/RewardServiceImpl.java

@@ -122,8 +122,17 @@ public class RewardServiceImpl extends AbstractService<RewardMapper, RewardDO> i
             } else {
                 throw exception(REWARD_START_OR_END_TIME_NOT_ALLOW);
             }
+            List<RewardCreateReqVO.NodeAndPoints> nodeIds = updateReqVO.getNodeIds();
+            if (CollectionUtil.isEmpty(nodeIds)) {
+                throw exception(REWARD_NODE_AND_POINTS_LIST_ERROR);
+            }
+            RewardCreateReqVO.NodeAndPoints nodeAndPoints = nodeIds.get(0);
             updateObj = RewardConvert.INSTANCE.convert(updateReqVO);
-        } else if (rewardDO.getStatus() == RewardStatusEnum.ENABLED.getValue()) { //已启用可编辑剩余数量和备注
+            updateObj.setPointsRequire(nodeAndPoints.getPoints());
+            updateObj.setNodeId(nodeAndPoints.getNodeId());
+
+            //已启用可编辑剩余数量和备注
+        } else if (rewardDO.getStatus() == RewardStatusEnum.ENABLED.getValue()) {
             updateObj.setQuantityRemain(updateReqVO.getQuantityRemain());
             updateObj.setRemarkEn(updateReqVO.getRemarkEn());
             updateObj.setRemarkFr(updateReqVO.getRemarkFr());

yudao-module-reward/yudao-module-reward-impl/src/main/java/cn/iocoder/yudao/module/reward/vo/reward/RewardBackVO.java

@@ -4,9 +4,13 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.fastjson.JSONArray;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import javax.validation.constraints.NotNull;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -60,6 +64,9 @@ public class RewardBackVO {
     @ApiModelProperty(value = "兑换网点", required = true)
     private Integer nodeId;
 
+    @ApiModelProperty(value = "兑换网点和积分列表", required = true)
+    private List<RewardBackVO.NodeAndPoints> nodeIds = new ArrayList<>();
+
     @ExcelProperty("已兑换次数")
     @ApiModelProperty(value = "已兑换次数")
     private Integer exchangeCount;
@@ -111,4 +118,13 @@ public class RewardBackVO {
     @ApiModelProperty(value = "创建时间", required = true)
     private Date createTime;
 
+    @Data
+    @AllArgsConstructor
+    @NoArgsConstructor
+    public static class NodeAndPoints {
+        @ApiModelProperty(value = "兑换网点")
+        private Integer nodeId;
+        @ApiModelProperty(value = "兑换网点对应积分")
+        private Integer points;
+    }
 }

yudao-module-reward/yudao-module-reward-impl/src/main/java/cn/iocoder/yudao/module/reward/vo/reward/RewardUpdateReqVO.java

@@ -10,6 +10,7 @@ import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import java.util.Date;
+import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
@@ -43,12 +44,15 @@ public class RewardUpdateReqVO {
     @ApiModelProperty(value = "法文礼品图片")
     private String imgFr;
 
-    @ApiModelProperty(value = "兑换所需积分")
-    @Min(value = 0)
-    private Integer pointsRequire;
+    //@ApiModelProperty(value = "兑换所需积分")
+    //@Min(value = 0)
+    //private Integer pointsRequire;
+    //@ApiModelProperty(value = "兑换网点")
+    //private Integer nodeId;
 
-    @ApiModelProperty(value = "兑换网点")
-    private Integer nodeId;
+    @ApiModelProperty(value = "兑换网点和积分列表", required = true)
+    @NotNull(message = "兑换网点列表不能为空")
+    private List<RewardCreateReqVO.NodeAndPoints> nodeIds;
 
     @ApiModelProperty(value = "剩余数量")
     @Min(value = 0)
@@ -80,4 +84,12 @@ public class RewardUpdateReqVO {
     @ApiModelProperty(value = "法文备注")
     @Size(max = 500, message = "法文备注长度不能超过500")
     private String remarkFr;
+
+    @Data
+    public static class NodeAndPoints {
+        @ApiModelProperty(value = "兑换网点")
+        private Integer nodeId;
+        @ApiModelProperty(value = "兑换网点对应积分")
+        private Integer points;
+    }
 }