Merge branch 'feature/2020-12-14_order-group_wanghanghang' into qa

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

assortment-ordercenter-sdk/readme.md

@@ -95,4 +95,5 @@
 | 2.1.10-RELEASE | coco | 刘鹏飞 | 2020-12-17 |
 | 2.1.11-RELEASE | 农工商添加设备号 | 梁崇福 | 2020-12-17 |
 
-| 2.1.12-RELEASE | coco定制优惠券核销 | 刘鹏飞 | 2020-12-24 |
+| 2.1.12-RELEASE | coco定制优惠券核销 | 刘鹏飞 | 2020-12-24 |
\ No newline at end of file
+| 2.1.19-SNAPSHOT | 增加配送类型字段 | 王航航 | 2020-12-22 |
\ No newline at end of file

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

@@ -1058,6 +1058,10 @@ public class OrderSdkAdapter {
         data.setDownstreamPosCode(orderInfoReqs.getDownstreamPosCode());
         data.setDownstreamThirdOrderCode(orderInfoReqs.getDownstreamThirdOrderCode());
 
+        //20201222 新增配送类型 ->【ID1021986】
+        //【订单开放平台】订单详情查询接口增加配送类型字段
+        data.setExpressType(orderInfoReqs.getExpressType());
+
         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

@@ -398,6 +398,12 @@ public class QueryOrdersResponse {
              */
             private String expressChannelName;
 
+
+            /**
+             * 配送类型 1自配送(三方渠道配送、商家店员配送) 2平台配送
+             */
+            private Integer expressType;
+
             /**
              * 签收时间 送达时间 收货时间
              */