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

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

assortment-ordercenter-sdk/readme.md

@@ -94,4 +94,9 @@
 | 2.1.13-RELEASE | B端管理平台查询拼单订单 | 缪晖 | 2020-12-28 |
 | 2.1.14-RELEASE | 支付添加抖音渠道 | 张志恒 | 2020-12-29 |
 | 2.1.15-RELEASE | 集点三期添加商户号 | 张志恒 | 2020-12-29 |
-| 2.1.16-RELEASE | 停车场订单添加排序字段 | 张志恒 | 2021-01-06 |
+| 2.1.16-RELEASE | 停车场订单添加排序字段 | 张志恒 | 2021-01-06 |
\ No newline at end of file
+| 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.26-SNAPSHOT | 增加配送类型字段 | 王航航 | 2020-12-24 |
\ No newline at end of file

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

@@ -1059,6 +1059,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));
         }
@@ -1206,6 +1210,7 @@ public class OrderSdkAdapter {
         if (orderInfoReqs.getMarketingType() != null) {
             data.setMarketingType(ClassUtils.toByte(orderInfoReqs.getMarketingType()));
         }
+        data.setExpressType(orderInfoReqs.getExpressType() == null ? 0 : orderInfoReqs.getExpressType());
 
         // 买一赠一寄件信息
         data.setOrderSendCouponRespList(orderInfoReqs.getOrderSendCouponRespList());

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

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