兑换礼品核销校验

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

@@ -125,13 +125,13 @@ public class RewardRedeemServiceImpl extends AbstractService<RewardRedeemMapper,
         LambdaUpdateWrapper<RewardRedeemDO> wrapper = Wrappers.lambdaUpdate();
         wrapper.eq(RewardRedeemDO::getId, request.getId());
         wrapper.set(RewardRedeemDO::getStatus, RewardRedeemStatusEnum.REDEEMED.getValue());
-        wrapper.set(RewardRedeemDO::getRecipientName, request.getRecipientName());
-        wrapper.set(RewardRedeemDO::getRecipientPhoneNum, request.getRecipientPhoneNum());
-        wrapper.set(RewardRedeemDO::getRecipientAddress, request.getRecipientAddress());
-        wrapper.set(RewardRedeemDO::getCourierCompany, request.getCourierCompany());
-        wrapper.set(RewardRedeemDO::getExpressNo, request.getExpressNo());
-        wrapper.set(RewardRedeemDO::getExpressDate, request.getExpressDate());
-        wrapper.set(RewardRedeemDO::getExpressSender, request.getExpressSender());
+        wrapper.set(StringUtils.isNotBlank(request.getRecipientName()), RewardRedeemDO::getRecipientName, request.getRecipientName());
+        wrapper.set(StringUtils.isNotBlank(request.getRecipientPhoneNum()), RewardRedeemDO::getRecipientPhoneNum, request.getRecipientPhoneNum());
+        wrapper.set(StringUtils.isNotBlank(request.getRecipientAddress()), RewardRedeemDO::getRecipientAddress, request.getRecipientAddress());
+        wrapper.set(request.getCourierCompany() != null, RewardRedeemDO::getCourierCompany, request.getCourierCompany());
+        wrapper.set(StringUtils.isNotBlank(request.getExpressNo()), RewardRedeemDO::getExpressNo, request.getExpressNo());
+        wrapper.set(request.getExpressDate() != null, RewardRedeemDO::getExpressDate, request.getExpressDate());
+        wrapper.set(StringUtils.isNotBlank(request.getExpressSender()), RewardRedeemDO::getExpressSender, request.getExpressSender());
         wrapper.set(RewardRedeemDO::getVerifyUser, request.getVerifyUser());
         wrapper.set(RewardRedeemDO::getVerifyTime, request.getVerifyTime());
         wrapper.set(RewardRedeemDO::getUpdater, SecurityFrameworkUtils.getLoginUserId());
@@ -328,10 +328,10 @@ public class RewardRedeemServiceImpl extends AbstractService<RewardRedeemMapper,
                 .collect(Collectors.toMap(RewardRedeemDO::getId, Function.identity(), (c1, c2) -> c1));
         Map<String, String> failedInfoMap = new HashMap<>();
         dataList.forEach(data -> {
-            long id ;
+            long id;
             try {
                 id = Long.parseLong(data.getId());
-            }catch (Exception e) {
+            } catch (Exception e) {
                 failedInfoMap.put(data.getId() == null ? "" : data.getId(), I18nMessage.getMessage("reward.redeem.not.exist"));
                 return;
             }