Merge branch 'feature_member_score_zby' into feature_member_score

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

@@ -86,14 +86,14 @@ public class RedeemRewardController {
 
     @PostMapping("record/cancel/check")
     @ApiOperation("撤销检查")
-    public CommonResult<RedeemCancelCheckRespVO> cancelCheck(@Valid @RequestBody List<Long> ids) {
-        return success(rewardRedeemService.cancelCheck(ids));
+    public CommonResult<RedeemCancelCheckRespVO> cancelCheck(@Valid @RequestBody RewardRedeemIdReqVO req) {
+        return success(rewardRedeemService.cancelCheck(req));
     }
 
     @PostMapping("record/cancel")
     @ApiOperation("撤销")
-    public CommonResult<Boolean> cancel(@Valid @RequestBody List<Long> ids) {
-        return success(rewardRedeemService.cancel(ids));
+    public CommonResult<Boolean> cancel(@Valid @RequestBody RewardRedeemIdReqVO req) {
+        return success(rewardRedeemService.cancel(req));
     }
 
     @PostMapping("record/import/template")

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

@@ -34,7 +34,7 @@ public interface RewardRedeemService extends IService<RewardRedeemDO> {
 
     RecordInfoImportRespVO recordImport(List<RedeemInfoImportExcelVO> dataList);
 
-    Boolean cancel(List<Long> ids);
+    Boolean cancel(RewardRedeemIdReqVO req);
 
-    RedeemCancelCheckRespVO cancelCheck(List<Long> ids);
+    RedeemCancelCheckRespVO cancelCheck(RewardRedeemIdReqVO req);
 }

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

@@ -245,16 +245,12 @@ public class RewardRedeemServiceImpl extends AbstractService<RewardRedeemMapper,
     }
 
     @Override
-    public Boolean cancel(List<Long> ids) {
-        if (CollectionUtils.isEmpty(ids)) {
-            throw exception(ErrorCodeConstants.REWARD_REDEEM_NOT_EXIST);
-        }
-        ids.forEach(id -> {
+    public Boolean cancel(RewardRedeemIdReqVO req) {
         //取消兑换 状态改为已取消 回退扣减的积分 ，如果存在已过期的积分，则直接过期
-            if (id == null) {
+        if (req.getId() == null) {
             throw exception(ErrorCodeConstants.REWARD_REDEEM_NOT_EXIST);
         }
-            RewardRedeemDO rewardRedeemDO = this.getById(id);
+        RewardRedeemDO rewardRedeemDO = this.getById(req.getId());
         if (rewardRedeemDO == null) {
             throw exception(ErrorCodeConstants.REWARD_REDEEM_NOT_EXIST);
         }
@@ -262,7 +258,7 @@ public class RewardRedeemServiceImpl extends AbstractService<RewardRedeemMapper,
             throw exception(ErrorCodeConstants.REDEEM_CANCEL_STATUS_ERROR);
         }
         LambdaUpdateWrapper<RewardRedeemDO> updateWrapper = Wrappers.lambdaUpdate();
-            updateWrapper.eq(RewardRedeemDO::getId, id);
+        updateWrapper.eq(RewardRedeemDO::getId, req.getId());
         updateWrapper.eq(RewardRedeemDO::getStatus, RewardRedeemStatusEnum.REDEEMING.getValue());
         updateWrapper.set(RewardRedeemDO::getStatus, RewardRedeemStatusEnum.CANCELED.getValue());
         boolean updateSuccess = this.update(null, updateWrapper);
@@ -270,24 +266,20 @@ public class RewardRedeemServiceImpl extends AbstractService<RewardRedeemMapper,
             throw exception(ErrorCodeConstants.REDEEM_CANCEL_STATUS_ERROR);
         }
         Map<String, Object> extParam = new HashMap<>();
-            extParam.put("redeemId", id);
+        extParam.put("redeemId", req.getId());
         memberUserScoreApi.operateScore(MemberUserScoreOperateReqDTO.builder()
                 .memberId(rewardRedeemDO.getMemberId())
                 .sourceType(ScoreSourceTypeEnum.EXCHANGE_REWARD_CANCEL)
                 .scoreCount(rewardRedeemDO.getScoreCount())
                 .extParam(extParam)
-                    .releationId(String.valueOf(id))
+                .releationId(String.valueOf(req.getId()))
                 .build());
-        });
         return true;
     }
 
     @Override
-    public RedeemCancelCheckRespVO cancelCheck(List<Long> ids) {
-        if (CollectionUtils.isEmpty(ids)) {
-            throw exception(ErrorCodeConstants.REWARD_REDEEM_NOT_EXIST);
-        }
-        RewardRedeemDO rewardRedeemDO = this.getById(ids.get(0));
+    public RedeemCancelCheckRespVO cancelCheck(RewardRedeemIdReqVO req) {
+        RewardRedeemDO rewardRedeemDO = this.getById(req.getId());
         if (rewardRedeemDO == null) {
             throw exception(ErrorCodeConstants.REWARD_REDEEM_NOT_EXIST);
         }
@@ -295,7 +287,7 @@ public class RewardRedeemServiceImpl extends AbstractService<RewardRedeemMapper,
             throw exception(ErrorCodeConstants.REDEEM_CANCEL_STATUS_ERROR);
         }
         List<ReleationScoreExpireInfoDTO> scoreExpireInfo = memberUserScoreApi
-                .getScoreExpireInfo(String.valueOf(ids.get(0)), ScoreSourceTypeEnum.EXCHANGE_REWARD);
+                .getScoreExpireInfo(String.valueOf(req.getId()), ScoreSourceTypeEnum.EXCHANGE_REWARD);
         int totalExpireScore = scoreExpireInfo.stream().filter(e -> e.getExpireDate() != null && e.getExpireDate().compareTo(new Date()) < 0)
                 .mapToInt(ReleationScoreExpireInfoDTO::getScoreCount).sum();
         return RedeemCancelCheckRespVO.builder().expireCount(totalExpireScore).build();

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

+package cn.iocoder.yudao.module.reward.vo.reward;
+
+import lombok.Data;
+
+@Data
+public class RewardRedeemIdReqVO {
+    private Long id;
+}