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

@@ -129,7 +129,7 @@ public class CocoShoppingCartRelationServiceImpl implements ShoppingCartRelation
                         // 只要符合条件就需要设置为空
                         // 因为前端指挥在半价行、赠品行上打标
                         // 前端是从商品活动信息中查找活动，在商品列表中找商品
-                        if((gifeProductIds.contains(product.getGoodsId()) && ObjectUtils.equals(product.getActivityType(),ActivityTypeEnum.TYPE_63)) || !Objects.equals(num,0)){
+                        if((gifeProductIds.contains(product.getGoodsId()) && ObjectUtils.equals(product.getActivityType(),ActivityTypeEnum.TYPE_63.getCode())) || !Objects.equals(num,0)){
                             product.setGoodsId(null);
                         }
 
@@ -141,7 +141,11 @@ public class CocoShoppingCartRelationServiceImpl implements ShoppingCartRelation
                         }
 
                         // 商品的现单价使用促销返回的现单价
-                        product.setFinalPrice(goodsDiscountsMap.get(product.getCartGoodsUid()).getNowPrice());
+                        // 但是要排除赠品行、半价行
+                        if(!ObjectUtils.equals(product.getActivityType(),ActivityTypeEnum.TYPE_63.getCode()) || !ObjectUtils.equals(product.getActivityType(),ActivityTypeEnum.TYPE_53.getCode())){
+                            product.setFinalPrice(goodsDiscountsMap.get(product.getCartGoodsUid()).getNowPrice());
+                        }
+
 
                         newProducts.add(product);
                     }