Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa

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

@@ -49,7 +49,7 @@ public class CocoShoppingCartRelationServiceImpl implements ShoppingCartRelation
                     discounts.add(discount);
                 });
             }
-
+            ApiLog.info("coco算行，shoppingCartGoodsResponseVo,discountResult",shoppingCartGoodsResponseVo,discountResult);
             // 促销的活动信息和商品优惠信息给前端做展示、打标签用
             shoppingCartGoodsResponseVo.setDiscounts(discounts);
             shoppingCartGoodsResponseVo.setGoods(discountResult.getGoods());
@@ -61,9 +61,6 @@ public class CocoShoppingCartRelationServiceImpl implements ShoppingCartRelation
                 gifeProductIds = products.stream().filter(product -> Objects.equals(product.getActivityType(),ActivityTypeEnum.TYPE_63)).map(CartGoods::getGoodsId).collect(Collectors.toList());
             }
 
-
-
-
             // 第二件优惠活动，在点餐页需要给优惠商品单独显示一行
             // 第二件优惠活动Map
             Map<String,CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount> goodsDiscountsMap = new HashMap<>();
@@ -128,6 +125,7 @@ public class CocoShoppingCartRelationServiceImpl implements ShoppingCartRelation
                         // 只要符合条件就需要设置为空
                         // 因为前端指挥在半价行、赠品行上打标
                         // 前端是从商品活动信息中查找活动，在商品列表中找商品
+                        ApiLog.info("coco算行，gifeProductIds,product,flag",gifeProductIds,product,(gifeProductIds.contains(product.getGoodsId()) || !Objects.equals(num,0)));
                         if(gifeProductIds.contains(product.getGoodsId()) || !Objects.equals(num,0)){
                             product.setGoodsId(null);
                         }