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 RewardRedeemUpdateReqVO reqVO) {
-        return success(rewardRedeemService.cancelCheck(reqVO));
+    public CommonResult<RedeemCancelCheckRespVO> cancelCheck(@Valid @RequestBody List<Long> ids) {
+        return success(rewardRedeemService.cancelCheck(ids));
     }
 
     @PostMapping("record/cancel")
     @ApiOperation("撤销")
-    public CommonResult<Boolean> cancel(@Valid @RequestBody RewardRedeemUpdateReqVO reqVO) {
-        return success(rewardRedeemService.cancel(reqVO));
+    public CommonResult<Boolean> cancel(@Valid @RequestBody List<Long> ids) {
+        return success(rewardRedeemService.cancel(ids));
     }
 
     @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(RewardRedeemUpdateReqVO reqVO);
+    Boolean cancel(List<Long> ids);
 
-    RedeemCancelCheckRespVO cancelCheck(RewardRedeemUpdateReqVO reqVO);
+    RedeemCancelCheckRespVO cancelCheck(List<Long> ids);
 }

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

@@ -208,7 +208,7 @@ public class RewardRedeemServiceImpl extends AbstractService<RewardRedeemMapper,
     @Override
     public RecordInfoImportRespVO recordImport(List<RedeemInfoImportExcelVO> dataList) {
         if (CollectionUtils.isEmpty(dataList)) {
-            return RecordInfoImportRespVO.builder().build();
+            return RecordInfoImportRespVO.builder().redeemIdFailedMap(Collections.emptyMap()).build();
         }
         if (dataList.size() > MAX_IMPORT_RECORD_COUNT) {
             throw exception(ErrorCodeConstants.REDEEM_IMPORT_MAX_COUNT, MAX_IMPORT_RECORD_COUNT);
@@ -241,17 +241,20 @@ public class RewardRedeemServiceImpl extends AbstractService<RewardRedeemMapper,
             return rewardRedeemDO;
         }).collect(Collectors.toList());
         this.updateBatchById(saveDataList);
-        return RecordInfoImportRespVO.builder().build();
+        return RecordInfoImportRespVO.builder().redeemIdFailedMap(Collections.emptyMap()).build();
     }
 
     @Override
-    @Transactional
-    public Boolean cancel(RewardRedeemUpdateReqVO reqVO) {
+    public Boolean cancel(List<Long> ids) {
+        if (CollectionUtils.isEmpty(ids)) {
+            throw exception(ErrorCodeConstants.REWARD_REDEEM_NOT_EXIST);
+        }
+        ids.forEach(id -> {
             //取消兑换 状态改为已取消 回退扣减的积分 ，如果存在已过期的积分，则直接过期
-        if (reqVO.getId() == null) {
+            if (id == null) {
                 throw exception(ErrorCodeConstants.REWARD_REDEEM_NOT_EXIST);
             }
-        RewardRedeemDO rewardRedeemDO = this.getById(reqVO.getId());
+            RewardRedeemDO rewardRedeemDO = this.getById(id);
             if (rewardRedeemDO == null) {
                 throw exception(ErrorCodeConstants.REWARD_REDEEM_NOT_EXIST);
             }
@@ -259,7 +262,7 @@ public class RewardRedeemServiceImpl extends AbstractService<RewardRedeemMapper,
                 throw exception(ErrorCodeConstants.REDEEM_CANCEL_STATUS_ERROR);
             }
             LambdaUpdateWrapper<RewardRedeemDO> updateWrapper = Wrappers.lambdaUpdate();
-        updateWrapper.eq(RewardRedeemDO::getId, reqVO.getId());
+            updateWrapper.eq(RewardRedeemDO::getId, id);
             updateWrapper.eq(RewardRedeemDO::getStatus, RewardRedeemStatusEnum.REDEEMING.getValue());
             updateWrapper.set(RewardRedeemDO::getStatus, RewardRedeemStatusEnum.CANCELED.getValue());
             boolean updateSuccess = this.update(null, updateWrapper);
@@ -267,23 +270,24 @@ public class RewardRedeemServiceImpl extends AbstractService<RewardRedeemMapper,
                 throw exception(ErrorCodeConstants.REDEEM_CANCEL_STATUS_ERROR);
             }
             Map<String, Object> extParam = new HashMap<>();
-        extParam.put("redeemId", reqVO.getId());
+            extParam.put("redeemId", id);
             memberUserScoreApi.operateScore(MemberUserScoreOperateReqDTO.builder()
                     .memberId(rewardRedeemDO.getMemberId())
                     .sourceType(ScoreSourceTypeEnum.EXCHANGE_REWARD_CANCEL)
                     .scoreCount(rewardRedeemDO.getScoreCount())
                     .extParam(extParam)
-                        .releationId(String.valueOf(reqVO.getId()))
+                    .releationId(String.valueOf(id))
                     .build());
+        });
         return true;
     }
 
     @Override
-    public RedeemCancelCheckRespVO cancelCheck(RewardRedeemUpdateReqVO reqVO) {
-        if (reqVO.getId() == null) {
+    public RedeemCancelCheckRespVO cancelCheck(List<Long> ids) {
+        if (CollectionUtils.isEmpty(ids)) {
             throw exception(ErrorCodeConstants.REWARD_REDEEM_NOT_EXIST);
         }
-        RewardRedeemDO rewardRedeemDO = this.getById(reqVO.getId());
+        RewardRedeemDO rewardRedeemDO = this.getById(ids.get(0));
         if (rewardRedeemDO == null) {
             throw exception(ErrorCodeConstants.REWARD_REDEEM_NOT_EXIST);
         }
@@ -291,7 +295,7 @@ public class RewardRedeemServiceImpl extends AbstractService<RewardRedeemMapper,
             throw exception(ErrorCodeConstants.REDEEM_CANCEL_STATUS_ERROR);
         }
         List<ReleationScoreExpireInfoDTO> scoreExpireInfo = memberUserScoreApi
-                .getScoreExpireInfo(String.valueOf(reqVO.getId()), ScoreSourceTypeEnum.EXCHANGE_REWARD);
+                .getScoreExpireInfo(String.valueOf(ids.get(0)), 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();