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

@@ -19,6 +19,7 @@ import cn.freemud.entities.vo.ShoppingCartGoodsResponseVo;
 import cn.freemud.enums.ActivityTypeEnum;
 import cn.freemud.service.shoppingCart.ShoppingCartRelationService;
 import com.freemud.application.sdk.api.log.ApiLog;
+import com.freemud.application.sdk.api.log.LogThreadLocal;
 import com.google.common.collect.Lists;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
@@ -34,9 +35,11 @@ public class CocoShoppingCartRelationServiceImpl implements ShoppingCartRelation
                                                CalculationSharingDiscountResponseDto.CalculationDiscountResult discountResult,
                                                Integer flag) {
 
-        ApiLog.info("第二件半价，shoppingCartGoodsResponseVo，",shoppingCartGoodsResponseVo);
+        String TrackingNo =  LogThreadLocal.getTrackingNo();
 
-        ApiLog.info("第二件半价，discountResult，",discountResult);
+        ApiLog.info("第二件半价，TrackingNo,shoppingCartGoodsResponseVo，",TrackingNo,shoppingCartGoodsResponseVo);
+
+        ApiLog.info("第二件半价，TrackingNo,discountResult，",TrackingNo,discountResult);
 
         if(discountResult != null){
 
@@ -77,7 +80,7 @@ public class CocoShoppingCartRelationServiceImpl implements ShoppingCartRelation
                 });
             });
 
-            ApiLog.info("第二件半价，goodsDiscountsMap，",goodsDiscountsMap);
+            ApiLog.info("第二件半价，TrackingNo,goodsDiscountsMap，",TrackingNo,goodsDiscountsMap);
 
             List<CartGoods> newProducts = new ArrayList<>();
             List<CartGoods> products = shoppingCartGoodsResponseVo.getProducts();
@@ -85,7 +88,7 @@ public class CocoShoppingCartRelationServiceImpl implements ShoppingCartRelation
                 if(products == null || products.isEmpty()){
                     return;
                 }
-                ApiLog.info("第二件半价，products，",products);
+                ApiLog.info("第二件半价，TrackingNo,products，",TrackingNo,products);
                 products.forEach(product -> {
                     Integer num = 0;
                     // 商品优惠的金额
@@ -107,8 +110,8 @@ public class CocoShoppingCartRelationServiceImpl implements ShoppingCartRelation
                     Integer newQty = product.getQty() - num;
                     // 主商品行要数量，价格
                     if(!Objects.equals(newQty,0)){
-                        product.setAmount(product.getAmount() - discountAmount);
-                        product.setOriginalAmount(product.getOriginalAmount() - product.getOriginalPrice());
+                        product.setAmount(product.getAmount() - discountAmount * num);
+                        product.setOriginalAmount(product.getOriginalAmount() - product.getOriginalPrice() * num);
                         product.setQty(newQty);
                         newProducts.add(product);
                     }