Skip to content

O
order-group
Commit fc2ae16c by huiyang.chen
Options

Merge branch '2020/09/24-运费券-huiyang' into develop

parents 7a2aa3b8 2859b741
Showing with 2 additions and 2 deletions
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
...@@ -225,9 +225,9 @@ public class ShoppingCartMCoffeeServiceImpl { ...@@ -225,9 +225,9 @@ public class ShoppingCartMCoffeeServiceImpl {
throw new ServiceException(ResponseResult.SHOPPING_CART_COUPON_USED); throw new ServiceException(ResponseResult.SHOPPING_CART_COUPON_USED);
} }
//同样商品券不能使用 //同样商品券不能使用
if (StringUtils.isNotEmpty(couponCode)&& StringUtils.isNotEmpty(cartGoods.getCouponCode()) && goodsId.equals(cartGoods.getGoodsId())) { /* if (StringUtils.isNotEmpty(couponCode)&& StringUtils.isNotEmpty(cartGoods.getCouponCode()) && goodsId.equals(cartGoods.getGoodsId())) {
throw new ServiceException(ResponseResult.SHOPPING_CART_GOODS_COUPON_CAN_NOT_USE); throw new ServiceException(ResponseResult.SHOPPING_CART_GOODS_COUPON_CAN_NOT_USE);
} }*/
} }
} }
//新增商品券 //新增商品券
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment