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

@@ -35,12 +35,6 @@ public class CocoShoppingCartRelationServiceImpl implements ShoppingCartRelation
                                                CalculationSharingDiscountResponseDto.CalculationDiscountResult discountResult,
                                                Integer flag) {
 
-        String TrackingNo =  LogThreadLocal.getTrackingNo();
-
-        ApiLog.info("第二件半价，TrackingNo,shoppingCartGoodsResponseVo，",TrackingNo,shoppingCartGoodsResponseVo);
-
-        ApiLog.info("第二件半价，TrackingNo,discountResult，",TrackingNo,discountResult);
-
         if(discountResult != null){
 
             List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.Discount> discounts = new ArrayList<>();
@@ -80,15 +74,12 @@ public class CocoShoppingCartRelationServiceImpl implements ShoppingCartRelation
                 });
             });
 
-            ApiLog.info("第二件半价，TrackingNo,goodsDiscountsMap，",TrackingNo,goodsDiscountsMap);
-
             List<CartGoods> newProducts = new ArrayList<>();
             List<CartGoods> products = shoppingCartGoodsResponseVo.getProducts();
             if(!Objects.equals(flag,1)){// 非结算页
                 if(products == null || products.isEmpty()){
                     return;
                 }
-                ApiLog.info("第二件半价，TrackingNo,products，",TrackingNo,products);
                 products.forEach(product -> {
                     Integer num = 0;
                     // 商品优惠的金额
@@ -139,6 +130,8 @@ public class CocoShoppingCartRelationServiceImpl implements ShoppingCartRelation
         // 价格只用一个商品的价格
         newCartGoods.setOriginalAmount(cgs.getOriginalPrice());
         // 价格只用一个商品的价格
+        newCartGoods.setFinalPrice(newPrice);
+        // 价格只用一个商品的价格
         newCartGoods.setAmount(newPrice);
         newCartGoods.setName(cgs.getName());
         newCartGoods.setSpuName(cgs.getSpuName());