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

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	order-application-service/pom.xml
#	order-management/pom.xml
#	ordercenter-sdk/pom.xml
#	ordercenter-sdk/readme.md
#	shopping-cart-application-service/pom.xml

assortment-ordercenter-sdk/readme.md

@@ -149,4 +149,5 @@
 | 2.2.27-SNAPSHOT | 集点添加商户号 | 张志恒 | 2020-12-31 |
 | 2.1.13-RELEASE | B端管理平台查询拼单订单 | 缪晖 | 2020-12-28 |
 | 2.1.14-RELEASE | 支付添加抖音渠道 | 张志恒 | 2020-12-29 |
-| 2.2.28-SNAPSHOT | 停车场查询添加排序字段 | 张志恒 | 2021-01-03 |
+| 2.2.28-SNAPSHOT | 停车场查询添加排序字段 | 张志恒 | 2021-01-03 |
\ No newline at end of file
+| 2.1.15-RELEASE | 集点三期添加商户号 | 张志恒 | 2020-12-29 |
\ No newline at end of file

order-application-service/pom.xml

@@ -82,7 +82,7 @@
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
             <artifactId>takeawaycenter-sdk</artifactId>
-            <version>1.3.2.RELEASE</version>
+            <version>1.2.3-SNAPSHOT</version>
         </dependency>
         <!--  商户门店sdk  -->
         <dependency>
@@ -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>
@@ -443,4 +443,4 @@
         </repository>
     </repositories>
 
-</project>
+</project>
\ No newline at end of file

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

@@ -935,7 +935,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) {
@@ -948,7 +948,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);
@@ -1301,7 +1301,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);
@@ -1323,6 +1323,8 @@ public class OrderServiceImpl implements Orderservice {
             payGitRequestDto.setOrderWay(2);
         }
 
+        payGitRequestDto.setVer(payGiftVer);
+        //coco业务默认传值1
         if (cocoPartnerId.contains(partnerId)) {
             payGitRequestDto.setVer(1);
         }
