Merge branch 'feature/20210105_新增版本号促销有礼活动_wanghanghang' into qa

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	order-application-service/pom.xml
#	order-application-service/src/test/java/cn/freemud/service/impl/MallOrderServiceImplTest.java
#	order-management/pom.xml
#	ordercenter-sdk/pom.xml
#	ordercenter-sdk/readme.md
#	shopping-cart-application-service/pom.xml

assortment-ordercenter-sdk/readme.md

@@ -96,3 +96,5 @@
 | 2.1.13-RELEASE | B端管理平台查询拼单订单 | 缪晖 | 2020-12-28 |
 | 2.1.14-RELEASE | 支付添加抖音渠道 | 张志恒 | 2020-12-29 |
 | 2.1.19-SNAPSHOT | 增加配送类型字段 | 王航航 | 2020-12-22 |
+
+| 2.1.15-RELEASE | 集点三期添加商户号 | 张志恒 | 2020-12-29 |
\ No newline at end of file

order-application-service/pom.xml

@@ -320,7 +320,7 @@
         <dependency>
             <groupId>com.freemud.sdk.api.assortment</groupId>
             <artifactId>assortment-payment-sdk</artifactId>
-            <version>2.6.4.SNAPSHOT</version>
+            <version>2.6.5.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.apache.rocketmq</groupId>

order-application-service/src/main/java/cn/freemud/entities/vo/QueryOrderVo.java

@@ -78,4 +78,9 @@ public class QueryOrderVo {
      */
     private String cardCode;
 
+    /**
+     * 支付有礼 版本号 20210105新增字段
+     */
+    private Integer payGiftVer;
+
 }

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

@@ -947,7 +947,7 @@ public class OrderServiceImpl implements Orderservice {
                     // 所以在这个地方排除掉coco，在下边单独实现
                     //参与支付有礼活动
                     if (!cocoPartnerId.contains(queryOrderVo.getPartnerId())) {
-                        joinPayGift(queryOrderVo.getSessionId(), queryOrderResponseVo, partnerId);
+                        joinPayGift(queryOrderVo.getSessionId(), queryOrderResponseVo, partnerId , queryOrderVo.getPayGiftVer());
                     }
 
                 } catch (Exception e) {
@@ -960,7 +960,7 @@ public class OrderServiceImpl implements Orderservice {
         if (cocoPartnerId.contains(queryOrderVo.getPartnerId())) {
             queryOrderResponseVos.forEach(queryOrderResponseVo -> {
                 try {
-                    joinPayGift(queryOrderVo.getSessionId(), queryOrderResponseVo, partnerId);
+                    joinPayGift(queryOrderVo.getSessionId(), queryOrderResponseVo, partnerId,null);
 
                 } catch (Exception e) {
                     LogUtil.error("coco_queryOrders_activity_error", gson.toJson(queryOrdersDto), gson.toJson(queryOrderResponseVo), e);
@@ -1299,7 +1299,7 @@ public class OrderServiceImpl implements Orderservice {
     }
 
     //参与支付有礼活动
-    private void joinPayGift(String sessionId, QueryOrderResponseVo queryOrderResponseVo, String partnerId) {
+    private void joinPayGift(String sessionId, QueryOrderResponseVo queryOrderResponseVo, String partnerId,Integer payGiftVer) {
         PayGitCheckAndJoinRequestDto payGitRequestDto = new PayGitCheckAndJoinRequestDto();
         payGitRequestDto.setStoreId(queryOrderResponseVo.getShopId());
         payGitRequestDto.setSessionId(sessionId);
@@ -1321,6 +1321,8 @@ public class OrderServiceImpl implements Orderservice {
             payGitRequestDto.setOrderWay(2);
         }
 
+        payGitRequestDto.setVer(payGiftVer);
+        //coco业务默认传值1
         if (cocoPartnerId.contains(partnerId)) {
             payGitRequestDto.setVer(1);
         }
@@ -1495,7 +1497,7 @@ public class OrderServiceImpl implements Orderservice {
         // 支付有礼
         // 目前只有coco在订单详情参加支付有礼，且不检查订单的状态
         if (cocoPartnerId.contains(partnerId)) {
-            joinPayGift(sessionId, queryOrderResponseVo, partnerId);
+            joinPayGift(sessionId, queryOrderResponseVo, partnerId,null);
         }
 
 

ordercenter-sdk/readme.md

@@ -96,4 +96,4 @@
 | 1.3.26.RELEASE | B端管理平台查询拼单订单 | 缪晖 | 2020-12-28 |
 | 1.3.27.RELEASE | 支付添加抖音渠道 | 张志恒 | 2020-12-29 |
 | 1.7.5-SNAPSHOT|  抖音支付   | 张志恒 | 2020-12-11 |
-
+| 1.3.28.RELEASE | 集点三期添加商户号 | 张志恒 | 2021-01-05 |
\ No newline at end of file

shopping-cart-application-service/src/test/java/cn.freemud/service/ShoppingCartNewServiceTest.java

@@ -21,10 +21,12 @@ import lombok.extern.slf4j.Slf4j;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.SpringBootVersion;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.netflix.feign.EnableFeignClients;
+import org.springframework.core.SpringVersion;
 import org.springframework.test.context.junit4.SpringRunner;
 
 @Slf4j
@@ -87,14 +89,10 @@ public class ShoppingCartNewServiceTest {
 
     @Test
     public void clearTest(){
-        ShoppingCartClearRequestVo requestVo = new ShoppingCartClearRequestVo();
-        requestVo.setShopId("999999998");
-        requestVo.setSessionId("9f4da5564ee1b7d0c72a29ad854e58eb9be68c05");
-        requestVo.setPartnerId("1864");
-        requestVo.setOrderType(1);
-        requestVo.setAppId("wxb78fb7c6218cb52c");
-        BaseResponse clear = shoppingCartNewService.clear(requestVo);
-        log.info("clear:{}" , JSONObject.toJSONString(clear));
+        String version = SpringVersion.getVersion();
+        String version1 = SpringBootVersion.getVersion();
+        System.out.println(version);
+        System.out.println(version1);
     }
 
 }