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

@@ -84,6 +84,7 @@ public class CocoShoppingCartRelationServiceImpl implements ShoppingCartRelation
 
                 List<CartGoods> halfProduct = new ArrayList<>();
                 products.forEach(product -> {
+                    // 要添加的半价行数量，该字段从促销返回
                     Integer num = 0;
                     // 商品优惠的金额
                     Long discountAmount = 0L;
@@ -108,6 +109,11 @@ public class CocoShoppingCartRelationServiceImpl implements ShoppingCartRelation
                         product.setAmount(product.getAmount() - discountAmount * num);
                         product.setOriginalAmount(product.getOriginalAmount() - product.getOriginalPrice() * num);
                         product.setQty(newQty);
+                        // num不为0，全价行的活动类型就要设置成null
+                        // 前端用这个字段控制能否加减
+                        if(!Objects.equals(num,0)){
+                            product.setActivityType(null);
+                        }
                         newProducts.add(product);
                     }
                     newProducts.addAll(halfProduct);
@@ -163,7 +169,7 @@ public class CocoShoppingCartRelationServiceImpl implements ShoppingCartRelation
         newCartGoods.setSkuName(cgs.getSkuName());
         newCartGoods.setClassificationId(cgs.getClassificationId());
         newCartGoods.setClassificationName(cgs.getClassificationName());
-        //newCartGoods.setActivityType(activityType);
+        newCartGoods.setActivityType(activityType);
         newCartGoods.setQty(qty);
 
         return newCartGoods;