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

order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderVo.java

@@ -14,8 +14,8 @@ package cn.freemud.entities.vo;
 
 import cn.freemud.entities.dto.UserDeliveryInfoDto;
 import cn.freemud.entities.dto.delivery.WeixinDeliveryAddressDto;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.hibernate.validator.constraints.NotEmpty;
 
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
@@ -187,6 +187,9 @@ public class CreateOrderVo {
      */
     private String faceCode;
 
+    @ApiModelProperty(hidden = true)
+    private String sessionKey; // 存储sessionKey,异常补退使用
+
     @Data
     public static class PremiumExchangeActivity {
         @NotNull(message = "activityCode 不能为空")

order-application-service/src/main/java/cn/freemud/service/impl/OrderAdapterServiceImpl.java

@@ -84,6 +84,8 @@ public class OrderAdapterServiceImpl implements OrderAdapterService {
         if(ObjectUtils.notEqual(baseResponse.getCode(),ResponseResult.SUCCESS.getCode())){
             return baseResponse;
         }
+        // 扩展字段中存储 sessionKey
+        createOrderVo.setSessionKey(assortmentCustomerInfoVo.getSessionKey());
         return orderservice.createOrderNew(createOrderVo);
     }
 

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -1971,6 +1971,8 @@ public class OrderServiceImpl implements Orderservice {
         if (memberCard != null && memberCard.getRuleId() != null) {
             orderExtInfoDto.setRuleId(memberCard.getRuleId());
         }
+        // 扩展字段中存储 sessionKey
+        orderExtInfoDto.setSessionKey(createOrderVo.getSessionKey());
         return orderExtInfoDto;
     }