Merge remote-tracking branch 'remotes/origin/feature_20191226_1.9.9_sessionkey' into qa

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

assortment-ordercenter-sdk/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>assortment-ordercenter-sdk</artifactId>
-    <version>1.1.0.RELEASE</version>
+    <version>1.0.9-SNAPSHOT</version>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/entities/OrderExtInfoDTO.java

@@ -73,4 +73,9 @@ public class OrderExtInfoDTO {
     private String memberLevel;
 
     private boolean paidMember;
+
+    /**
+     * 异常补退使用
+     */
+    private String sessionKey;
 }

order-application-service/pom.xml

@@ -35,7 +35,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
-            <version>1.1.0.RELEASE</version>
+            <version>1.1.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

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

@@ -13,8 +13,8 @@
 package cn.freemud.entities.vo;
 
 import cn.freemud.entities.dto.UserDeliveryInfoDto;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.hibernate.validator.constraints.NotEmpty;
 
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
@@ -175,6 +175,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

@@ -73,6 +73,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

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