Merge branches '2020-05-14-order-group-书亦订单和客户数据库落地' and 'master' of…

Merge branches '2020-05-14-order-group-书亦订单和客户数据库落地' and 'master' of gitlab.freemud.com:order-group-application/order-group

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

@@ -963,6 +963,10 @@ public class OrderSdkAdapter {
             if (orderInfoReqs.getPayTime() != null) {
                 data.setGmtPay(Long.parseLong(orderInfoReqs.getPayTime()));
             }
+            if(orderInfoReqs.getReceiveTime()!=null){
+                data.setGmtCompleteTime(Long.parseLong(orderInfoReqs.getReceiveTime()));
+                data.setGmtReceiveTime(Long.parseLong(orderInfoReqs.getReceiveTime()));
+            }
 
         } catch (Exception e) {
             e.printStackTrace();
@@ -1000,11 +1004,11 @@ public class OrderSdkAdapter {
 
         //运单相关信息
         data.setDeliverStatus(orderInfoReqs.getDeliveryState() != null ? orderInfoReqs.getDeliveryState() : 0);
-        data.setReceiveTime(orderInfoReqs.getReceiveTime());
+        data.setReceiveTime("");
         data.setDepatchTime("");
         data.setArriveShopTime("");
         data.setSendTime("");
-        data.setCompleteTime(orderInfoReqs.getReceiveTime());
+        data.setCompleteTime("");
         data.setParentCode(orderInfoReqs.getParentCode());
         data.setIsParent(orderInfoReqs.getIsParent());
         data.setBizType(orderInfoReqs.getBizType());

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

@@ -346,6 +346,15 @@ public class QueryOrdersResponse {
              */
             private String expressChannelName;
 
+            /**
+             * 签收时间 送达时间 收货时间
+             */
+            private Long gmtReceiveTime;
+
+            /**
+             * 完成时间
+             */
+            private  Long  gmtCompleteTime;
 
             @NoArgsConstructor
             @Data