Merge branch 'dev_20211205' into pre

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

@@ -18,12 +18,14 @@ import com.liquidnet.service.candy.constant.CandyRedisConst;
 import com.liquidnet.service.candy.dto.CandyUserCouponBasicDto;
 import com.liquidnet.service.candy.entity.CandyUserCoupon;
 import com.liquidnet.service.candy.mapper.CandyUserCouponMapper;
+import com.liquidnet.service.feign.stone.api.FeignStoneIntegralClient;
 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.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -44,6 +46,9 @@ public class PlatformMemberRefundService extends ServiceImpl<AdamMemberRefundMap
     @Autowired
     private RedisDataSourceUtil redisDataSourceUtil;
 
+    @Autowired
+    FeignStoneIntegralClient feignStoneIntegralClient;
+
     public boolean refundProcessing(HttpServletRequest request) {
         String refundNo = request.getParameter("orderRefundCode");
         String refundAt = request.getParameter("refundAt");
@@ -80,7 +85,7 @@ public class PlatformMemberRefundService extends ServiceImpl<AdamMemberRefundMap
                 memberRefundLambdaUpdateWrapper.set(AdamMemberRefund::getRefundState, 1);
                 if (this.update(memberRefundLambdaUpdateWrapper)) {
 
-                    this.refundSuccProcessing(memberRefund.getOrderNo(), now);
+                    this.refundSuccProcessing(memberRefund.getOrderNo(), now, refundAmt);
 
                     return true;
                 } else {
@@ -94,7 +99,7 @@ public class PlatformMemberRefundService extends ServiceImpl<AdamMemberRefundMap
 
     /* -------------------------------------------------------------------------- */
 
-    private void refundSuccProcessing(String orderNo, LocalDateTime now) {
+    private void refundSuccProcessing(String orderNo, LocalDateTime now, String refundAmt) {
         AdamMemberOrder memberOrder = adamMemberOrderMapper.selectOne(Wrappers.lambdaUpdate(AdamMemberOrder.class).eq(AdamMemberOrder::getOrderNo, orderNo));
         LocalDateTime newExpiryAt = null;
         List<String> removeUcouponIdList = null;
@@ -185,5 +190,7 @@ public class PlatformMemberRefundService extends ServiceImpl<AdamMemberRefundMap
         updateInfoMemberOrder.setUpdatedAt(now);
         int updateRst = adamMemberOrderMapper.updateById(updateInfoMemberOrder);
         log.info("###会员退款回调处理成功:更新DB订单信息{}[orderNo:{}]", updateRst <= 0 ? "失败" : "成功", orderNo);
+
+        feignStoneIntegralClient.de2111(memberOrder.getUid(), new BigDecimal(refundAmt).intValue(), "退出会员");
     }
 }