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

# 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/src/main/java/com/freemud/sdk/api/assortment/order/response/order/QueryOrdersResponse.java

assortment-ordercenter-sdk/readme.md

@@ -60,4 +60,5 @@
 | 1.5.1-RELEASE| 增加订单支付方式 | 海波 | 2020-05-25 |
 | 1.5.2-RELEASE| 新增订单完成时间时间戳 | 雷后领 | 2020-05-26 |
 | 1.8.9-SNAPSHOT | 用户订单和es综合查询接口新增订单业务类型集合 | wuping | 2020-06-01 |
-| 1.5.3-RELEASE| 增加下游订单号 | 海波 | 2020-06-01 |
+| 1.5.3-RELEASE| 增加下游订单号 | 海波 | 2020-06-01 |
\ No newline at end of file
+| 1.3.8-SNAPSHOT | 客如云订单信息 | 茹祥 | 2020-04-29 |
\ No newline at end of file

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

@@ -26,12 +26,14 @@ import com.freemud.sdk.api.assortment.order.request.order.*;
 import com.freemud.sdk.api.assortment.order.response.order.*;
 import com.freemud.sdk.api.assortment.order.response.payment.OrderPayResponse;
 import com.freemud.sdk.api.assortment.order.util.WeightUtils;
+import com.google.common.collect.Lists;
 import ma.glasnost.orika.MapperFacade;
 import ma.glasnost.orika.impl.DefaultMapperFactory;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.time.DateFormatUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Component;
 
 import java.math.BigDecimal;
@@ -1033,8 +1035,12 @@ public class OrderSdkAdapter {
         data.setOrderOperationHistoryList(getOrderOperationHistory(orderInfoReqs.getOrderOperationHistoryList()));
         data.setApportionDetails(getApportionDetails(orderInfoReqs));
         data.setOrderSettlementDetailList(orderInfoReqs.getOrderSettlementDetailList());
-        data.setOrderCostDetailList(orderInfoReqs.getOrderCostDetailList());
         data.setExpressChannelName(orderInfoReqs.getExpressChannelName());
+        //费用信息
+        data.setOrderCostDetailList(orderInfoReqs.getOrderCostDetailList());
+        //发票信息
+        data.setOrderInvoice(orderInfoReqs.getOrderInvoice());
+
         return data;
     }
 

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

@@ -15,6 +15,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.OrderSettlementResp;
+import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderInvoice;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.apache.commons.lang.builder.ToStringBuilder;
@@ -55,7 +56,8 @@ public class QueryOrdersResponse {
         @Data
         public static class OrderBean {
             /**
-             *
+             * 下单渠道 1:自营微信小程序 2:i点餐 3:自营支付宝小程序 4:自营H5 5:自营安卓APP 6:自营苹果APP 7:自营PC-WEB
+             * 8:饿了么 9:饿百 10:京东 11:美团外卖 12:自营APP 13:i应用会员 14:i应用订货 15:POS 16:百度外卖 18:i拼团 19:i围餐
              */
             private String orderClient;
             /**
@@ -368,10 +370,20 @@ public class QueryOrdersResponse {
             private String downstreamThirdOrderCode;
 
 
+            /**
+             * 发票明细
+             */
+            private OrderInvoice orderInvoice;
+
+
             @NoArgsConstructor
             @Data
             public static class AddDeliveryInfo {
 
+                /**
+                 * 配送类型     SELF("self", "自配送"),
+                 *              THIRD("third", "第三方配送");
+                 */
                 private String deliveryType;
                 /**
                  * 外卖中台运单号