会员退款调整;

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

 package com.liquidnet.client.admin.zhengzai.adam.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fasterxml.jackson.databind.JsonNode;
@@ -8,10 +9,7 @@ import com.liquidnet.client.admin.common.core.domain.AjaxResult;
 import com.liquidnet.client.admin.common.utils.ShiroUtils;
 import com.liquidnet.client.admin.zhengzai.adam.service.IAdamMemberOrderAdminService;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
-import com.liquidnet.commons.lang.util.BeanUtil;
-import com.liquidnet.commons.lang.util.HttpUtil;
-import com.liquidnet.commons.lang.util.IDGenerator;
-import com.liquidnet.commons.lang.util.JsonUtils;
+import com.liquidnet.commons.lang.util.*;
 import com.liquidnet.service.adam.constant.AdamRedisConst;
 import com.liquidnet.service.adam.dto.MemberOrderDto;
 import com.liquidnet.service.adam.dto.admin.AdamMemberOrderRefundParam;
@@ -28,6 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.LinkedMultiValueMap;
 
 import java.beans.IntrospectionException;
@@ -185,6 +184,32 @@ public class AdamMemberOrderAdminServiceImpl extends ServiceImpl<AdamMemberOrder
         vos.set(idx, vo);
         redisUtil.set(moKey, vos);
 
+        if (memberRefund.getRenewable() == 2) {
+            AdamUserMember updateUserMember = new AdamUserMember();
+            updateUserMember.setState(2);
+            updateUserMember.setUpdatedAt(now);
+            updateUserMember.setComment("R");
+
+            LambdaUpdateWrapper<AdamUserMember> userMemberLambdaUpdateWrapper = Wrappers.lambdaUpdate(AdamUserMember.class);
+            userMemberLambdaUpdateWrapper.eq(AdamUserMember::getUid, memberOrder.getUid());
+            adamUserMemberMapper.update(updateUserMember, userMemberLambdaUpdateWrapper);
+
+            String umkey = AdamRedisConst.INFO_USER_MEMBER + memberOrder.getUid();
+            AdamUserMemberVo userMemberVo = (AdamUserMemberVo) redisUtil.get(umkey);
+
+            userMemberVo.setState(2);
+            userMemberVo.setUpdatedAt(now);
+
+            redisUtil.set(umkey, userMemberVo);
+
+            List<String> uidBlackList = (List<String>) redisUtil.get(AdamRedisConst.BLK_LIST_MEMBER_UID);
+            if (CollectionUtils.isEmpty(uidBlackList)) {
+                uidBlackList = CollectionUtil.arrayListString();
+            }
+            uidBlackList.add(memberOrder.getUid());
+            redisUtil.set(AdamRedisConst.BLK_LIST_MEMBER_UID, uidBlackList);
+        }
+
         return AjaxResult.success();
     }
 

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

@@ -85,6 +85,7 @@ public class PlatformMemberRefundService extends ServiceImpl<AdamMemberRefundMap
 
     private void refundSuccProcessing(String orderNo, LocalDateTime now) {
         AdamMemberOrder memberOrder = adamMemberOrderMapper.selectOne(Wrappers.lambdaUpdate(AdamMemberOrder.class).eq(AdamMemberOrder::getOrderNo, orderNo));
+        LocalDateTime newExpiryAt = null;
 
         {// 同步用户端信息
             String moKey = AdamRedisConst.INFO_MEMBER_ORDER + memberOrder.getUid();
@@ -99,14 +100,17 @@ public class PlatformMemberRefundService extends ServiceImpl<AdamMemberRefundMap
 
             String umKey = AdamRedisConst.INFO_USER_MEMBER.concat(memberOrder.getUid());
             AdamUserMemberVo userMemberVo = (AdamUserMemberVo) redisUtil.get(umKey);
-            userMemberVo.setState(2);
+
+            newExpiryAt = userMemberVo.getExpiryAt().minusDays(memberOrder.getDays());
+            userMemberVo.setExpiryAt(newExpiryAt);
             userMemberVo.setUpdatedAt(now);
+
             syncVo = redisUtil.set(umKey, userMemberVo);
             log.warn("###会员退款回调处理成功:更新REDIS会员状态{}[orderNo:{},uid:{}]", syncVo ? "成功" : "失败", orderNo, memberOrder.getUid());
         }
 
         AdamUserMember updateInfoUserMember = new AdamUserMember();
-        updateInfoUserMember.setState(2);
+        updateInfoUserMember.setExpiryAt(newExpiryAt);
         updateInfoUserMember.setUpdatedAt(now);
         updateInfoUserMember.setComment("R");
         int updateRst = adamUserMemberMapper.update(updateInfoUserMember, Wrappers.lambdaUpdate(AdamUserMember.class).eq(AdamUserMember::getUid, memberOrder.getUid()));