商品券调整

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

@@ -11,6 +11,7 @@ import cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto;
 import cn.freemud.entities.vo.*;
 import cn.freemud.enums.ActivityChannelEnum;
 import cn.freemud.enums.ActivityTypeEnum;
+import cn.freemud.enums.GoodsTypeEnum;
 import cn.freemud.enums.ResponseResult;
 import cn.freemud.interceptor.ServiceException;
 import cn.freemud.service.CommonService;
@@ -383,7 +384,7 @@ public class CalculationServiceImpl {
         //累加需加入计算的商品
         int index;
         // 当商品已存在时,需累加数量
-        if ((index = calculationDiscountGoodsList.indexOf(calculationDiscountGoods)) >= 0) {
+        if ((index = calculationDiscountGoodsList.indexOf(calculationDiscountGoods)) >= 0 && !GoodsTypeEnum.COUPON_GOODS.getGoodsType().equals(cartGoods.getGoodsType())) {
             ActivityCalculationDiscountRequestDto.CalculationDiscountGoods oldCalculationDiscountGoods = calculationDiscountGoodsList.get(index);
             oldCalculationDiscountGoods.setGoodsQuantity(oldCalculationDiscountGoods.getGoodsQuantity() + calculationDiscountGoods.getGoodsQuantity());
         } else {