优惠计算修改

fcb4b766 · ping.wu · 4091f137 · fcb4b766
Commit fcb4b766 authored Aug 28, 2020 by ping.wu
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 9 deletions

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CalculationServiceImpl.java
+11 -9

No files found.
--- a/shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CalculationServiceImpl.java
+++ b/shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CalculationServiceImpl.java
@@ -381,15 +381,17 @@ public class CalculationServiceImpl {
            calculationDiscountGoods.setSmallMaterial(materials);
        }
-        //累加需加入计算的商品
+        calculationDiscountGoodsList.add(calculationDiscountGoods);
-        int index;
-        // 当商品已存在时,需累加数量
+//        //累加需加入计算的商品
-        if ((index = calculationDiscountGoodsList.indexOf(calculationDiscountGoods)) >= 0 && !GoodsTypeEnum.COUPON_GOODS.getGoodsType().equals(cartGoods.getGoodsType())) {
+//        int index;
-            ActivityCalculationDiscountRequestDto.CalculationDiscountGoods oldCalculationDiscountGoods = calculationDiscountGoodsList.get(index);
+//        // 当商品已存在时,需累加数量
-            oldCalculationDiscountGoods.setGoodsQuantity(oldCalculationDiscountGoods.getGoodsQuantity() + calculationDiscountGoods.getGoodsQuantity());
+//        if ((index = calculationDiscountGoodsList.indexOf(calculationDiscountGoods)) >= 0 && !GoodsTypeEnum.COUPON_GOODS.getGoodsType().equals(cartGoods.getGoodsType())) {
-        } else {
+//            ActivityCalculationDiscountRequestDto.CalculationDiscountGoods oldCalculationDiscountGoods = calculationDiscountGoodsList.get(index);
-            calculationDiscountGoodsList.add(calculationDiscountGoods);
+//            oldCalculationDiscountGoods.setGoodsQuantity(oldCalculationDiscountGoods.getGoodsQuantity() + calculationDiscountGoods.getGoodsQuantity());
-        }
+//        } else {
+//
+//        }
    }