Commit 26f2418d by ping.wu

蜜雪app未传使用优惠券集合

parent 3bddb48a
...@@ -100,7 +100,8 @@ public class CouponPromotionService implements IPromotionService { ...@@ -100,7 +100,8 @@ public class CouponPromotionService implements IPromotionService {
couponDiscount = couponDiscount + (couponResults.getDiscountAmount() == null ? 0 : couponResults.getDiscountAmount()); couponDiscount = couponDiscount + (couponResults.getDiscountAmount() == null ? 0 : couponResults.getDiscountAmount());
} }
} }
if (CollectionUtils.isNotEmpty(calculationDiscountResult.getCouponDiscounts())) { if (CollectionUtils.isNotEmpty(calculationDiscountResult.getCouponDiscounts())
&& CollectionUtils.isNotEmpty(shoppingCartInfoRequestVo.getCouponCodes())) {
//选中优惠券赋值 //选中优惠券赋值
List<ChooseCouponVo> couponCodes = new ArrayList<>(); List<ChooseCouponVo> couponCodes = new ArrayList<>();
for (ChooseCouponVo chooseCouponVo : shoppingCartInfoRequestVo.getCouponCodes()){ for (ChooseCouponVo chooseCouponVo : shoppingCartInfoRequestVo.getCouponCodes()){
......
...@@ -94,6 +94,7 @@ public class CouponSharingService { ...@@ -94,6 +94,7 @@ public class CouponSharingService {
List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.Discount> couponResultsList = calculationDiscountResult.getDiscounts(); List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.Discount> couponResultsList = calculationDiscountResult.getDiscounts();
couponDiscount = couponResultsList.stream().filter(d -> asList.contains(d.getType())).mapToLong(d -> d.getDiscount().longValue()).sum(); couponDiscount = couponResultsList.stream().filter(d -> asList.contains(d.getType())).mapToLong(d -> d.getDiscount().longValue()).sum();
//选中优惠券赋值 //选中优惠券赋值
if(CollectionUtils.isNotEmpty(shoppingCartInfoRequestVo.getCouponCodes())){
List<ChooseCouponVo> couponCodes = new ArrayList<>(); List<ChooseCouponVo> couponCodes = new ArrayList<>();
for (ChooseCouponVo chooseCouponVo : shoppingCartInfoRequestVo.getCouponCodes()){ for (ChooseCouponVo chooseCouponVo : shoppingCartInfoRequestVo.getCouponCodes()){
for (CalculationSharingDiscountResponseDto.CalculationDiscountResult.Discount discount : couponResultsList){ for (CalculationSharingDiscountResponseDto.CalculationDiscountResult.Discount discount : couponResultsList){
...@@ -105,6 +106,7 @@ public class CouponSharingService { ...@@ -105,6 +106,7 @@ public class CouponSharingService {
} }
shoppingCartGoodsResponseVo.setCouponCodes(couponCodes); shoppingCartGoodsResponseVo.setCouponCodes(couponCodes);
} }
}
shoppingCartGoodsResponseVo.setCouponDiscount(couponDiscount); shoppingCartGoodsResponseVo.setCouponDiscount(couponDiscount);
Map<String, CheckSpqInfoResponseDto> validCouponMap = calculationDiscountResult == null ? new HashMap<>() : calculationDiscountResult.getValidCouponMap(); Map<String, CheckSpqInfoResponseDto> validCouponMap = calculationDiscountResult == null ? new HashMap<>() : calculationDiscountResult.getValidCouponMap();
......
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