前段新增字段payGiftVer支付有礼版本号，订单接收转换为ver传给促销

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

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