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/PayGiftCheckAndJoinResponseDto.java

@@ -23,6 +23,11 @@ import java.util.List;
 @Data
 public class PayGiftCheckAndJoinResponseDto {
 
+    /**
+     * 活动号
+     */
+    private  String activityNo;
+
     private  String activityName;
     /**
      * 发送方式

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

@@ -363,6 +363,9 @@ public class QueryOrderResponseVo {
     //支付有礼活动名称
     private String activityName;
 
+    //支付有礼活动号
+    private String activityNo;
+
     /**
      * 支付有礼发送方式
      * 0-静默发送

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

@@ -1299,6 +1299,7 @@ public class OrderServiceImpl implements Orderservice {
         BaseResponse<PayGiftCheckAndJoinResponseDto> payGiftBaseResponse = activityApplicationClient.payGiftCheckAndJoin(payGitRequestDto);
         if (String.valueOf(RESPONSE_SUCCESS_CODE).equals(payGiftBaseResponse.getCode()) && payGiftBaseResponse.getResult() != null) {
             PayGiftCheckAndJoinResponseDto payGiftResponse = payGiftBaseResponse.getResult();
+            queryOrderResponseVo.setActivityNo(payGiftResponse.getActivityNo());
             queryOrderResponseVo.setActivityName(payGiftResponse.getActivityName());
             queryOrderResponseVo.setCoupons(payGiftResponse.getCoupons());
             queryOrderResponseVo.setWechatCouponInfo(payGiftResponse.getWechatCouponInfo());

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java

@@ -273,7 +273,8 @@ public class ShoppingCartMCoffeeServiceImpl {
                         && cartGoods.getName().equals("啡常搭") && cartGoods.getGoodsType().equals(GoodsTypeEnum.SET_MEAL_GOODS.getGoodsType())
                         && CollectionUtils.isNotEmpty(cartGoods.getProductComboList()) && cartGoods.getProductComboList().size() == 1
                         && cartGoods.getProductComboList().get(0).getSkuId().equals(goodsId)
-                        && CollectionUtils.isEmpty(cartGoods.getProductGroupList())) {
+                        && CollectionUtils.isNotEmpty(cartGoods.getProductGroupList()) && cartGoods.getProductGroupList().size() == 1
+                        && cartGoods.getProductGroupList().get(0).getSkuId().equals("0") && cartGoods.getProductGroupList().get(0).getSkuName().equals("无")) {
                     // 如果购物车商品存在商品规格，替换时复制规格信息
                     if (CollectionUtils.isNotEmpty(cartGoods.getProductComboList().get(0).getSpecialExtra())) {
                         addShoppingCartGoodsRequestVo.setSpecialExtra(cartGoods.getProductComboList().get(0).getSpecialExtra());