Skip to content

O
order-group
Commit 51e3855c by xiaoer.li@freemud.com
Options

对接促销算价Alpha->fix

parent 2d01bd54
Showing with 7 additions and 5 deletions
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/promotion/FullSharingService.java
...@@ -102,12 +102,13 @@ public class FullSharingService { ...@@ -102,12 +102,13 @@ public class FullSharingService {
//小料 //小料
if (CollectionUtils.isNotEmpty(cart.getProductMaterialList())) { if (CollectionUtils.isNotEmpty(cart.getProductMaterialList())) {
List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.SmallMaterial> materialDiscount = discountMap.getSmallMaterial(); List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.SmallMaterial> materialDiscount = discountMap.getSmallMaterial();
HashMap<String, Long> mDiscount = drawnFullDiscount(materialDiscount, typeEnums,1); HashMap<String, Long> mDiscount = drawnFullDiscount(materialDiscount, typeEnums, 1);
if (!mDiscount.isEmpty()) continue; if (!mDiscount.isEmpty()) {
for (CartGoods.MaterialGoods mt : cart.getProductMaterialList()) { for (CartGoods.MaterialGoods mt : cart.getProductMaterialList()) {
Long md = mDiscount.get(mt.getSpuId()); Long md = mDiscount.get(mt.getSpuId());
if (md!=null) { if (md != null) {
mt.setAmount(mt.getAmount()+md); mt.setAmount(mt.getAmount() + md);
}
} }
} }
} }
...@@ -115,7 +116,7 @@ public class FullSharingService { ...@@ -115,7 +116,7 @@ public class FullSharingService {
if (CollectionUtils.isNotEmpty(cart.getProductGroupList())) { if (CollectionUtils.isNotEmpty(cart.getProductGroupList())) {
List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.SmallMaterial> materialDiscount = discountMap.getSmallMaterial(); List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.SmallMaterial> materialDiscount = discountMap.getSmallMaterial();
HashMap<String, Long> mDiscount = drawnFullDiscount(materialDiscount, typeEnums, 2); HashMap<String, Long> mDiscount = drawnFullDiscount(materialDiscount, typeEnums, 2);
if (!mDiscount.isEmpty()) continue; if (!mDiscount.isEmpty()) {
for (CartGoods.ComboxGoods com : cart.getProductGroupList()) { for (CartGoods.ComboxGoods com : cart.getProductGroupList()) {
Long md = mDiscount.get(com.getGoodsId()); Long md = mDiscount.get(com.getGoodsId());
if (md != null) { if (md != null) {
...@@ -124,6 +125,7 @@ public class FullSharingService { ...@@ -124,6 +125,7 @@ public class FullSharingService {
} }
} }
} }
}
//固定搭配 //固定搭配
//if (CollectionUtils.isNotEmpty(cart.getProductComboList())) { //if (CollectionUtils.isNotEmpty(cart.getProductComboList())) {
// List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.GroupCombox> groupCom = discountMap.getGroupCombox(); // List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.GroupCombox> groupCom = discountMap.getGroupCombox();
......
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