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

@@ -359,7 +359,7 @@ public class CocoShoppingCartRelationServiceImpl implements ShoppingCartRelation
 
 
                 // 如果是赠品行，这行的价格就不用算了
-                if(!gifeProductIds.contains(product.getGoodsId()) && product.getActivityType() != null){
+                if(!gifeProductIds.contains(product.getGoodsId()) && product.getActivityType() == null){
                     // 商品的单价 = 商品单价+小料单价
                     product.setOriginalPrice(originalPrice);
                     // 商品现单价 = 商品现单价+小料现单价