Commit 2a8a050b by 徐康

优惠金额只要满减和代金券

parent 05fd6b11
...@@ -216,10 +216,8 @@ public class DeliveryAdapter { ...@@ -216,10 +216,8 @@ public class DeliveryAdapter {
if(CollectionUtils.isNotEmpty(order.getAccountList())) { if(CollectionUtils.isNotEmpty(order.getAccountList())) {
List<CreateDeliveryPreferentialVo> createDeliveryPreferentialVos = new ArrayList<>(); List<CreateDeliveryPreferentialVo> createDeliveryPreferentialVos = new ArrayList<>();
order.getAccountList().stream().forEach(accountBean -> { order.getAccountList().stream().forEach(accountBean -> {
if (!OldOrderAccountType.DELIVERY_AMOUNT.getCode().equals(accountBean.getType()) if (OldOrderAccountType.COUPON.getCode().equals(accountBean.getType())
&& !OldOrderAccountType.PACK_AMOUNT.getCode().equals(accountBean.getType()) || OldOrderAccountType.BUY_DISCOUNT.getCode().equals(accountBean.getType())) {
&& !OldOrderAccountType.CARD_ORIGINAL_AMOUNT.getCode().equals(accountBean.getType())
&& !OldOrderAccountType.DRIVER_FEE.getCode().equals(accountBean.getType())) {
CreateDeliveryPreferentialVo createDeliveryPreferentialVo = new CreateDeliveryPreferentialVo(); CreateDeliveryPreferentialVo createDeliveryPreferentialVo = new CreateDeliveryPreferentialVo();
createDeliveryPreferentialVo.setPreferentialContent(accountBean.getName()); createDeliveryPreferentialVo.setPreferentialContent(accountBean.getName());
createDeliveryPreferentialVo.setPreferentialPrice(0-accountBean.getPrice()); createDeliveryPreferentialVo.setPreferentialPrice(0-accountBean.getPrice());
......
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