Merge branch 'feature/20210719-sdk添加日结和审核列表从库查询-liujiming' into qa

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	ordercenter-sdk/pom.xml
#	ordercenter-sdk/readme.md
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java

assortment-ordercenter-sdk/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>assortment-ordercenter-sdk</artifactId>
-    <version>3.1.0-SNAPSHOT</version>
+    <version>2.1.85-RELEASE</version>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>ordercenter-sdk</artifactId>
-            <version>3.1.0-SNAPSHOT</version>
+            <version>1.3.64.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

assortment-ordercenter-sdk/readme.md

@@ -157,5 +157,6 @@
 | 2.1.76-RELEASE |  开放平台取消订单调用oms| 张志恒 | 2021-07-01|
 | 2.1.82-RELEASE |  pos 打印满赠 | 张志恒 | 2021-07-09|
 | 2.1.84-RELEASE |  KA-20210702-非码发版日售后单时间推迟 | 周晓航 | 2021-07-12|
+| 2.1.85-RELEASE |  小助手日结统计订单查询和售后列表查询改为从库查询 | 刘继明 | 2021-07-19|
 
 | 3.1.0-SNAPSHOT | needInvoice/immediately字段的规范 | 王世昌 | 2021-07-14 |

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/OrderCenterSdkService.java

@@ -402,4 +402,13 @@ public interface OrderCenterSdkService {
      * 订单POS拒单 POS
      */
     BaseOrderResponse mallOrderReject(CancelOrderRequest cancelOrderRequest);
+
+    /**
+     * 分页查询售后单(从库查询)
+     */
+    AfterSalesListResp queryAfterSalesListFromDb(QueryAfterSalesOrderConditionsReq queryRequest, String trackNo);
+    /**
+     * 小助手日结统计订单信息查询（分页，从库查询）
+     */
+    QueryOrdersResponse getOrderListByDb(QueryOrdersByConditionsRequest queryOrdersByConditionsRequest);
 }

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java

@@ -2291,4 +2291,16 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
         return orderSdkAdapter.convent2BaseOrderResponse(response);
     }
 
+    @Override
+    public AfterSalesListResp queryAfterSalesListFromDb(QueryAfterSalesOrderConditionsReq queryRequest, String trackNo) {
+        return orderDownLoadSdkService.queryAfterSalesOrderFromDb(queryRequest, trackNo);
+    }
+
+    @Override
+    public QueryOrdersResponse getOrderListByDb(QueryOrdersByConditionsRequest queryOrdersByConditionsRequest) {
+        OrderConditionsReq request = orderSdkAdapter.convent2QueryOrdersByConditionsRequest(queryOrdersByConditionsRequest);
+        BaseDownLoadResponse<List<OrderInfoReqs>> baseDownLoadResponse = orderDownLoadSdkService.queryOrderByDayFromDb(request, "");
+
+        return orderSdkAdapter.convent2OrdersResponseByES(baseDownLoadResponse);
+    }
 }

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/domain/ActivityTip.java

@@ -61,15 +61,15 @@ public class ActivityTip {
      * 1.5.5版本添加
      * 每单可以参与买一赠一商品总数
      */
-//    private Integer activityQty;
+    private Integer activityQty;
     /**
      * 1.5.5版本添加
      * 购物车中参与买一赠一商品个数
      */
-//    private Integer activityCartQty;
+    private Integer activityCartQty;
     /**
      * 1.5.5版本添加
      * 购物车中属于买一赠一商品的数据
      */
-//    private List<String> activitySpuIds;
+    private List<String> activitySpuIds;
 }

ordercenter-sdk/pom.xml

@@ -8,7 +8,7 @@
         <version>1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <version>3.1.0-SNAPSHOT</version>
+    <version>1.3.64.RELEASE</version>
     <artifactId>ordercenter-sdk</artifactId>
 
     <dependencies>

ordercenter-sdk/readme.md

@@ -98,3 +98,6 @@
 | 2.3.14-SNAPSHOT | 配送回调增加商家承担运费字段 | 王世昌 | 2021-07-05 |
 
 | 3.1.0-SNAPSHOT | needInvoice/immediately字段的规范 | 王世昌 | 2021-07-14 |
+
+| 1.3.63.RELEASE | 开放平台取消订单调用oms | 张志恒 | 2021-07-01 |
+| 1.3.64.RELEASE | 小助手日结统计订单查询和售后列表查询改为从库查询 | 刘继明 | 2021-07-19 |
\ No newline at end of file

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

@@ -258,5 +258,14 @@ public class InterfaceAddressConstant {
      *  查询 指定日期对应 商户号 的订单汇总数据
      */
     public static final String QUERY_ORDER_COUNT_REPORT = "order/v2/orderCount";
+    /**
+     *  根据综合条件查询售后单(从库查询)
+     */
+    public static final String QUERY_ORDER_AFTER_SALES_FROM_DB = "order/v2/db/queryAfterSalesOrderConditions";
+
+    /**
+     * 小助手日结统计订单从库查询
+     */
+    public static final String QUERY_ORDER_DAY_FROM_DB = "order/v2/db/queryOrderByConditions";
 
 }

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

@@ -170,6 +170,36 @@ public class OrderDownLoadSdkService {
         return responseHandle(responseDTO);
     }
 
+    /**
+     * 根据综合条件查询售后单(从库查询)
+     *
+     * @param queryRequest
+     * @param trackingNo
+     * @return
+     */
+    public AfterSalesListResp queryAfterSalesOrderFromDb(QueryAfterSalesOrderConditionsReq queryRequest, String trackingNo) {
+        AfterSalesListResp responseDTO = RequestThirdPartyUtils.httpJsonReqComplexNew(restTemplate, InterfaceAddressConstant.QUERY_ORDER_AFTER_SALES_FROM_DB,
+                createBaseRequest(queryRequest, trackingNo), new ParameterizedTypeReference<AfterSalesListResp>() {
+                });
+        return responseDTO;
+    }
+
+    /**
+     * 小助手日结统计订单查询（从库查询）
+     * @param request
+     * @param trackingNo
+     * @return
+     */
+    public BaseDownLoadResponse<List<OrderInfoReqs>> queryOrderByDayFromDb(OrderConditionsReq request, String trackingNo) {
+        long begin = System.currentTimeMillis();
+        BaseDownLoadResponse<List<OrderInfoReqs>> responseDTO = RequestThirdPartyUtils.httpJsonReqComplexDownLoad(restTemplate, InterfaceAddressConstant.QUERY_ORDER_DAY_FROM_DB,
+                createBaseRequest(request, trackingNo), new ParameterizedTypeReference<BaseDownLoadResponse<List<OrderInfoReqs>>>() {
+                });
+        batchCheckTime(request,responseDTO);
+        ThirdPartyLog.infoConvertJson(begin, System.currentTimeMillis(), InterfaceAddressConstant.QUERY_ORDER_DAY_FROM_DB, request, responseMini(responseDTO));
+        return responseHandle(responseDTO);
+    }
+
 
 
     BaseDownLoadResponse responseMini(BaseDownLoadResponse responseDTO){