Merge branch 'feature/20200429客如云查询订单详情增加返回字段-rux' into develop

# Conflicts:
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/order/QueryOrdersResponse.java

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

@@ -1007,11 +1007,11 @@ public class OrderSdkAdapter {
 
         //运单相关信息
         data.setDeliverStatus(orderInfoReqs.getDeliveryState() != null ? orderInfoReqs.getDeliveryState() : 0);
-        data.setReceiveTime(orderInfoReqs.getReceiveTime());
+        data.setReceiveTime("");
         data.setDepatchTime("");
         data.setArriveShopTime("");
-        data.setSendTime(orderInfoReqs.getDeliveryTime());
-        data.setCompleteTime(orderInfoReqs.getReceiveTime());
+        data.setSendTime("");
+        data.setCompleteTime("");
         data.setParentCode(orderInfoReqs.getParentCode());
         data.setIsParent(orderInfoReqs.getIsParent());
         data.setBizType(orderInfoReqs.getBizType());
@@ -1033,20 +1033,11 @@ public class OrderSdkAdapter {
         }
         data.setOrderOperationHistoryList(getOrderOperationHistory(orderInfoReqs.getOrderOperationHistoryList()));
         data.setApportionDetails(getApportionDetails(orderInfoReqs));
-        data.setOrderCostDetailList(orderInfoReqs.getOrderCostDetailList());
-
         //费用信息
-/*        if (CollectionUtils.isNotEmpty(orderInfoReqs.getOrderCostDetailList())){
-            List<QueryOrdersResponse.DataBean.OrderBean.OrderCostResp> costResps = getOrderCostResps(orderInfoReqs.getOrderCostDetailList());
-            data.setOrderCostDetailList(costResps);
-        }*/
+        data.setOrderCostDetailList(orderInfoReqs.getOrderCostDetailList());
         //发票信息
-        if (null != orderInfoReqs.getOrderInvoice()){
-            QueryOrdersResponse.DataBean.OrderBean.OrderInvoice invoice = new QueryOrdersResponse.DataBean.OrderBean.OrderInvoice();
-            BeanUtils.copyProperties(orderInfoReqs.getOrderInvoice(), invoice);
-            data.setOrderInvoice(invoice);
-        }
-        data.setExpressChannelName(orderInfoReqs.getExpressChannelName());
+        data.setOrderInvoice(orderInfoReqs.getOrderInvoice());
+
         return data;
     }
 

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

@@ -14,6 +14,7 @@ package com.freemud.sdk.api.assortment.order.response.order;
 
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.AfterSalesOrderResp;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderCostResp;
+import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderInvoice;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.apache.commons.lang.builder.ToStringBuilder;