backend/java-mall
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

运费提示更加精细化，完善程序

Browse Source
This commit is contained in:
Jack 2024-12-18 23:52:38 +08:00
parent b18497cb93
commit ec97faf2af
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mall-common/src/main/java/com/suisung/mall/common/pojo/dto/DeliveryFeeResultDTO.java
View File

@ -26,19 +26,14 @@ public class DeliveryFeeResultDTO implements Serializable {
private Long id; private Long id;
// 显示优先级 // 显示优先级
private Integer level; private Integer level;
// 全部通过
private Boolean allPassed;
// 距离通过 // 距离通过
private Boolean distancePassed; private Boolean distancePassed;
// 超出多少距离 // 超出多少距离
private Integer diffDistance; private Integer diffDistance;
// 金额通过 // 金额通过
private Boolean moneyPassed; private Boolean moneyPassed;
// 还差多少金额可以起送 // 还差多少金额可以起送
private BigDecimal diffMoney; private BigDecimal diffMoney;
// 距离不通过具体原因 // 距离不通过具体原因
private String distanceReason; private String distanceReason;
// 金额不通过具体原因 // 金额不通过具体原因

7
mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreSameCityTransportBaseServiceImpl.java
View File

@ -473,7 +473,7 @@ public class ShopStoreSameCityTransportBaseServiceImpl extends BaseServiceImpl<S
deliveryFeeResultDTO.setMoneyPassed(false); deliveryFeeResultDTO.setMoneyPassed(false);
BigDecimal diffMoney = transport.getMin_delivery_amount().subtract(orderProductAmount); BigDecimal diffMoney = transport.getMin_delivery_amount().subtract(orderProductAmount);
deliveryFeeResultDTO.setDiffMoney(diffMoney); deliveryFeeResultDTO.setDiffMoney(diffMoney);
deliveryFeeResultDTO.setMoneyReason(String.format("商品原价金额还差%.2f元,达到起送金额，订单无法配送。", diffMoney)); deliveryFeeResultDTO.setMoneyReason(String.format("商品原价金额还差%.2f元，才满足配送条件，请检查订单。", diffMoney));
} else { } else {
deliveryFeeResultDTO.setMoneyPassed(true); deliveryFeeResultDTO.setMoneyPassed(true);
} }
@ -482,7 +482,7 @@ public class ShopStoreSameCityTransportBaseServiceImpl extends BaseServiceImpl<S
deliveryFeeResultDTO.setMoneyPassed(false); deliveryFeeResultDTO.setMoneyPassed(false);
BigDecimal diffMoney = transport.getMin_delivery_amount().subtract(orderDiscountAmount); BigDecimal diffMoney = transport.getMin_delivery_amount().subtract(orderDiscountAmount);
deliveryFeeResultDTO.setDiffMoney(diffMoney); deliveryFeeResultDTO.setDiffMoney(diffMoney);
deliveryFeeResultDTO.setMoneyReason(String.format("订单折后金额还差%.2f元,达到起送金额，订单无法配送。", diffMoney)); deliveryFeeResultDTO.setMoneyReason(String.format("订单折后金额还差%.2f元，才满足配送条件，请检查订单。", diffMoney));
} else { } else {
deliveryFeeResultDTO.setMoneyPassed(true); deliveryFeeResultDTO.setMoneyPassed(true);
} }
@ -492,7 +492,7 @@ public class ShopStoreSameCityTransportBaseServiceImpl extends BaseServiceImpl<S
deliveryFeeResultDTO.setMoneyPassed(false); deliveryFeeResultDTO.setMoneyPassed(false);
BigDecimal diffMoney = transport.getMin_delivery_amount().subtract(orderDiscountAmount); BigDecimal diffMoney = transport.getMin_delivery_amount().subtract(orderDiscountAmount);
deliveryFeeResultDTO.setDiffMoney(diffMoney); deliveryFeeResultDTO.setDiffMoney(diffMoney);
deliveryFeeResultDTO.setMoneyReason(String.format("应支付订单金额还差%.2f元,达到起送金额，订单无法配送。", diffMoney)); deliveryFeeResultDTO.setMoneyReason(String.format("应支付订单金额还差%.2f元，才满足配送条件，请检查订单。", diffMoney));
} else { } else {
deliveryFeeResultDTO.setMoneyPassed(true); deliveryFeeResultDTO.setMoneyPassed(true);
} }
@ -516,7 +516,6 @@ public class ShopStoreSameCityTransportBaseServiceImpl extends BaseServiceImpl<S
} }
} }
deliveryFeeResultDTO.setAllPassed(true);
passed.add(deliveryFeeResultDTO); passed.add(deliveryFeeResultDTO);
} else { } else {
noPassed.add(deliveryFeeResultDTO); noPassed.add(deliveryFeeResultDTO);