Commit b7ad1f3e by huiyang.chen

fix 划线价

parent 4e9a3b18
...@@ -18,4 +18,6 @@ public class CommonsConstant { ...@@ -18,4 +18,6 @@ public class CommonsConstant {
public final static Integer WEIGHT_PRODUCT = 1; public final static Integer WEIGHT_PRODUCT = 1;
public final static Integer COUPON_TYPE = 1;
} }
...@@ -901,6 +901,8 @@ public class ShoppingCartMCoffeeServiceImpl { ...@@ -901,6 +901,8 @@ public class ShoppingCartMCoffeeServiceImpl {
// cartGoods.setCartGoodsUid(spuId); // cartGoods.setCartGoodsUid(spuId);
} else if (CollectionUtils.isNotEmpty(addShoppingCartGoodsRequestVo.getProductComboList()) || CollectionUtils.isNotEmpty(addShoppingCartGoodsRequestVo.getProductGroupList())) { } else if (CollectionUtils.isNotEmpty(addShoppingCartGoodsRequestVo.getProductComboList()) || CollectionUtils.isNotEmpty(addShoppingCartGoodsRequestVo.getProductGroupList())) {
goodsType = GoodsTypeEnum.SET_MEAL_GOODS.getGoodsType(); goodsType = GoodsTypeEnum.SET_MEAL_GOODS.getGoodsType();
}else if (CommonsConstant.COUPON_TYPE == addShoppingCartGoodsRequestVo.getCouponType()){
goodsType = GoodsTypeEnum.COUPON_GOODS.getGoodsType();
} }
if (addShoppingCartGoodsRequestVo.getOperationType() != null && addShoppingCartGoodsRequestVo.getOperationType() == 2) { if (addShoppingCartGoodsRequestVo.getOperationType() != null && addShoppingCartGoodsRequestVo.getOperationType() == 2) {
goodsType = GoodsTypeEnum.REDUCE_PRICE_GOODS.getGoodsType(); goodsType = GoodsTypeEnum.REDUCE_PRICE_GOODS.getGoodsType();
......
...@@ -108,6 +108,11 @@ public class MCoffeeAddGoodsRequestVo { ...@@ -108,6 +108,11 @@ public class MCoffeeAddGoodsRequestVo {
private Integer operationType; private Integer operationType;
/** /**
* 券类型 0:商品券
*/
private Integer couponType;
/**
* 优惠券号 * 优惠券号
*/ */
private String couponCode; private String couponCode;
......
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