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

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

@@ -573,7 +573,7 @@ public class CheckOrder {
         }
 
         // 这个是专门的给coco使用的验证券的逻辑
-        if (!ObjectUtils.equals(ResponseCodeConstant.COCO_RESPONSE_COUPON_ERR_STR, apportionResponse.getCode())) {
+        if (ObjectUtils.equals(ResponseCodeConstant.COCO_RESPONSE_COUPON_ERR_STR, apportionResponse.getCode())) {
             throw new ServiceException(ResponseResult.COCO_COUPON_VALIDATOR_FAIL,apportionResponse.getMessage());
         }
 

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

@@ -123,10 +123,22 @@ public class CocoShoppingCartRelationServiceImpl implements ShoppingCartRelation
                         product.setOriginalAmount(product.getOriginalAmount() - product.getOriginalPrice() * num);
                         product.setQty(newQty);
 
-                        if(gifeProductIds.contains(product.getGoodsId()) || !Objects.equals(newQty,0)){
+                        // num代表拆出来的半价行数量，gifeProductIds代表赠品
+                        // 只要符合条件就需要设置为空
+                        // 因为前端指挥在半价行、赠品行上打标
+                        // 前端是从商品活动信息中查找活动，在商品列表中找商品
+                        if(gifeProductIds.contains(product.getGoodsId()) || !Objects.equals(num,0)){
                             product.setGoodsId(null);
                         }
 
+                        // num代表拆出来的半价行数量
+                        // 所以只要不等于0就需要把ActivityType设置为空
+                        // 因为前端用这个判断是否能加减
+                        if(!Objects.equals(num,0)){
+                            product.setActivityType(null);
+                        }
+
+
                         newProducts.add(product);
                     }
                 }
@@ -184,9 +196,7 @@ public class CocoShoppingCartRelationServiceImpl implements ShoppingCartRelation
         newCartGoods.setSkuName(cgs.getSkuName());
         newCartGoods.setClassificationId(cgs.getClassificationId());
         newCartGoods.setClassificationName(cgs.getClassificationName());
-        // 所以这个字段设置为空
-        // 前端用这个字段控制能否加减
-        newCartGoods.setActivityType(null);
+        newCartGoods.setActivityType(activityType);
         newCartGoods.setQty(qty);
 
         return newCartGoods;