Merge remote-tracking branch 'origin/dev_20211205' into dev_20211205

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/AdamMemberOrderCodeParam.java

@@ -23,17 +23,27 @@ public class AdamMemberOrderCodeParam implements Serializable {
     @Pattern(regexp = LnsRegex.Valid.DATETIME_YMD, message = "生日格式有误")
     @NotBlank(message = "生日不能为空")
     private String birthday;
-    @ApiModelProperty(position = 13, required = true, value = "地区[100]", example = "北京 北京市 朝阳区")
-    @NotBlank(message = "地区不能为空")
-    private String area;
-    @ApiModelProperty(position = 14, required = true, value = "收获地址")
+//    @ApiModelProperty(position = 13, required = true, value = "地区[100]", example = "北京 北京市 朝阳区")
+//    @NotBlank(message = "地区不能为空")
+//    private String area;
+    @ApiModelProperty(position = 13, required = true, value = "收获地址")
     @Size(min = 1, max = 64, message = "收获地址长度限制1-64位字符")
     @NotBlank(message = "收获地址不能为空")
     private String addressId;
-    @ApiModelProperty(position = 15, value = "支付终端[app,wap,js,applet]", example = "js")
+    @ApiModelProperty(position = 14, value = "支付终端[app,wap,js,applet]", example = "js")
     private String deviceFrom;
-    @ApiModelProperty(position = 16, required = false, value = "姓名[未实名时必传]")
+    @ApiModelProperty(position = 15, required = false, value = "姓名[未实名时必传]")
     private String name;
-    @ApiModelProperty(position = 17, required = false, value = "身份证件号[未实名时必传]")
+    @ApiModelProperty(position = 16, required = false, value = "身份证件号[未实名时必传]")
     private String idCard;
+
+    @ApiModelProperty(position = 17, required = true, value = "常住地/省[50] ～ 替换原字段[area]", example = "北京市")
+    @NotBlank(message = "省份不能为空")
+    private String province;
+    @ApiModelProperty(position = 18, required = true, value = "常住地/市[50] ～ 替换原字段[area]", example = "北京")
+    @NotBlank(message = "城市不能为空")
+    private String city;
+    @ApiModelProperty(position = 19, required = true, value = "常住地/区县[50] ～ 替换原字段[area]", example = "朝阳区")
+    @NotBlank(message = "区县不能为空")
+    private String county;
 }

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/pom.xml

@@ -55,6 +55,12 @@
             <version>1.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.liquidnet</groupId>
+            <artifactId>liquidnet-api-feign-stone</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
 
         <dependency>
             <groupId>com.liquidnet</groupId>

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(), "会员注销");
     }
 }