订单详情增加字段

assortment-ordercenter-sdk/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>assortment-ordercenter-sdk</artifactId>
-    <version>1.6.6-SNAPSHOT</version>
+    <version>1.6.7-SNAPSHOT</version>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>

assortment-ordercenter-sdk/readme.md

@@ -57,3 +57,4 @@
 | 1.3.7.RELEASE | 放开常用方法修饰符 | 李小二 | 2020-04-27 |
 | 1.6.5-SNAPSHOT | 创建订单增加appid字段 | wuping | 2020-05-08 |
 | 1.6.6-SNAPSHOT | 退单增加配送费字段 | 海波 | 2020-05-12 |
+| 1.6.7-SNAPSHOT | 开放平台订单详情补全信息 | 茹祥 | 2020-05-12 |
\ No newline at end of file

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

@@ -27,7 +27,6 @@ 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;
@@ -38,7 +37,6 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Component;
 
 import java.math.BigDecimal;
-import java.text.DecimalFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -1027,10 +1025,10 @@ public class OrderSdkAdapter {
         data.setOrderCostDetailList(orderInfoReqs.getOrderCostDetailList());
 
         //费用信息
-        if (CollectionUtils.isNotEmpty(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();
@@ -1040,16 +1038,6 @@ public class OrderSdkAdapter {
         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

@@ -248,6 +248,9 @@ public class QueryOrdersResponse {
 
             private List<OrderSettlement> apportionDetails;
 
+            /**
+             * 订单费用信息
+             */
             private List<OrderCostResp> orderCostDetailList;
 
 
@@ -337,11 +340,6 @@ public class QueryOrdersResponse {
             private BigDecimal weight;
 
             /**
-             * 订单费用信息
-             */
-            List<OrderCostResp> orderCostDetailList;
-
-            /**
              * 发票明细
              */
             private OrderInvoice orderInvoice;
@@ -378,7 +376,7 @@ public class QueryOrdersResponse {
                 private String title;
             }
 
-            @NoArgsConstructor
+            /*@NoArgsConstructor
             @Data
             public static class OrderCostResp {
                 //订单商品ID
@@ -405,7 +403,7 @@ public class QueryOrdersResponse {
                 //备注
                 private String note;
 
-            }
+            }*/
 
 
             @NoArgsConstructor