Merge branch 'KA-农工商积分订单查询时间调整' into qa

# Conflicts:
#	assortment-shoppingcart-sdk/pom.xml
#	shopping-cart-application-service/pom.xml

assortment-ordercenter-sdk/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>assortment-ordercenter-sdk</artifactId>
-    <version>2.3.1-RELEASE</version>
+    <version>2.3.2-RELEASE</version>
     <!--    其他服务使用聚合订单sdk,版本号往上升级,无需提交版本号,记录好readme.md,后续看readme.md往上加版本
     服务内使用无需修改版本号， 如果修改，使用到聚合订单sdk都需要统一升级-->
     <dependencies>
@@ -40,7 +40,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>ordercenter-sdk</artifactId>
-<!--            <version>1.3.67.RELEASE</version>-->
+<!--            <version>1.3.68.RELEASE</version>-->
             <!--    版本号在最外层pom设置,其他服务使用聚合订单sdk,打开注释，版本号与基础订单sdk版本号保持一直,无需提交代码 -->
         </dependency>
         <dependency>

assortment-ordercenter-sdk/readme.md

@@ -165,3 +165,4 @@
 | 2.2.1-RELEASE |  版本升级-开放平台支持商品券参数productId | 刘继明 | 2021-08-10|
 | 2.3-RELEASE |  合并 爱马哥需求的代码 | 周晓航 | 2021-08-23|
 | 2.3.1-RELEASE |  使用builder,手动添加构造器 | 周晓航 | 2021-08-23|
+| 2.3.2-RELEASE |  新增维护商品类型同步商品服务 | 周晓航 | 2021-09-03|
\ No newline at end of file

assortment-shoppingcart-sdk/readme.md

@@ -22,3 +22,4 @@
 | 1.3.1.RELEASE| 核销新增商城渠道| 张志恒 | 2021-05-21 |
 | 1.3.2.RELEASE| 麦咖啡一键下单| 徐康 | 2021-06-10 |
 | 2.0.0-SNAPSHOT| 重新升级SDK  | 周晓航 | 2021-06-15 |
+| 1.3.3.RELEASE| 重新升级SDK  | 周晓航 | 2021-09-03 |
\ No newline at end of file

order-application-service/pom.xml

@@ -48,12 +48,12 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
-            <version>2.3.1-RELEASE</version>
+            <version>2.3.2-RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
             <artifactId>productcenter-sdk</artifactId>
-            <version>4.0.3.RELEASE</version>
+            <version>4.0.4.RELEASE</version>
         </dependency>
         <dependency>
             <artifactId>membercenter-sdk</artifactId>

order-application-service/src/main/java/cn/freemud/service/impl/OrderCommonService.java

@@ -122,7 +122,7 @@ public class OrderCommonService {
         AssortmentOpenPlatformWxapp wxApp = openPlatformWxappManager.findByPartnerIdAndWxappId(partnerId, wxAppId);
         paymentRequest.setPrincipalName(wxApp.getPrincipalName());
         // fisherman 2227 测试商户号, 下个版本需要删除
-        if ("2080".equals(partnerId) || "2227".equals(partnerId)) {
+        if ("2080".equals(partnerId)) {
             //【ID1035981】【蜜雪冰城】订单C端，拼接order_body字段：蜜雪冰城+门店编号
             paymentRequest.setPrincipalName("蜜雪冰城"+orderBean.getShopId()+"店");
         }

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -2974,7 +2974,7 @@ public class OrderServiceImpl implements Orderservice {
     private PaymentRequest orderBodyConvertToPaymentBody(String openId, String partnerId, String appId, String payCode,String storeId) {
         PaymentRequest paymentRequest = this.orderBodyConvertToPaymentBody(openId, partnerId, appId, payCode);
         // fisherman 2227 测试商户号, 下个版本需要删除
-        boolean isTrue = "2080".equals(partnerId) || "2227".equals(partnerId);
+        boolean isTrue = "2080".equals(partnerId);
         if (isTrue) {
             //【ID1035981】【蜜雪冰城】订单C端，拼接order_body字段：蜜雪冰城+门店编号
             paymentRequest.setPrincipalName("蜜雪冰城"+ storeId +"店");
@@ -3514,9 +3514,10 @@ public class OrderServiceImpl implements Orderservice {
             OrderConditionsReq orderConditionsReq = new OrderConditionsReq();
             BeanUtil.convertBean(queryOrderByConditionsRequestVo, orderConditionsReq);
             orderConditionsReq.setUserId(userId);
-            Date startDate = DateUtil.convert2Date("2020-08-01 00:00:00", DateUtil.FORMAT_YYYY_MM_DD_HHMMSS);
-            orderConditionsReq.setStartTimestamp(startDate.getTime() / 1000);
-            orderConditionsReq.setEndTimestamp(new Date().getTime() / 1000);
+            //  当前时间往前三个月的订单查询
+            Date endTime = new Date();
+            orderConditionsReq.setStartTimestamp(DateUtil.addMonths(endTime, -3).getTime() / 1000);
+            orderConditionsReq.setEndTimestamp(endTime.getTime() / 1000);
             BaseDownLoadResponse<List<OrderInfoReqs>> orderInfoReqs = orderDownLoadSdkService.queryOrderByConditions(orderConditionsReq, LogThreadLocal.getTrackingNo());
             if (!String.valueOf(RESPONSE_SUCCESS_CODE).equals(orderInfoReqs.getCode())) {
                 return ResponseUtil.error(ResponseResult.ORDER_QUERYORDER_ERROR.getCode());

order-management/pom.xml

@@ -59,7 +59,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
-            <version>2.3.1-RELEASE</version>
+            <version>2.3.2-RELEASE</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

ordercenter-sdk/readme.md

@@ -104,3 +104,4 @@
 | 1.3.65.RELEASE | 聚合层sdk异常，版本引不到，解决代码报错 | 王航航 | 2021-07-20 |
 | 1.3.66.RELEASE | 基础订单sdk版本升级 | 伍平 | 2021-08-10 |
 | 1.3.67.RELEASE | 新增爱马哥需求代码改动 | 周晓航 | 2021-08-23 |
+| 1.3.68.RELEASE | 新增维护商品类型同步商品服务 | 周晓航 | 2021-09-03 |
\ No newline at end of file