Skip to content

O
order-group
Commit 1de76e12 by 徐康
Options

Merge branch 'feature/xukang_20210609_麦咖啡p7v2' into qa

parents 03a5b063 24815dfa
Showing with 4 additions and 0 deletions
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
...@@ -1966,6 +1966,7 @@ public class ShoppingCartMCoffeeServiceImpl { ...@@ -1966,6 +1966,7 @@ public class ShoppingCartMCoffeeServiceImpl {
cartGoods.setIsMonthCard(addShoppingCartGoodsRequestVo.getIsMonthCard()); cartGoods.setIsMonthCard(addShoppingCartGoodsRequestVo.getIsMonthCard());
cartGoods.setIsB3S1Coupon(addShoppingCartGoodsRequestVo.getIsB3S1Coupon()); cartGoods.setIsB3S1Coupon(addShoppingCartGoodsRequestVo.getIsB3S1Coupon());
cartGoods.setIsMonthCardGoods(addShoppingCartGoodsRequestVo.getIsMonthCardGoods()); cartGoods.setIsMonthCardGoods(addShoppingCartGoodsRequestVo.getIsMonthCardGoods());
cartGoods.setIsB3S1CouponGoods(addShoppingCartGoodsRequestVo.getIsB3S1Coupon());
cartGoods.setCouponCode(addShoppingCartGoodsRequestVo.getCouponCode()); cartGoods.setCouponCode(addShoppingCartGoodsRequestVo.getCouponCode());
Integer goodsType = StringUtils.isEmpty(skuId) || ObjectUtils.equals(spuId, skuId) ? GoodsTypeEnum.SPU_GOODS.getGoodsType() : GoodsTypeEnum.SKU_GOODS.getGoodsType(); Integer goodsType = StringUtils.isEmpty(skuId) || ObjectUtils.equals(spuId, skuId) ? GoodsTypeEnum.SPU_GOODS.getGoodsType() : GoodsTypeEnum.SKU_GOODS.getGoodsType();
if (CollectionUtils.isNotEmpty(addShoppingCartGoodsRequestVo.getProductComboList()) || CollectionUtils.isNotEmpty(addShoppingCartGoodsRequestVo.getProductGroupList())) { if (CollectionUtils.isNotEmpty(addShoppingCartGoodsRequestVo.getProductComboList()) || CollectionUtils.isNotEmpty(addShoppingCartGoodsRequestVo.getProductGroupList())) {
...@@ -1983,6 +1984,9 @@ public class ShoppingCartMCoffeeServiceImpl { ...@@ -1983,6 +1984,9 @@ public class ShoppingCartMCoffeeServiceImpl {
if (null != addShoppingCartGoodsRequestVo.getMonthCardInfo()){ if (null != addShoppingCartGoodsRequestVo.getMonthCardInfo()){
cartGoods.setMonthCardInfo(addShoppingCartGoodsRequestVo.getMonthCardInfo()); cartGoods.setMonthCardInfo(addShoppingCartGoodsRequestVo.getMonthCardInfo());
} }
if (null != addShoppingCartGoodsRequestVo.getB3S1CouponGoodsInfo()){
cartGoods.setB3S1CouponGoodsInfo(addShoppingCartGoodsRequestVo.getB3S1CouponGoodsInfo());
}
cartGoods.setGoodsType(goodsType); cartGoods.setGoodsType(goodsType);
cartGoods.setExtra(addShoppingCartGoodsRequestVo.getExtra()); cartGoods.setExtra(addShoppingCartGoodsRequestVo.getExtra());
cartGoods.setSpecialExtra(addShoppingCartGoodsRequestVo.getSpecialExtra()); cartGoods.setSpecialExtra(addShoppingCartGoodsRequestVo.getSpecialExtra());
......
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