Merge branch '20200827-1000' of gitlab.freemud.com:order-group-application/order-group into qa

# Conflicts:
#	order-application-service/pom.xml
#	ordercenter-sdk/pom.xml
#	ordercenter-sdk/readme.md

order-application-service/pom.xml

@@ -41,6 +41,18 @@
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
             <version>2.0.15-SNAPSHOT</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>ordercenter-sdk</artifactId>
+                    <groupId>cn.freemud</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <artifactId>ordercenter-sdk</artifactId>
+            <groupId>cn.freemud</groupId>
+            <version>1.3.22.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

order-application-service/src/main/java/cn/freemud/fuyou/controller/request/BaseRequest.java

 package cn.freemud.fuyou.controller.request;
 
 import com.freemud.application.sdk.api.ordercenter.request.create.OrderItemCreateReq;
+import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderInfoReqs;
 import lombok.Getter;
 import lombok.Setter;
 import org.hibernate.validator.constraints.NotEmpty;
@@ -15,9 +16,12 @@ public class BaseRequest {
     /**
      * 订单号
      */
-    @NotEmpty(message = "订单号不能为空")
+    //@NotEmpty(message = "订单号不能为空")
     private String orderCode;
 
+    @NotEmpty(message = "thirdOrderCode 不能为空")
+    private String thirdOrderCode;
+
     /**
      * userId
      */
@@ -73,4 +77,10 @@ public class BaseRequest {
     private String fmId;
 
 
+    /**
+     *  根据 thirdOrderCode 查询的数据
+     */
+    private OrderInfoReqs orderInfoReqs;
+
+
 }

order-application-service/src/main/java/cn/freemud/fuyou/controller/request/CreateOrderRequest.java

@@ -18,6 +18,7 @@ import com.freemud.application.sdk.api.ordercenter.request.create.OrderCostCreat
 import com.freemud.application.sdk.api.ordercenter.request.create.OrderItemCreateReq;
 import com.freemud.application.sdk.api.ordercenter.request.create.OrderSettlementCreateReq;
 import lombok.Data;
+import org.hibernate.validator.constraints.NotEmpty;
 
 import java.util.Date;
 import java.util.List;
@@ -35,12 +36,14 @@ public class CreateOrderRequest {
     private String orderCode;
 
     //商户号
+    @NotEmpty(message = "partnerId 不能为空")
     private String partnerId;
 
     //商户名
     private String partnerName;
 
     //门店编号
+    @NotEmpty(message = "storeId 不能为空")
     private String storeId;
 
     //第三方门店编号
@@ -56,6 +59,7 @@ public class CreateOrderRequest {
     private String toStoreId;
 
     //用户ID
+    @NotEmpty(message = "userId 不能为空")
     private String userId;
 
     //用户姓名
@@ -113,6 +117,7 @@ public class CreateOrderRequest {
     private String companySelfCode;
 
     //第三方订单号/客户展示订单编号
+    @NotEmpty(message = "thirdOrderCode 不能为空")
     private String thirdOrderCode;
 
     //订单备注

order-application-service/src/main/java/cn/freemud/fuyou/service/processor/AbstractProcessor.java

@@ -115,8 +115,24 @@ public abstract class AbstractProcessor implements EventProcessor {
         return orderInfo.getResult();
     }
 
+    /**
+     * 根据三方订单号查询
+     * @param thirdOrderCode
+     * @return
+     */
+    protected OrderInfoReqs getOrderByThirdOrderCode(String thirdOrderCode) {
+        QueryByCodeResponse orderInfo = orderSdkService.getOrderInfo(null,null,thirdOrderCode, null, LogThreadLocal.getTrackingNo());
+        if (ObjectUtils.notEqual(ResponseConstant.SUCCESS_RESPONSE_CODE, orderInfo.getCode())) {
+            throw new RuntimeException("订单号不存在");
+        }
+        return orderInfo.getResult();
+    }
+
     @Override
     public BaseResponse process(DiscountRequest request) {
+        // 三方订单号兑换 订单信息
+        OrderInfoReqs orderInfoReqs = getOrderByThirdOrderCode(request.getThirdOrderCode());
+
         log.info("process.DiscountRequest:{}", JSON.toJSONString(request));
         BaseResponse response = doProcess(request);
         if (ObjectUtils.notEqual(SUCCESS.code, response.getCode())) {

ordercenter-sdk/readme.md

@@ -76,4 +76,6 @@
         | 1.3.8.RELEASE | 增加小程序场景值 | 李小二 | 2020-07-01 |
         | 1.3.9.RELEASE | 增加支付渠道编号 | 李小二 | 2020-07-08 |
         | 1.3.10.RELEASE | OrderExtInfoDto新增parkingAreaName | wuping | 2020-07-13 |
-|1.4.35-SNAPSHOT | 修复queryRelatedOrderByCode反序列化问题 | 肖家炜 | 2020-08-25  |
+|1.4.35-SNAPSHOT | 修复queryRelatedOrderByCode反序列化问题 | 肖家炜 | 2020-08-25  |
\ No newline at end of file
+| 1.3.11.RELEASE | 新增常量类转化 | 张志恒 | 2020-08-04 |
+1.3.22.RELEASE | 枚举增加SVC | 张虹旺 | 2020-08-27 |
\ No newline at end of file