fix:会员退款判断权益券处理;

fix:会员退款补充请求传参paymentId;

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/adam/service/impl/AdamMemberOrderAdminServiceImpl.java

@@ -137,7 +137,7 @@ public class AdamMemberOrderAdminServiceImpl extends ServiceImpl<AdamMemberOrder
         linkedMultiValueMap.add("notifyUrl", notifyUrl);
         linkedMultiValueMap.add("orderCode", memberOrder.getOrderNo());
         linkedMultiValueMap.add("orderRefundCode", refundNo);
-        linkedMultiValueMap.add("paymentId", null);
+        linkedMultiValueMap.add("paymentId", memberOrder.getPaymentId());
         linkedMultiValueMap.add("paymentType", (memberOrder.getDeviceFrom() + memberOrder.getPayType()).toUpperCase());
         linkedMultiValueMap.add("price", String.valueOf(param.getRefundAmt()));
         linkedMultiValueMap.add("priceTotal", String.valueOf(memberOrder.getPricePaid()));

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/PlatformMemberRefundService.java

@@ -20,6 +20,7 @@ import com.liquidnet.service.candy.mapper.CandyUserCouponMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDate;
@@ -133,21 +134,34 @@ public class PlatformMemberRefundService extends ServiceImpl<AdamMemberRefundMap
                 syncVo = redisUtil.set(umKey, userMemberVo);
                 log.info("###会员退款回调处理成功:更新REDIS会员信息{}[orderNo:{},uid:{}]", syncVo ? "成功" : "失败", orderNo, memberOrder.getUid());
 
+                // 同步更新MYSQL会员信息
+                AdamUserMember updateInfoUserMember = new AdamUserMember();
+                updateInfoUserMember.setExpiryAt(newExpiryAt);
+                updateInfoUserMember.setUpdatedAt(now);
+                updateInfoUserMember.setComment("R");
+                int updateRst = adamUserMemberMapper.update(updateInfoUserMember, Wrappers.lambdaUpdate(AdamUserMember.class).eq(AdamUserMember::getUid, memberOrder.getUid()));
+                log.info("###会员退款回调处理成功:更新DB会员信息{}[orderNo:{},uid:{}]", updateRst <= 0 ? "失败" : "成功", orderNo, memberOrder.getUid());
+
+                if (!CollectionUtils.isEmpty(userCouponBasicDtoList)) {
                     removeUcouponIdList = userCouponBasicDtoList.stream()
                             .filter(r -> (r.getExclusive() == 1 && r.getDuedAt().compareTo(expiryAt) == 0))
                             .map(CandyUserCouponBasicDto::getUcouponId)
                             .collect(Collectors.toList());
+                }
             } else if (userMemberVo.getState() == 2) {// 拉黑用户
+                if (!CollectionUtils.isEmpty(userCouponBasicDtoList)) {
                     removeUcouponIdList = userCouponBasicDtoList.stream()
                             .filter(r -> (r.getExclusive() == 1))
                             .map(CandyUserCouponBasicDto::getUcouponId)
                             .collect(Collectors.toList());
                 }
+            }
             // 同步删除REDIS用户会员权益券信息
+            if (!CollectionUtils.isEmpty(removeUcouponIdList)) {
                 List<String> finalRemoveUcouponIdList = removeUcouponIdList;
                 userCouponBasicDtoList.removeIf(r -> finalRemoveUcouponIdList.contains(r.getUcouponId()));
                 redisUtil.set(uckey, userCouponBasicDtoList);
-        }
+
                 // 同步更新MYSQL用户会员权益券信息
                 LambdaUpdateWrapper<CandyUserCoupon> candyUserCouponLambdaUpdateWrapper = Wrappers.lambdaUpdate(CandyUserCoupon.class);
                 candyUserCouponLambdaUpdateWrapper.in(CandyUserCoupon::getUcouponId, removeUcouponIdList.toArray()).eq(CandyUserCoupon::getState, 1);
@@ -157,21 +171,15 @@ public class PlatformMemberRefundService extends ServiceImpl<AdamMemberRefundMap
                 updateInfoUserCoupon.setOperator("system.vip.refund");
                 int updateRst = candyUserCouponMapper.update(updateInfoUserCoupon, candyUserCouponLambdaUpdateWrapper);
                 log.info("###会员退款回调处理成功:更新DB会员权益券信息{}[orderNo:{},uid:{}]", updateRst <= 0 ? "失败" : "成功", orderNo, memberOrder.getUid());
-
-        // 同步更新MYSQL会员信息
-        AdamUserMember updateInfoUserMember = new AdamUserMember();
-        updateInfoUserMember.setExpiryAt(newExpiryAt);
-        updateInfoUserMember.setUpdatedAt(now);
-        updateInfoUserMember.setComment("R");
-        updateRst = adamUserMemberMapper.update(updateInfoUserMember, Wrappers.lambdaUpdate(AdamUserMember.class).eq(AdamUserMember::getUid, memberOrder.getUid()));
-        log.info("###会员退款回调处理成功:更新DB会员信息{}[orderNo:{},uid:{}]", updateRst <= 0 ? "失败" : "成功", orderNo, memberOrder.getUid());
+            }
+        }
 
         // 同步更新MYSQL会员订单信息
         AdamMemberOrder updateInfoMemberOrder = new AdamMemberOrder();
         updateInfoMemberOrder.setMid(memberOrder.getMid());
         updateInfoMemberOrder.setState(5);
         updateInfoMemberOrder.setUpdatedAt(now);
-        updateRst = adamMemberOrderMapper.updateById(updateInfoMemberOrder);
+        int updateRst = adamMemberOrderMapper.updateById(updateInfoMemberOrder);
         log.info("###会员退款回调处理成功:更新DB订单信息{}[orderNo:{}]", updateRst <= 0 ? "失败" : "成功", orderNo);
     }
 }