fix

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

@@ -47,24 +47,6 @@ public class MaterialPromotionService implements IPromotionService {
     @Override
     public void updateShoppingCartGoodsDiscount(CouponPromotionVO couponPromotionVO, ActivityQueryDto activityQueryDto, ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult, List<CartGoods> cartGoodsList, ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo, UserLoginInfoDto userLoginInfoDto, ShoppingCartInfoRequestVo shoppingCartInfoRequestVo) {
 
-        /**
-         HashMap<String, MaterialApportion> map = getApportionGoodsDetail(calculationDiscountResult);
-         if (map.size() > 0) {
-         String pk = "";
-         for (CartGoods cartGoods : cartGoodsList) {
-         if (CollectionUtils.isEmpty(cartGoods.getProductMaterialList())) continue;
-         for (CartGoods.MaterialGoods materialGoods : cartGoods.getProductMaterialList()) {
-         pk = this.jointPk(cartGoods.getCartGoodsUid(),materialGoods.getSpuId());
-         MaterialApportion apportion = map.get(pk);
-         //设置小料行单价和行总价
-         if (apportion!=null && apportion.getApportionAmount().intValue()>0) {
-         materialGoods.setFinalPrice(apportion.getSalePrice());
-         materialGoods.setAmount(apportion.getAmount());
-         }
-         }
-         }
-         }
-         */
         long materialAmount = 0L, materialOriginal = 0L;
 
         for (CartGoods cartGoods : cartGoodsList) {
@@ -72,7 +54,7 @@ public class MaterialPromotionService implements IPromotionService {
             materialAmount = 0L;
             materialOriginal = 0L;
             for (CartGoods.MaterialGoods materialGoods : cartGoods.getProductMaterialList()) {
-                materialAmount += materialGoods.getAmount();
+                materialAmount += materialGoods.getFinalPrice()*cartGoods.getQty();
                 materialOriginal += materialGoods.getOriginalPrice() * cartGoods.getQty();
             }
             //设置商品行现总价\行原价 商品总价+小料商品总价