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

# 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/adapter/OrderSdkAdapter.java

@@ -27,12 +27,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;
@@ -996,11 +998,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.setSendTime(orderInfoReqs.getDeliveryTime());
+        data.setCompleteTime(orderInfoReqs.getReceiveTime());
         data.setParentCode(orderInfoReqs.getParentCode());
         data.setIsParent(orderInfoReqs.getIsParent());
         data.setBizType(orderInfoReqs.getBizType());
@@ -1023,9 +1025,31 @@ 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);
+        }
+        //发票信息
+        if (null != orderInfoReqs.getOrderInvoice()){
+            QueryOrdersResponse.DataBean.OrderBean.OrderInvoice invoice = new QueryOrdersResponse.DataBean.OrderBean.OrderInvoice();
+            BeanUtils.copyProperties(orderInfoReqs.getOrderInvoice(), invoice);
+            data.setOrderInvoice(invoice);
+        }
         return data;
     }
 
+    private List<QueryOrdersResponse.DataBean.OrderBean.OrderCostResp> getOrderCostResps(List<OrderCostResp> orderCostDetailList) {
+        List<QueryOrdersResponse.DataBean.OrderBean.OrderCostResp> costResps = Lists.newArrayList();
+        orderCostDetailList.forEach(a -> {
+            QueryOrdersResponse.DataBean.OrderBean.OrderCostResp costResp = new QueryOrdersResponse.DataBean.OrderBean.OrderCostResp();
+            BeanUtils.copyProperties(a,costResp);
+            costResps.add(costResp);
+        });
+        return costResps;
+    }
+
     public QueryOrdersResponse convent2QueryOrdersResponse(BaseResponse<QueryOrderForUserResp> baseResponse) {
         QueryOrdersResponse response = new QueryOrdersResponse();
         response.setErrcode(Integer.parseInt(baseResponse.getCode()));

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

@@ -54,7 +54,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;
             /**
@@ -290,7 +291,7 @@ public class QueryOrdersResponse {
              */
             private String riderPhone;
             /**
-             * 系统接单时间
+             * 签收时间 送达时间 收货时间
              */
             private String receiveTime;
             /**
@@ -335,11 +336,86 @@ public class QueryOrdersResponse {
              */
             private BigDecimal weight;
 
+            /**
+             * 订单费用信息
+             */
+            List<OrderCostResp> orderCostDetailList;
+
+            /**
+             * 发票明细
+             */
+            private OrderInvoice orderInvoice;
+
+            @NoArgsConstructor
+            @Data
+            public static class OrderInvoice {
+                private String address;
+                //发票金额 单位分
+                private Long number;
+                // 银行账号
+                private String bankCardNo;
+                //发票内容
+                private String content;
+                //开户行
+                private String invoiceBank;
+                //发票类型 1:普通发票 2:增值发票
+                private String invoiceType;
+                //发票URL地址
+                private String invoiceUrl;
+                //订单商品ID
+                private String itemId;
+                //订单ID
+                private String orderId;
+                //商户编号
+                private String partnerId;
+                //电话号码
+                private String phoneNo;
+                //税号
+                private String taxNo;
+                //发票金额 单位分
+                private BigDecimal amount;
+                //发票抬头
+                private String title;
+            }
+
+            @NoArgsConstructor
+            @Data
+            public static class OrderCostResp {
+                //订单商品ID
+                private String productId;
+
+                //商品序号
+                private Integer productSeq;
+
+                //商品ID
+                private Long orderItemId;
+
+                //费用名称
+                private String costName;
+
+                //1=包装费,2=运费,3=餐盒单价,4=餐盒数量
+                private Integer costType;
+
+                //1=订单,2=订单商品,3=售后单
+                private Integer billType;
+
+                //费用金额
+                private BigDecimal costAmount;
+
+                //备注
+                private String note;
+
+            }
+
 
             @NoArgsConstructor
             @Data
             public static class AddDeliveryInfo {
 
+                /**
+                 * 配送类型     SELF("self", "自配送"),
+                 *              THIRD("third", "第三方配送");
+                 */
                 private String deliveryType;
                 /**
                  * 外卖中台运单号