Merge branches 'develop' and 'feature/20200522_买券订单创建_wuping' of…

Merge branches 'develop' and 'feature/20200522_买券订单创建_wuping' of http://gitlab.freemud.com/order-group-application/order-group 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

@@ -1033,6 +1033,7 @@ public class OrderSdkAdapter {
         }
         data.setOrderOperationHistoryList(getOrderOperationHistory(orderInfoReqs.getOrderOperationHistoryList()));
         data.setApportionDetails(getApportionDetails(orderInfoReqs));
+        data.setOrderSettlementDetailList(orderInfoReqs.getOrderSettlementDetailList());
         //费用信息
         data.setOrderCostDetailList(orderInfoReqs.getOrderCostDetailList());
         //发票信息

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.OrderInvoice;
+import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderSettlementResp;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.apache.commons.lang.builder.ToStringBuilder;
@@ -260,6 +261,7 @@ public class QueryOrdersResponse {
              */
             private List<OrderCostResp> orderCostDetailList;
 
+            private List<OrderSettlementResp> orderSettlementDetailList;
 
             private AddDeliveryInfo addInfo;