bugfix(reward): 兑换信息导入修改

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

@@ -260,8 +260,7 @@ public class RewardRedeemServiceImpl extends AbstractService<RewardRedeemMapper,
         }
 
         List<RewardRedeemDO> saveDataList = dataList.stream().map(data -> {
-            RewardRedeemDO rewardRedeemDO = new RewardRedeemDO();
-            rewardRedeemDO.setId(Long.parseLong(data.getId()));
+            RewardRedeemDO rewardRedeemDO = rewardRedeemMapper.selectOne(RewardRedeemDO::getRedemptionNumber, data.getId());
             DictDataRespDTO redeemTypeDict = DictFrameworkUtils.parseDictDataFromCacheWithMultiLang("way_of_receiving", data.getRedeemType());
             rewardRedeemDO.setRedeemType(Integer.parseInt(redeemTypeDict.getValue()));
             rewardRedeemDO.setExpenses(data.getExpenses());
@@ -362,25 +361,18 @@ public class RewardRedeemServiceImpl extends AbstractService<RewardRedeemMapper,
                                          Map<String, CurrencyRespDTO> titleEnCurrencyMap,
                                          Map<String, ExpressRespDTO> nameExpressMap) {
         LambdaQueryWrapper<RewardRedeemDO> wrapper = Wrappers.lambdaQuery();
-        wrapper.in(RewardRedeemDO::getId, dataList.stream().map(RedeemInfoImportExcelVO::getId).collect(Collectors.toSet()));
-        Map<Long, RewardRedeemDO> idRewardRedeemDOMap = rewardRedeemMapper.selectList(wrapper).stream()
-                .collect(Collectors.toMap(RewardRedeemDO::getId, Function.identity(), (c1, c2) -> c1));
+        wrapper.in(RewardRedeemDO::getRedemptionNumber, dataList.stream().map(RedeemInfoImportExcelVO::getId).collect(Collectors.toSet()));
+        Map<String, RewardRedeemDO> idRewardRedeemDOMap = rewardRedeemMapper.selectList(wrapper).stream()
+                .collect(Collectors.toMap(RewardRedeemDO::getRedemptionNumber, Function.identity(), (c1, c2) -> c1));
         Map<String, String> failedInfoMap = new HashMap<>();
         dataList.forEach(data -> {
-            long id;
-            try {
-                id = Long.parseLong(data.getId());
-            } catch (Exception e) {
-                failedInfoMap.put(data.getId() == null ? "" : data.getId(), I18nMessage.getMessage("reward.redeem.not.exist"));
-                return;
-            }
             try {
                 DateUtil.parse(data.getExpressDate(), NORM_DATETIME_PATTERN);
             } catch (Exception e) {
                 failedInfoMap.put(data.getId() == null ? "" : data.getId(), I18nMessage.getMessage("date.format.error"));
                 return;
             }
-            RewardRedeemDO rewardRedeemDO = idRewardRedeemDOMap.get(id);
+            RewardRedeemDO rewardRedeemDO = idRewardRedeemDOMap.get(data.getId());
             if (rewardRedeemDO == null) {
                 failedInfoMap.put(data.getId() == null ? "" : data.getId(), I18nMessage.getMessage("reward.redeem.not.exist"));
                 return;
@@ -408,7 +400,6 @@ public class RewardRedeemServiceImpl extends AbstractService<RewardRedeemMapper,
                 return;
             }
             if (!canVerify(RewardRedeemVerifyDTO.builder()
-                    .id(Long.parseLong(data.getId()))
                     .redeemType(Integer.parseInt(redeemTypeDict.getValue()))
                     .status(rewardRedeemDO.getStatus())
                     .expense(data.getExpenses())