整合版本号 当前版本26

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

@@ -1045,6 +1045,10 @@ public class OrderSdkAdapter {
         if(Objects.nonNull(orderInfoReqs.getEstimateDeliveryCompleteTime())){
             data.setEstimateDeliveryCompleteTime(Long.parseLong(orderInfoReqs.getEstimateDeliveryCompleteTime()));
         }
+
+
+
+
         data.setOrderClient(orderInfoReqs.getOrderClient().toString());
         data.setCompanyId(orderInfoReqs.getPartnerId());
         data.setShopId(orderInfoReqs.getStoreId());
@@ -1222,6 +1226,11 @@ public class OrderSdkAdapter {
         }
 
         data.setPickUpGoodsNo(orderInfoReqs.getPickUpGoodsNo());
+
+
+        //新增配送类型
+        data.setExpressType(orderInfoReqs.getExpressType()== null ? 0 : orderInfoReqs.getExpressType());
+
         return data;
     }
 

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

@@ -435,7 +435,7 @@ public class QueryOrdersResponse {
             /**
              * 配送类型 1自配送(三方渠道配送、商家店员配送) 2平台配送
              */
-            private Byte expressType;
+            private Integer expressType;
 
             @NoArgsConstructor
             @Data