修改

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/GameVipAddParam.java

@@ -37,17 +37,17 @@ public class GameVipAddParam {
     private Long parentGameId;
 
     /**
-     * 充值金额最小
+     * 充值金额最小(包含)
      */
     @NotNull(message = "充值金额最小不能为空")
-    @ApiModelProperty("充值金额最小")
+    @ApiModelProperty("充值金额最小(包含)")
     private BigDecimal rechargeMoneyMin;
 
     /**
-     * 充值金额最大
+     * 充值金额最大(不包含)
      */
     @NotNull(message = "充值金额最大不能为空")
-    @ApiModelProperty("充值金额最大")
+    @ApiModelProperty("充值金额最大(不包含)")
     private BigDecimal rechargeMoneyMax;
 
     /**

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/impl/GameVipServiceImpl.java

@@ -52,65 +52,43 @@ public class GameVipServiceImpl extends ServiceImpl<GameVipMapper, GameVip> impl
         if (param.getRechargeMoneyMax().compareTo(param.getRechargeMoneyMin()) <= 0) {
             throw new BaseException("档位参数设置有误，请重新输入。");
         }
-
         //当前操作时间
         LocalDateTime now = LocalDateTime.now();
-        if (null == param.getId()) {
-            //不传入id，说明是新增档位
-            int count = count(new LambdaQueryWrapper<GameVip>()
-                    .eq(GameVip::getSuperGameId, param.getSuperGameId())
-                    .eq(GameVip::getParentGameId, param.getParentGameId())
-                    .and(qw -> qw.eq(GameVip::getRechargeMoneyMin, param.getRechargeMoneyMin())
-                            .eq(GameVip::getRechargeMoneyMax, param.getRechargeMoneyMax())
-                            .or().eq(GameVip::getVipLevel, param.getVipLevel()))
-                    .eq(GameVip::getIsDelete, 0)
-            );
-            if (count > 0) {
-                throw new BaseException("该游戏的该档位区间或vip等级已经设置过，请勿重复设置");
-            }
-
-            //GameVip实体
-            GameVip gameVip = GameVip.builder()
-                    .parentGameId(param.getParentGameId())
-                    .superGameId(param.getSuperGameId())
-                    .rechargeMoneyMin(param.getRechargeMoneyMin())
-                    .rechargeMoneyMax(param.getRechargeMoneyMax())
-                    .vipLevel(param.getVipLevel())
-                    .createTime(now)
-                    .createBy(sysUserId)
-                    .updateTime(now)
-                    .updateBy(sysUserId)
-                    .build();
-            return save(gameVip);
-        } else {
-            //传入id，说明需要修改
-            int count = count(new LambdaQueryWrapper<GameVip>()
-                    .ne(GameVip::getId, param.getId())
-                    .eq(GameVip::getSuperGameId, param.getSuperGameId())
-                    .eq(GameVip::getParentGameId, param.getParentGameId())
-                    .and(qw -> qw.eq(GameVip::getRechargeMoneyMin, param.getRechargeMoneyMin())
-                            .eq(GameVip::getRechargeMoneyMax, param.getRechargeMoneyMax())
-                            .or().eq(GameVip::getVipLevel, param.getVipLevel()))
-                    .eq(GameVip::getIsDelete, 0)
-            );
-            if (count > 0) {
-                throw new BaseException("该游戏的该档位区间或vip等级已经设置过，请勿重复设置");
-            }
-
-            //GameVip实体
-            GameVip gameVip = GameVip.builder()
-                    .id(param.getId())
-                    .parentGameId(param.getParentGameId())
-                    .superGameId(param.getSuperGameId())
-                    .rechargeMoneyMin(param.getRechargeMoneyMin())
-                    .rechargeMoneyMax(param.getRechargeMoneyMax())
-                    .vipLevel(param.getVipLevel())
-                    .updateBy(sysUserId)
-                    .updateTime(now)
-                    .build();
 
+        //不传入id，说明是新增档位；传入id说明是修改档位
+        int count = count(new LambdaQueryWrapper<GameVip>()
+                .ne(param.getId() != null, GameVip::getId, param.getId())
+                .eq(GameVip::getSuperGameId, param.getSuperGameId())
+                .eq(GameVip::getParentGameId, param.getParentGameId())
+                .eq(GameVip::getVipLevel, param.getVipLevel())
+                .eq(GameVip::getIsDelete, 0)
+        );
+        if (count > 0) {
+            throw new BaseException("该游戏的vip等级已经设置过，请勿重复设置");
+        }
+
+        //GameVip实体
+        GameVip gameVip = GameVip.builder()
+                .parentGameId(param.getParentGameId())
+                .superGameId(param.getSuperGameId())
+                .rechargeMoneyMin(param.getRechargeMoneyMin())
+                .rechargeMoneyMax(param.getRechargeMoneyMax())
+                .vipLevel(param.getVipLevel())
+                .updateTime(now)
+                .updateBy(sysUserId)
+                .build();
+
+        //修改档位
+        if (param.getId() != null) {
+            gameVip.setId(param.getId());
             return updateById(gameVip);
         }
+
+        //新增档位
+        gameVip.setCreateBy(sysUserId);
+        gameVip.setCreateTime(now);
+        return save(gameVip);
+
     }
 
     @Override