Commit 9e6012cd by xiaoer.li@freemud.com

对接促销算价Alpha->fix

parent 84c439fc
......@@ -325,6 +325,7 @@ public class FullSharingService {
*/
public HashMap<String, Long> drawnFullDiscount(List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.SmallMaterial> materialDiscount,List<Integer> typeEnums,int type) {
HashMap<String, Long> hashMap = new HashMap<>();
if (CollectionUtils.isEmpty(materialDiscount)) return hashMap;
for (CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.SmallMaterial smallMaterial : materialDiscount) {
if (CollectionUtils.isEmpty(smallMaterial.getDiscounts())) continue;
for (CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount discount : smallMaterial.getDiscounts()) {
......@@ -341,6 +342,7 @@ public class FullSharingService {
*/
public HashMap<String, Long> drawnFullDiscount(List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.GroupCombox> groupCombDiscount,List<Integer> typeEnums) {
HashMap<String, Long> hashMap = new HashMap<>();
if (CollectionUtils.isEmpty(groupCombDiscount)) return hashMap;
for (CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.GroupCombox com : groupCombDiscount) {
if (CollectionUtils.isEmpty(com.getDiscounts())) continue;
for (CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount discount : com.getDiscounts()) {
......
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