Skip to content

O
order-group
Commit 5e1d81e1 by xiaoer.li@freemud.com
Options

对接促销算价Alpha->fix

parent d94422c5
Showing with 2 additions and 1 deletions
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/CalculationCommonService.java
...@@ -161,7 +161,7 @@ public class CalculationCommonService { ...@@ -161,7 +161,7 @@ public class CalculationCommonService {
*/ */
public ShoppingCartGoodsDto.CartGoodsDetailDto convertCartGoods2DetailGoodsList(CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods calculationGoods public ShoppingCartGoodsDto.CartGoodsDetailDto convertCartGoods2DetailGoodsList(CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods calculationGoods
, CartGoods cartGoods) { , CartGoods cartGoods) {
log.info("convertCartGoods2DetailGoodsList ->calculationGoods:{},cartGoods:{}", calculationGoods, cartGoods); log.debug("convertCartGoods2DetailGoodsList ->calculationGoods:{},cartGoods:{}", calculationGoods, cartGoods);
ShoppingCartGoodsDto.CartGoodsDetailDto cartGoodsDetailDto = this.convertCartGoods2DetailGoods(calculationGoods, cartGoods); ShoppingCartGoodsDto.CartGoodsDetailDto cartGoodsDetailDto = this.convertCartGoods2DetailGoods(calculationGoods, cartGoods);
return cartGoodsDetailDto; return cartGoodsDetailDto;
} }
...@@ -393,6 +393,7 @@ public class CalculationCommonService { ...@@ -393,6 +393,7 @@ public class CalculationCommonService {
HashMap<String, BlockRow> gxDiscount = this.drawnSmallAndGroupRow(calculationGoods, 2, true); HashMap<String, BlockRow> gxDiscount = this.drawnSmallAndGroupRow(calculationGoods, 2, true);
List<ShoppingCartGoodsDto.CartGoodsDetailDto> comboLists = this.com2DetailGoods(gxDiscount, cartGoods.getProductComboList(), cartGoods, true); List<ShoppingCartGoodsDto.CartGoodsDetailDto> comboLists = this.com2DetailGoods(gxDiscount, cartGoods.getProductComboList(), cartGoods, true);
combs.addAll(comboLists); combs.addAll(comboLists);
cartGoodsDetailDto.setProductType(GoodsTypeEnum.SET_MEAL_GOODS.getGoodsType());
} }
/** /**
* 可选商品 * 可选商品
......
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