coco加点日志

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

@@ -24,6 +24,7 @@ import cn.freemud.utils.WebUtil;
 import com.freemud.application.sdk.api.log.ApiLog;
 import com.freemud.application.sdk.api.log.LogThreadLocal;
 import com.google.common.collect.Lists;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,7 +32,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.*;
 import java.util.stream.Collectors;
-
+@Slf4j
 @Service("cocoShoppingCartRelationService")
 public class CocoShoppingCartRelationServiceImpl implements ShoppingCartRelationService {
 
@@ -358,7 +359,10 @@ public class CocoShoppingCartRelationServiceImpl implements ShoppingCartRelation
                 // 商品的单价 = 商品单价+小料单价
                 product.setOriginalPrice(originalPrice);
                 // 商品现单价 = 商品现单价+小料现单价
-                product.setFinalPrice(new Long(smallMaterialOriTotal) + product.getFinalPrice());
+                log.info("coco日志，smallMaterialOriTotal：{}",smallMaterialOriTotal);
+                log.info("coco日志，setFinalPrice：{}",product.getFinalPrice());
+                smallMaterialOriTotal = smallMaterialOriTotal == null ? 0 : smallMaterialOriTotal;
+                product.setFinalPrice(new Long(smallMaterialOriTotal) + (product.getFinalPrice() == null ? 0L : product.getFinalPrice()));
 
                 newProducts.add(product);
             }