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

@@ -293,7 +293,7 @@ public class CocoShoppingCartRelationServiceImpl implements ShoppingCartRelation
         if(products == null || products.isEmpty()){
             return;
         }
-
+        Set<String> halfGoodIds = new HashSet<>();
         List<CartGoods> halfProduct = new ArrayList<>();
 
         for(int x = 0 ; x < products.size() ; x ++){
@@ -343,6 +343,7 @@ public class CocoShoppingCartRelationServiceImpl implements ShoppingCartRelation
                     Long newPrice = originalPrice - discountAmount - halfSmallMaterialOriTotal;
                     // 构建半价行
                     CartGoods cartGoods = buildNewLine(product,ActivityTypeEnum.TYPE_53.getCode(),1,newPrice,product.getGoodsId(),originalPrice);
+                    halfGoodIds.add(cartGoods.getGoodsId());
                     halfProduct.add(cartGoods);
                 }
             }
@@ -372,7 +373,9 @@ public class CocoShoppingCartRelationServiceImpl implements ShoppingCartRelation
                 // 只要符合条件就需要设置为空
                 // 因为前端指挥在半价行、赠品行上打标
                 // 前端是从商品活动信息中查找活动，在商品列表中找商品
-                if((gifeProductIds.contains(product.getGoodsId()) && product.getActivityType() == null) || !Objects.equals(num,0)){
+                if((gifeProductIds.contains(product.getGoodsId()) && product.getActivityType() == null) || !Objects.equals(num,0)
+                   || halfGoodIds.contains(product.getGoodsId())
+                ){
                     product.setGoodsId(null);
                 }