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

# Conflicts:
#	assortment-ordercenter-sdk/readme.md

assortment-ordercenter-sdk/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>assortment-ordercenter-sdk</artifactId>
-    <version>1.8.4-SNAPSHOT</version>
+    <version>1.8.5-SNAPSHOT</version>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>ordercenter-sdk</artifactId>
-            <version>1.4.8-SNAPSHOT</version>
+            <version>1.4.9-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

assortment-ordercenter-sdk/readme.md

@@ -77,3 +77,4 @@
 | 1.8.2-SNAPSHOT| 升级券码sdk  | 胡超 | 2020-05-18 |
 | 1.8.3-SNAPSHOT| 更新基础sdk1.4.8-SNAPSHOT  | 海波 | 2020-05-25 |
 | 1.8.4-SNAPSHOT| 新增活动类型  | 侯书虎 | 2020-05-26 |
+| 1.8.5-SNAPSHOT| 客如云增加字段  | 海波 | 2020-05-26 |
\ No newline at end of file

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -901,6 +901,8 @@ public class OrderSdkAdapter {
         data.setThirdOrderCode(orderInfoReqs.getThirdOrderCode());
         data.setDinersNumber(orderInfoReqs.getDinersNumber());
         data.setThirdShopId(orderInfoReqs.getThirdStoreId());
+        data.setDownstreamPosCode(orderInfoReqs.getDownstreamPosCode());
+        data.setDownstreamThirdOrderCode(orderInfoReqs.getDownstreamThirdOrderCode());
 
         if (orderInfoReqs.getAfterSalesOrderList() != null && orderInfoReqs.getAfterSalesOrderList().size() >= 1) {
             data.setAfterSalesOrderResp(orderInfoReqs.getAfterSalesOrderList().get(0));

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/order/QueryOrdersResponse.java

@@ -417,6 +417,16 @@ public class QueryOrdersResponse {
              */
             private String expressChannelName;
 
+            /**
+             * 下游POS商编号
+             */
+            private String downstreamPosCode;
+
+            /**
+             * 下游订单号
+             */
+            private String downstreamThirdOrderCode;
+
 
             @NoArgsConstructor
             @Data

ordercenter-sdk/pom.xml

@@ -8,7 +8,7 @@
         <version>1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <version>1.4.8-SNAPSHOT</version>
+    <version>1.4.9-SNAPSHOT</version>
     <artifactId>ordercenter-sdk</artifactId>
 
     <dependencies>

ordercenter-sdk/readme.md

@@ -38,3 +38,4 @@
 | 1.4.5-SNAPSHOT | 客如云接口 | 海波 | 2020-05-14 |
 | 1.4.7-SNAPSHOT | 增加订单支付方式类型 | 海波 | 2020-05-18 |
 | 1.4.8-SNAPSHOT | 售后ES查询增加跟踪号 | 海波 | 2020-05-25 |
+| 1.4.9-SNAPSHOT | 客如云接口 | 海波 | 2020-05-26 |
\ No newline at end of file

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/response/orderInfo/OrderInfoReqs.java

@@ -258,5 +258,14 @@ public class OrderInfoReqs {
     //订单扩展信息 （门店渠道信息）
     private OrderExtendedReq orderExtended;
 
+    /**
+     * 下游POS商编号
+     */
+    private String downstreamPosCode;
+
+    /**
+     * 下游订单号
+     */
+    private String downstreamThirdOrderCode;
 
 }