Revert "礼品兑换网点修改"

This reverts commit 96aa5243.

yudao-module-reward/yudao-module-reward-impl/src/main/java/cn/iocoder/yudao/module/reward/dal/dataobject/reward/RewardDO.java

@@ -63,7 +63,7 @@ public class RewardDO extends BaseDO {
     /**
      * 兑换网点
      */
-    private String nodeId;
+    private Integer nodeId;
     /**
      * 已兑换次数
      */

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

@@ -24,7 +24,10 @@ import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
 import java.time.Instant;
-import java.util.*;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
 import java.util.stream.Collectors;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
@@ -170,8 +173,9 @@ public class RewardServiceImpl extends AbstractService<RewardMapper, RewardDO> i
                     .eq(query.getPointsRequireSymbol() == QuantitativeRelationSymbolEnum.EQ.getValue(), RewardDO::getPointsRequire, query.getPointsRequire())
                     .lt(query.getPointsRequireSymbol() == QuantitativeRelationSymbolEnum.LT.getValue(), RewardDO::getPointsRequire, query.getPointsRequire());
         }
-        //领取方式，状态
-        lambdaQuery.eqIfPresent(RewardDO::getPickMethod, query.getPickMethod())
+        //兑换网点id，领取方式，状态
+        lambdaQuery.eqIfPresent(RewardDO::getNodeId, query.getNodeId())
+                .eqIfPresent(RewardDO::getPickMethod, query.getPickMethod())
                 .eqIfPresent(RewardDO::getStatus, query.getStatus());
         //备注，模糊匹配三种语言
         if (query.getRemark() != null) {
@@ -195,10 +199,6 @@ public class RewardServiceImpl extends AbstractService<RewardMapper, RewardDO> i
         PageResult<RewardDO> rewardDOPageResult = rewardMapper.selectPage(page, lambdaQuery);
         //校验是否过期
         rewardDOPageResult.getList().forEach(this::validateExpire);
-        // 过滤兑换网点
-        if (query.getNodeId() != null) {
-            rewardDOPageResult.getList().removeIf(rewardDO -> !Arrays.asList(rewardDO.getNodeId().split(",")).contains(query.getNodeId().toString()));
-        }
         return rewardDOPageResult;
     }
 
@@ -295,9 +295,9 @@ public class RewardServiceImpl extends AbstractService<RewardMapper, RewardDO> i
             List<NodeRespDTO> nodes = null;
             // 如果用户没有填写国家或城市默认展示中国的礼品
             if (user.getCity() == null || user.getCountry() == null) {
-                nodes = nodeApi.getNodesByCity(null, 130L);
+                nodes = nodeApi.getNodesByCity(null,130L);
             } else {
-                nodes = nodeApi.getNodesByCity(user.getCity().longValue(), null);
+                nodes = nodeApi.getNodesByCity(user.getCity().longValue(),null);
             }
             if (CollectionUtil.isNotEmpty(nodes)) {
                 rewardDOLambdaQuery.in(RewardDO::getNodeId, nodes.stream().map(NodeRespDTO::getId).collect(Collectors.toList()));

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

@@ -58,7 +58,7 @@ public class RewardBackVO {
 
     @ExcelProperty("兑换网点")
     @ApiModelProperty(value = "兑换网点", required = true)
-    private String nodeId;
+    private Integer nodeId;
 
     @ExcelProperty("已兑换次数")
     @ApiModelProperty(value = "已兑换次数")

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

@@ -47,7 +47,7 @@ public class RewardCreateReqVO {
 
     @ApiModelProperty(value = "兑换网点", required = true)
     @NotNull(message = "兑换网点不能为空")
-    private String nodeId;
+    private Integer nodeId;
 
     @ApiModelProperty(value = "剩余数量", required = true)
     @NotNull(message = "剩余数量不能为空")

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

@@ -48,7 +48,7 @@ public class RewardUpdateReqVO {
     private Integer pointsRequire;
 
     @ApiModelProperty(value = "兑换网点")
-    private String nodeId;
+    private Integer nodeId;
 
     @ApiModelProperty(value = "剩余数量")
     @Min(value = 0)