Skip to content

O
order-group
Commit b82cc67e by ping.wu
Options

商品券支持套餐

parent fe4aa3c7
Showing with 25 additions and 23 deletions
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/CalculationCommonService.java
...@@ -625,31 +625,33 @@ public class CalculationCommonService { ...@@ -625,31 +625,33 @@ public class CalculationCommonService {
HashMap<String, BlockRow> map = new HashMap<>(); HashMap<String, BlockRow> map = new HashMap<>();
if (goods == null) return map; if (goods == null) return map;
//固定搭配 //固定搭配
if (isFixed) { if (isFixed ) {
for (GroupCombox gx : goods.getGroupCombox()) { if(CollectionUtils.isNotEmpty(goods.getGroupCombox())){
BlockRow blockRow = new BlockRow(); for (GroupCombox gx : goods.getGroupCombox()) {
blockRow.setDiscountAmount(gx.getDiscountAmount()); BlockRow blockRow = new BlockRow();
blockRow.setGoodsId(gx.getGoodsId()); blockRow.setDiscountAmount(gx.getDiscountAmount());
blockRow.setGoodsId(gx.getGoodsId()); blockRow.setGoodsId(gx.getGoodsId());
blockRow.setGoodsQuantity(gx.getGoodsQuantity()); blockRow.setGoodsId(gx.getGoodsId());
blockRow.setOriginalPrice(gx.getOriginalPrice()); blockRow.setGoodsQuantity(gx.getGoodsQuantity());
blockRow.setRealAmount(gx.getRealAmount()); blockRow.setOriginalPrice(gx.getOriginalPrice());
List<Discounts> discounts = new ArrayList<>(); blockRow.setRealAmount(gx.getRealAmount());
if (CollectionUtils.isNotEmpty(gx.getDiscounts())) { List<Discounts> discounts = new ArrayList<>();
for (GoodsDiscount ds : gx.getDiscounts()) { if (CollectionUtils.isNotEmpty(gx.getDiscounts())) {
Discounts discount = new Discounts(); for (GoodsDiscount ds : gx.getDiscounts()) {
discount.setActivityCode(ds.getActivityCode()); Discounts discount = new Discounts();
discount.setActivityDesc(ds.getActivityDesc()); discount.setActivityCode(ds.getActivityCode());
discount.setActivityName(ds.getActivityName()); discount.setActivityDesc(ds.getActivityDesc());
discount.setActualGoodsNumber(ds.getActualGoodsNumber()); discount.setActivityName(ds.getActivityName());
discount.setDiscount(ds.getDiscount()); discount.setActualGoodsNumber(ds.getActualGoodsNumber());
discount.setGoodsId(ds.getGoodsId()); discount.setDiscount(ds.getDiscount());
discount.setType(ds.getType()); discount.setGoodsId(ds.getGoodsId());
discounts.add(discount); discount.setType(ds.getType());
discounts.add(discount);
}
} }
blockRow.setDiscounts(discounts);
map.put(gx.getGoodsId(), blockRow);
} }
blockRow.setDiscounts(discounts);
map.put(gx.getGoodsId(), blockRow);
} }
} }
//可选搭配及小料 //可选搭配及小料
......
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