增加字段

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

@@ -963,29 +963,12 @@ public class OrderSdkAdapter {
         }
         data.setOrderOperationHistoryList(getOrderOperationHistory(orderInfoReqs.getOrderOperationHistoryList()));
         data.setApportionDetails(getApportionDetails(orderInfoReqs));
-
         //费用信息
-        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);
-        }
-        return data;
-    }
+        data.setOrderInvoice(orderInfoReqs.getOrderInvoice());
 
-    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;
+        return data;
     }
 
     public QueryOrdersResponse convent2QueryOrdersResponse(BaseResponse<QueryOrderForUserResp> baseResponse) {

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

@@ -13,6 +13,8 @@
 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;
@@ -334,67 +336,6 @@ public class QueryOrdersResponse {
              */
             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