Merge branch 'qa' of gitlab.freemud.com:order-group-application/order-group into qa

order-application-service/src/main/java/cn/freemud/entities/dto/activity/PayGitCheckAndJoinRequestDto.java

@@ -26,4 +26,7 @@ public class PayGitCheckAndJoinRequestDto {
     private Integer orderWay;
 
     private List<String> skuIds;
+
+    // 版本号
+    private Integer ver;
 }

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

@@ -940,7 +940,7 @@ public class OrderServiceImpl implements Orderservice {
                     // 所以在这个地方排除掉coco，在下边单独实现
                     //参与支付有礼活动
                     if(!cocoPartnerId.contains(queryOrderVo.getPartnerId())){
-                        joinPayGift(queryOrderVo.getSessionId(), queryOrderResponseVo);
+                        joinPayGift(queryOrderVo.getSessionId(), queryOrderResponseVo,partnerId);
                     }
 
                 } catch (Exception e) {
@@ -953,7 +953,7 @@ public class OrderServiceImpl implements Orderservice {
         if(cocoPartnerId.contains(queryOrderVo.getPartnerId())){
             queryOrderResponseVos.forEach(queryOrderResponseVo -> {
                 try {
-                    joinPayGift(queryOrderVo.getSessionId(), queryOrderResponseVo);
+                    joinPayGift(queryOrderVo.getSessionId(), queryOrderResponseVo,partnerId);
 
                 } catch (Exception e) {
                     LogUtil.error("coco_queryOrders_activity_error", gson.toJson(queryOrdersDto), gson.toJson(queryOrderResponseVo), e);
@@ -1277,7 +1277,7 @@ public class OrderServiceImpl implements Orderservice {
     }
 
     //参与支付有礼活动
-    private void joinPayGift(String sessionId, QueryOrderResponseVo queryOrderResponseVo) {
+    private void joinPayGift(String sessionId, QueryOrderResponseVo queryOrderResponseVo,String partnerId) {
         PayGitCheckAndJoinRequestDto payGitRequestDto = new PayGitCheckAndJoinRequestDto();
         payGitRequestDto.setStoreId(queryOrderResponseVo.getShopId());
         payGitRequestDto.setSessionId(sessionId);
@@ -1298,6 +1298,11 @@ public class OrderServiceImpl implements Orderservice {
         } else {
             payGitRequestDto.setOrderWay(2);
         }
+
+        if(cocoPartnerId.contains(partnerId)){
+            payGitRequestDto.setVer(1);
+        }
+
         BaseResponse<PayGiftCheckAndJoinResponseDto> payGiftBaseResponse = activityApplicationClient.payGiftCheckAndJoin(payGitRequestDto);
         if (String.valueOf(RESPONSE_SUCCESS_CODE).equals(payGiftBaseResponse.getCode()) && payGiftBaseResponse.getResult() != null) {
             PayGiftCheckAndJoinResponseDto payGiftResponse = payGiftBaseResponse.getResult();
@@ -1463,7 +1468,7 @@ public class OrderServiceImpl implements Orderservice {
         // 支付有礼
         // 目前只有coco在订单详情参加支付有礼，且不检查订单的状态
         if(cocoPartnerId.contains(partnerId)){
-            joinPayGift(sessionId, queryOrderResponseVo);
+            joinPayGift(sessionId, queryOrderResponseVo,partnerId);
         }
 
 

shopping-cart-application-service/src/main/java/cn/freemud/service/active/impl/CocoActiveServiceImpl.java

@@ -147,6 +147,7 @@ public class CocoActiveServiceImpl implements ActiveService {
                 newCartGoods.setClassificationName(cgs.getClassificationName());
                 newCartGoods.setActivityType(discount.getType());
                 newCartGoods.setQty(discountForGift.get(cgs.getCartGoodsUid()).getGoodsQuantity());
+                newCartGoods.setProductMaterialList(cgs.getProductMaterialList());
                 addcartGoodsList.add(newCartGoods);
             }
         }

shopping-cart-application-service/src/main/java/cn/freemud/service/shoppingCart/impl/CocoShoppingCartRelationServiceImpl.java

@@ -186,6 +186,7 @@ public class CocoShoppingCartRelationServiceImpl implements ShoppingCartRelation
         newCartGoods.setClassificationName(cgs.getClassificationName());
         newCartGoods.setActivityType(activityType);
         newCartGoods.setQty(qty);
+        newCartGoods.setProductMaterialList(cgs.getProductMaterialList());
 
         return newCartGoods;
     }