Merge branch 'feature/20200407_订单下载统计' into develop

# Conflicts:
#	ordercenter-sdk/pom.xml
#	ordercenter-sdk/readme.md

ordercenter-sdk/pom.xml

@@ -8,7 +8,7 @@
         <version>1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <version>1.1.9-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <artifactId>ordercenter-sdk</artifactId>
 
     <dependencies>

ordercenter-sdk/readme.md

@@ -15,3 +15,4 @@
 | 1.1.8.RELEASE | 预约单升级RELEASE | wuping | 2020-03-18 |
 | 1.1.9.RELEASE | 满额减配送费RELEASE | dingkai | 2020-03-26 |
 | 1.1.9-SNAPSHOT | 新增manager基础类 | 侯书虎 | 2020-04-2 |
+| 1.2.0-SNAPSHOT | 新增订单商品汇总下载接口 | 侯书虎 | 2020-04-07 |

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/constant/InterfaceAddressConstant.java

@@ -63,6 +63,8 @@ public class InterfaceAddressConstant {
     public static final String QUERY_ORDER_BY_CONDITIONS = "order/v2/queryOrderByConditions";
     //下载
     public static final String QUERY_ORDER_BY_SCROLL = "/order/v2/queryOrderByScroll";
+    //下载
+    public static final String QUERY_ORDER_ITEM_STATISTICS = "/order/v2/queryOrderItemSales";
 
     //修改订单配送信息
     public static final String UPDATE_DELIVERY_INFO = "order/v2/updateDeliveryInfo";

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/response/OrderItemStatisticsResponse.java

+package com.freemud.application.sdk.api.ordercenter.response;
+
+import lombok.Data;
+
+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ *
+ * @version V1.0
+ * @Title: OrderItemStatisticsResponse
+ * @Package com.freemud.application.sdk.api.ordercenter.response
+ * @Description:
+ * @author: shuhu.hou
+ * @date: 2020/4/7 16:21
+ * @Copyright: 2020 www.freemud.cn Inc. All rights reserved.
+ * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
+ */
+@Data
+public class OrderItemStatisticsResponse {
+    /**
+     * 商品
+     * 组合：productName + "#split#" + productId + "#split#" +productSpecName+ "#split#"+productProperty;
+     * 值：[多规格一维lulu]#split#[159339992708028675]#split#[多规格一维lulu/微辣]#split#[002之小类2/超级辣，变态辣！！]
+     */
+    private String aggsName;
+    /**
+     * 统计数量
+     */
+    private Double aggsSum;
+
+
+    /**
+     * 商品名称
+     */
+    public String getProductName() {
+        return aggsName.split("#split#")[0].replace("[", "").replace("]", "");
+    }
+
+    /**
+     * 商品编号
+     */
+    public String getProductId() {
+        return aggsName.split("#split#")[1].replace("[", "").replace("]", "");
+    }
+
+    /**
+     * 商品规格
+     */
+    public String getProductSpecName() {
+        return aggsName.split("#split#")[2].replace("[", "").replace("]", "");
+    }
+
+}

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/service/OrderDownLoadSdkService.java

@@ -10,6 +10,7 @@ import com.freemud.application.sdk.api.ordercenter.request.QueryAfterSalesOrderC
 import com.freemud.application.sdk.api.ordercenter.request.QueryOrderByScrollRequest;
 import com.freemud.application.sdk.api.ordercenter.response.BaseDownLoadResponse;
 import com.freemud.application.sdk.api.ordercenter.response.AfterSalesListResp;
+import com.freemud.application.sdk.api.ordercenter.response.OrderItemStatisticsResponse;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.AfterSalesOrderResp;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderInfoReqs;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.QueryByCodeResponse;
@@ -68,6 +69,15 @@ public class OrderDownLoadSdkService {
         return responseHandle(responseDTO);
     }
 
+    public BaseDownLoadResponse<List<OrderItemStatisticsResponse>> queryOrderItemStatistics(OrderConditionsReq request) {
+        long begin = System.currentTimeMillis();
+        BaseDownLoadResponse<List<OrderItemStatisticsResponse>> responseDTO = RequestThirdPartyUtils.httpJsonReqComplexDownLoad(restTemplate, InterfaceAddressConstant.QUERY_ORDER_ITEM_STATISTICS,
+                createBaseRequest(request, ""), new ParameterizedTypeReference<BaseDownLoadResponse<List<OrderItemStatisticsResponse>>>() {
+                });
+        ThirdPartyLog.infoConvertJson(begin, System.currentTimeMillis(), InterfaceAddressConstant.QUERY_ORDER_BY_SCROLL, request, responseMini(responseDTO));
+        return responseDTO;
+    }
+
     /**
      * 分页查询售后单
      *