@@ -1497,7 +1499,7 @@ public class OrderServiceImpl implements Orderservice {
         // 支付有礼
         // 目前只有coco在订单详情参加支付有礼，且不检查订单的状态
         if (cocoPartnerId.contains(partnerId)) {
-            joinPayGift(sessionId, queryOrderResponseVo, partnerId);
+            joinPayGift(sessionId, queryOrderResponseVo, partnerId,null);
         }
 
 

order-application-service/src/test/java/cn/freemud/service/impl/MallOrderServiceImplTest.java

@@ -11,10 +11,12 @@ import com.freemud.sdk.api.assortment.order.response.order.MultiOrderRefundRespo
 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;
 import springfox.documentation.spring.web.json.Json;
 
@@ -25,88 +27,12 @@ import springfox.documentation.spring.web.json.Json;
 @EnableAutoConfiguration
 public class MallOrderServiceImplTest {
 
-    @Autowired
-    private OrderDownLoadSdkService orderDownLoadSdkService;
-
-//    @Autowired
-//    private MallOrderServiceImpl mallOrderService;
-//
-//    @Autowired
-//    private MCCafeOrderServiceImpl mcCafeOrderService;
-//
-//    @Autowired
-//    private MulitiPaymentClient mulitiPaymentClient;
-//
-//    @Autowired
-//    private OrderManagerAdapter orderManagerAdapter;
-
-//    @Before
-//    public void before() throws Exception {
-//    }
-//
-//    @After
-//    public void after() throws Exception {
-//    }
-
-//    @Test
-//    public void f1() {
-//        mcCafeOrderService.createOrder(JSON.parseObject("{\"channelType\":\"saas\",\"couponCode\":\"\",\"menuType\":\"saasdelivery\",\"needInvoice\":0,\"needTableware\":0,\"orderRemark\":\"\",\"orderType\":2,\"partnerId\":\"1206\",\"payChannelType\":1,\"receiveId\":\"3599568180562003060\",\"sessionId\":\"c4377678dbcbd6cdf6e7df86ea112b6f82723023\",\"shopId\":\"1450026\",\"takeMealFlag\":\"0\"}", CreateOrderVo.class),
-//                new StoreResponse.BizVO(),
-//                JSON.parseObject("{\"activityDiscountsDtos\":[],\"deliveryAmount\":10,\"discountDeliveryAmount\":10,\"isDiscountDelivery\":false,\"originalTotalAmount\":4400,\"packageAmount\":0,\"products\":[{\"activityDiscountsDtos\":[],\"attributeNames\":\"{\\\"attributeNames\\\":\\\"\\\"}\",\"cartGoodsUid\":\"eb8c7260-8ecb-44d1-9234-8d8bed0b0875\",\"classificationId\":\"\",\"classificationName\":\"\",\"comboProducts\":[{\"attributeNames\":\"{\\\"attributeNames\\\":\\\"\\\"}\",\"customerCode\":\"501642\",\"extraList\":[],\"hasProductCoupon\":false,\"isFixedProduct\":false,\"materialList\":[],\"originalPrice\":1700,\"parentProductId\":\"184437853099519288\",\"picture\":\"https://picture.sandload.cn/1598678546485.png\",\"productType\":6,\"qty\":2,\"skuId\":\"184437494035639613\",\"skuName\":\"中杯热美式\",\"spuId\":\"184437494035639613\",\"spuName\":\"中杯热美式\",\"stockLimit\":false,\"tax\":0.01,\"taxId\":\"\",\"totalDiscountAmount\":0,\"unit\":\"\",\"weight\":0.0},{\"attributeNames\":\"{\\\"attributeNames\\\":\\\"\\\"}\",\"customerCode\":\"901290\",\"extraList\":[],\"hasProductCoupon\":false,\"isFixedProduct\":false,\"materialList\":[],\"originalPrice\":500,\"parentProductId\":\"184437853099519288\",\"picture\":\"https://picture.sandload.cn/1598677404074.png\",\"productType\":6,\"qty\":2,\"skuId\":\"184436294373469463\",\"skuName\":\"经典芝士蛋糕\",\"spuId\":\"184436294373469463\",\"spuName\":\"经典芝士蛋糕\",\"stockLimit\":false,\"tax\":0.01,\"taxId\":\"\",\"totalDiscountAmount\":0,\"unit\":\"\",\"weight\":0.0}],\"customerCode\":\"901280\",\"extraList\":[],\"hasProductCoupon\":false,\"materialList\":[],\"originalPrice\":4400,\"picture\":\"https://picture.sandload.cn/1598678861518.png\",\"productCode\":\"901280\",\"productType\":6,\"qty\":2,\"salePrice\":4400,\"skuId\":\"184437853099519288\",\"skuName\":\"早餐啡常搭\",\"spuId\":\"184437853099519288\",\"spuName\":\"早餐啡常搭\",\"stockLimit\":false,\"tax\":0.01,\"taxId\":\"\",\"totalDiscountAmount\":0,\"unit\":\"\",\"weight\":0.0}],\"shareDiscountActivityDtos\":[],\"totalAmount\":4400,\"totalDiscountAmount\":0}", ShoppingCartGoodsDto.class),
-//                new OrderExtendedReq(),
-//                OrderClientType.SAAS,"www");
-//    }
-//
-//    @Test
-//    public void testPaySuccess() {
-//        //0元支付
-//        String fmId = "SPAY" + ValidationCode.getRandomUuid();
-//        PaysuccessNoticeMessage message = new PaysuccessNoticeMessage();
-//        message.setResult_code(100);
-//        message.setOut_trade_no(fmId);
-//        message.setTrans_id("16303606485084241800003");
-//        message.setTotal_fee(0);
-//        message.setOpenid("oORZK5MHMBm78PO302NdRyzIY5K0");
-//        message.setPlatform_coupon(0);
-//        message.setMerchant_coupon(0);
-//        mallOrderService.paySuccessCallback(message);
-//    }
-
-//    @Test
-//    public void testAffirm() {
-//        OrderAffirmRequestVO requestVO = new OrderAffirmRequestVO();
-//        requestVO.setPartnerId("1864");
-//        requestVO.setShopId("8899");
-//        requestVO.setSessionId("123123");
-//        requestVO.setChannelType("saasmall");
-//        requestVO.setOid("16303606485084241800003");
-//        mallOrderService.orderAffirm(requestVO);
-//    }
-
     @Test
     public void test() {
-//        MultiOrderRefundRequest multiOrderRefundRequest = new MultiOrderRefundRequest();
-//        multiOrderRefundRequest.setFmId("");
-//        multiOrderRefundRequest.setVer3(false);
-//        multiOrderRefundRequest.setVer("V1");
-//        multiOrderRefundRequest.setNotifyUrl("http://open-store-order-application-service.open-store.svc:9212/order/refundNotifyCallback");
-//        multiOrderRefundRequest.setOperatorId("1");
-//        multiOrderRefundRequest.setPartnerId("1864");
-//        multiOrderRefundRequest.setRefundAmount(1L);
-//        multiOrderRefundRequest.setRefundTradeNo("1604886134387{{$timestamp}}");
-//        multiOrderRefundRequest.setStationId("1");
-//        multiOrderRefundRequest.setStoreId("999999998");
-//        multiOrderRefundRequest.setOutOrderNo("3900472893821604933666");
-//        MultiOrderRefundResponse<MultiOrderRefundResponse.Data> multiOrderRefundResponseDto = mulitiPaymentClient.paymentApplicationRefund(multiOrderRefundRequest,"1864");
-//        System.out.println(2345678);
-//        OrderManagerRequest orderManagerRequest = new OrderManagerRequest();
-//        orderManagerRequest.setOrderId("19404015572678969200003");
-//        orderManagerRequest.setPartnerId("1864");
-//        orderManagerAdapter.orderAgreeRefund(orderManagerRequest);
-        OrderConditionsReq request ;
-        String str = "{\"abnormalStatuses\":[],\"afterSalesStatus\":0,\"appId\":\"\",\"bizType\":0,\"bizTypes\":[1,6,97,98],\"dispenseStatus\":0,\"endTimestamp\":1605542399,\"endUpdateTimestamp\":0,\"expressType\":0,\"externalObjectIds\":[],\"finishStatus\":false,\"isDeleted\":0,\"mobile\":\"\",\"orderClients\":[],\"orderCode\":\"19356550932276285500005\",\"orderCodes\":[],\"orderStatus\":0,\"orderStatuses\":[],\"orderTypes\":[],\"pageNum\":1,\"pageSize\":10,\"partnerId\":\"2655\",\"payStatuses\":[2,3,4],\"payTypes\":[],\"printNum\":0,\"productId\":\"\",\"productName\":\"\",\"settlementTypes\":[],\"startTimestamp\":1604160000,\"startUpdateTimestamp\":0,\"storeIds\":[],\"suspendState\":0,\"thirdOrderCode\":\"\",\"userId\":\"\",\"userName\":\"\"}";
-        request = JSON.toJavaObject(JSON.parseObject(str),OrderConditionsReq.class);
-        orderDownLoadSdkService.queryOrderByConditions(request,"");
+        String version = SpringVersion.getVersion();
+        String version1 = SpringBootVersion.getVersion();
+        System.out.println(version);
+        System.out.println(version1);
     }
 
 

ordercenter-sdk/readme.md

@@ -56,4 +56,5 @@
 | 1.3.25.RELEASE | 农工商添加设备号 | 梁崇福 | 2020-12-21 |
 | 1.3.26.RELEASE | B端管理平台查询拼单订单 | 缪晖 | 2020-12-28 |
 | 1.3.27.RELEASE | 支付添加抖音渠道 | 张志恒 | 2020-12-29 |
-| 1.8.1-SNAPSHOT|  停车场订单添加排序规则字段   | 张志恒 | 2021-01-03 |
+| 1.8.1-SNAPSHOT|  停车场订单添加排序规则字段   | 张志恒 | 2021-01-03 |
\ No newline at end of file
+| 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);
     }
 
 }