新增配送渠道

assortment-ordercenter-sdk/readme.md

@@ -46,4 +46,5 @@
 | 1.4.8.RELEASE | 规范orderExtInfoDto | 侯书虎 | 2020-05-19 |
 | 1.3.4-SNAPSHOT | 返回售后单创建时间 | wuping | 2020-04-27 |
 | 1.3.5-SNAPSHOT | 取消订单增加任务 | wuping | 2020-04-28 |
-| 1.4.9.RELEASE | 售后单任务 | wuping | 2020-05-21 |
\ No newline at end of file
+| 1.4.9.RELEASE | 售后单任务 | wuping | 2020-05-21 |
+| 1.7.1-SNAPSHOT| 订单查询返回配送渠道字段 | 雷后领 | 2020-05-14 |
\ No newline at end of file

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

@@ -994,11 +994,11 @@ public class OrderSdkAdapter {
 
         //运单相关信息
         data.setDeliverStatus(orderInfoReqs.getDeliveryState() != null ? orderInfoReqs.getDeliveryState() : 0);
-        data.setReceiveTime("");
+        data.setReceiveTime(orderInfoReqs.getReceiveTime());
         data.setDepatchTime("");
         data.setArriveShopTime("");
         data.setSendTime("");
-        data.setCompleteTime("");
+        data.setCompleteTime(orderInfoReqs.getReceiveTime());
         data.setParentCode(orderInfoReqs.getParentCode());
         data.setIsParent(orderInfoReqs.getIsParent());
         data.setBizType(orderInfoReqs.getBizType());
@@ -1021,6 +1021,7 @@ public class OrderSdkAdapter {
         data.setOrderOperationHistoryList(getOrderOperationHistory(orderInfoReqs.getOrderOperationHistoryList()));
         data.setApportionDetails(getApportionDetails(orderInfoReqs));
         data.setOrderCostDetailList(orderInfoReqs.getOrderCostDetailList());
+        data.setExpressChannelName(orderInfoReqs.getExpressChannelName());
         return data;
     }
 

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

@@ -289,7 +289,7 @@ public class QueryOrdersResponse {
              */
             private String riderPhone;
             /**
-             * 系统接单时间
+             * 签收时间 送达时间 收货时间
              */
             private String receiveTime;
             /**
@@ -334,6 +334,11 @@ public class QueryOrdersResponse {
              */
             private BigDecimal weight;
 
+            /**
+             * 配送渠道
+             */
+            private String expressChannelName;
+
 
             @NoArgsConstructor
             @Data

pom.xml

@@ -222,4 +222,17 @@
         </repository>
     </repositories>
 
+
+    <build>
+        <plugins>
+            <!-- maven 打包时跳过测试 -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
\ No newline at end of file