Merge remote-tracking branch 'origin/qa' into qa

shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/calculate/CalculationSharingDiscountResponseDto.java

@@ -266,6 +266,11 @@ public class CalculationSharingDiscountResponseDto {
                  * 当前活动实际优惠的商品数量
                  */
                 private Integer actualGoodsNumber;
+
+                /**
+                 * 优惠现单价
+                 */
+                private Long signleDiscount;
             }
 
             /**

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

@@ -242,13 +242,14 @@ public class CocoShoppingCartRelationServiceImpl implements ShoppingCartRelation
                 continue;
             }
             List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.SmallMaterial> smallMaterial = goodsDiscountsMap.get(product.getCartGoodsUid()).getSmallMaterial();
-            Integer smallMaterialTotal = 0;
+            Integer smallMaterialOriTotal = 0;
             for(CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.SmallMaterial sm : smallMaterial){
-                smallMaterialTotal = smallMaterialTotal + sm.getOriginalPrice();
+                smallMaterialOriTotal = smallMaterialOriTotal + sm.getOriginalPrice();
             }
 
             // 商品的单价 = 商品单价+小料单价
-            product.setOriginalPrice(new Long(smallMaterialTotal));
+            product.setOriginalPrice(new Long(smallMaterialOriTotal) + product.getOriginalPrice());
+            product.setFinalPrice(new Long(smallMaterialOriTotal) + product.getFinalPrice());
 
             newProducts.add(product);
         }
@@ -327,20 +328,21 @@ public class CocoShoppingCartRelationServiceImpl implements ShoppingCartRelation
                     product.setGoodsId(null);
                 }
 
+                ApiLog.info("coco小料",goodsDiscountsMap.get(product.getCartGoodsUid()),goodsDiscountsMap.get(product.getCartGoodsUid()).getSmallMaterial());
                 // 小料信息
                 if(goodsDiscountsMap.get(product.getCartGoodsUid()) == null){
                     continue;
                 }
                 List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.SmallMaterial> smallMaterial = goodsDiscountsMap.get(product.getCartGoodsUid()).getSmallMaterial();
-                Integer smallMaterialTotal = 0;
+                Integer smallMaterialOriTotal = 0;
                 for(CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.SmallMaterial sm : smallMaterial){
-                    smallMaterialTotal = smallMaterialTotal + sm.getOriginalPrice();
+                    smallMaterialOriTotal = smallMaterialOriTotal + sm.getOriginalPrice();
                 }
 
                 // 商品的单价 = 商品单价+小料单价
-                product.setOriginalPrice(new Long(smallMaterialTotal));
-                // 商品现单价=商品现单价+小料现单价
-                //product.setFinalPrice();
+                product.setOriginalPrice(new Long(smallMaterialOriTotal) + product.getOriginalPrice());
+                // 商品现单价 = 商品现单价+小料现单价
+                product.setFinalPrice(new Long(smallMaterialOriTotal) + product.getFinalPrice());
 
                 newProducts.add(product);
             }