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

@@ -140,7 +140,7 @@ public class CocoShoppingCartRelationServiceImpl implements ShoppingCartRelation
     }
 
 
-    public CartGoods buildNewLine(CartGoods cgs,Integer activityType,Integer qty,Long newPrice,String goodsId){
+    public CartGoods buildNewLine(CartGoods cgs,Integer activityType,Integer qty,Long newPrice,String goodsId,Long originalPrice){
         CartGoods newCartGoods = new CartGoods();
         // 购物车的行设置和原来的行一致，便于前端在更新商品数量的时候。能够根据购物车行聚合商品数量
         // 因为半价行是从主行中拆出来的
@@ -153,11 +153,11 @@ public class CocoShoppingCartRelationServiceImpl implements ShoppingCartRelation
         newCartGoods.setSkuId(cgs.getSkuId());
         newCartGoods.setSpecProductId(cgs.getSpecProductId());
         // 价格只用一个商品的价格
-        newCartGoods.setOriginalPrice(cgs.getOriginalPrice());
+        newCartGoods.setOriginalPrice(originalPrice);
         // 价格只用一个商品的价格
         newCartGoods.setPackPrice(cgs.getPackPrice());
         // 价格只用一个商品的价格
-        newCartGoods.setOriginalAmount(cgs.getOriginalPrice());
+        newCartGoods.setOriginalAmount(originalPrice);
         // 价格只用一个商品的价格
         newCartGoods.setFinalPrice(newPrice);
         // 价格只用一个商品的价格
@@ -219,9 +219,9 @@ public class CocoShoppingCartRelationServiceImpl implements ShoppingCartRelation
                     // 构建半价行
                     CartGoods cartGoods = new CartGoods();
                     if(i < 2){
-                        cartGoods = buildNewLine(product,ActivityTypeEnum.TYPE_53.getCode(),1,product.getFinalPrice(),product.getGoodsId());
+                        cartGoods = buildNewLine(product,ActivityTypeEnum.TYPE_53.getCode(),1,product.getFinalPrice(),product.getGoodsId(),null);
                     }else{
-                        cartGoods = buildNewLine(product,ActivityTypeEnum.TYPE_53.getCode(),1,product.getFinalPrice(),null);
+                        cartGoods = buildNewLine(product,ActivityTypeEnum.TYPE_53.getCode(),1,product.getFinalPrice(),null,null);
                     }
 
                     newProducts.add(cartGoods);
@@ -317,7 +317,7 @@ public class CocoShoppingCartRelationServiceImpl implements ShoppingCartRelation
                     // 现单价 = 商品原单价+小料原单价-商品现单价小料现单价
                     Long newPrice = originalPrice - discountAmount - halfSmallMaterialOriTotal;
                     // 构建半价行
-                    CartGoods cartGoods = buildNewLine(product,ActivityTypeEnum.TYPE_53.getCode(),1,newPrice,product.getGoodsId());
+                    CartGoods cartGoods = buildNewLine(product,ActivityTypeEnum.TYPE_53.getCode(),1,newPrice,product.getGoodsId(),originalPrice);
                     halfProduct.add(cartGoods);
                 }
             }