From ec97faf2af83f55684c5e6b0a79b195ec2e1df77 Mon Sep 17 00:00:00 2001
From: Jack <46790855@qq.com>
Date: Wed, 18 Dec 2024 23:52:38 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E8=B4=B9=E6=8F=90=E7=A4=BA=E6=9B=B4?=
 =?UTF-8?q?=E5=8A=A0=E7=B2=BE=E7=BB=86=E5=8C=96=EF=BC=8C=E5=AE=8C=E5=96=84?=
 =?UTF-8?q?=E7=A8=8B=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../suisung/mall/common/pojo/dto/DeliveryFeeResultDTO.java | 5 -----
 .../impl/ShopStoreSameCityTransportBaseServiceImpl.java    | 7 +++----
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/mall-common/src/main/java/com/suisung/mall/common/pojo/dto/DeliveryFeeResultDTO.java b/mall-common/src/main/java/com/suisung/mall/common/pojo/dto/DeliveryFeeResultDTO.java
index c782c756..8a5cee8c 100644
--- a/mall-common/src/main/java/com/suisung/mall/common/pojo/dto/DeliveryFeeResultDTO.java
+++ b/mall-common/src/main/java/com/suisung/mall/common/pojo/dto/DeliveryFeeResultDTO.java
@@ -26,19 +26,14 @@ public class DeliveryFeeResultDTO implements Serializable {
     private Long id;
     // 显示优先级
     private Integer level;
-    // 全部通过
-    private Boolean allPassed;
     // 距离通过
     private Boolean distancePassed;
-
     // 超出多少距离
     private Integer diffDistance;
     // 金额通过
     private Boolean moneyPassed;
-
     // 还差多少金额可以起送
     private BigDecimal diffMoney;
-
     // 距离不通过具体原因
     private String distanceReason;
     // 金额不通过具体原因
diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreSameCityTransportBaseServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreSameCityTransportBaseServiceImpl.java
index 29bb7e51..1d850784 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreSameCityTransportBaseServiceImpl.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreSameCityTransportBaseServiceImpl.java
@@ -473,7 +473,7 @@ public class ShopStoreSameCityTransportBaseServiceImpl extends BaseServiceImpl<S
                         deliveryFeeResultDTO.setMoneyPassed(false);
                         BigDecimal diffMoney = transport.getMin_delivery_amount().subtract(orderProductAmount);
                         deliveryFeeResultDTO.setDiffMoney(diffMoney);
-                        deliveryFeeResultDTO.setMoneyReason(String.format("商品原价金额还差%.2f元,达到起送金额，订单无法配送。", diffMoney));
+                        deliveryFeeResultDTO.setMoneyReason(String.format("商品原价金额还差%.2f元，才满足配送条件，请检查订单。", diffMoney));
                     } else {
                         deliveryFeeResultDTO.setMoneyPassed(true);
                     }
@@ -482,7 +482,7 @@ public class ShopStoreSameCityTransportBaseServiceImpl extends BaseServiceImpl<S
                         deliveryFeeResultDTO.setMoneyPassed(false);
                         BigDecimal diffMoney = transport.getMin_delivery_amount().subtract(orderDiscountAmount);
                         deliveryFeeResultDTO.setDiffMoney(diffMoney);
-                        deliveryFeeResultDTO.setMoneyReason(String.format("订单折后金额还差%.2f元,达到起送金额，订单无法配送。", diffMoney));
+                        deliveryFeeResultDTO.setMoneyReason(String.format("订单折后金额还差%.2f元，才满足配送条件，请检查订单。", diffMoney));
                     } else {
                         deliveryFeeResultDTO.setMoneyPassed(true);
                     }
@@ -492,7 +492,7 @@ public class ShopStoreSameCityTransportBaseServiceImpl extends BaseServiceImpl<S
                         deliveryFeeResultDTO.setMoneyPassed(false);
                         BigDecimal diffMoney = transport.getMin_delivery_amount().subtract(orderDiscountAmount);
                         deliveryFeeResultDTO.setDiffMoney(diffMoney);
-                        deliveryFeeResultDTO.setMoneyReason(String.format("应支付订单金额还差%.2f元,达到起送金额，订单无法配送。", diffMoney));
+                        deliveryFeeResultDTO.setMoneyReason(String.format("应支付订单金额还差%.2f元，才满足配送条件，请检查订单。", diffMoney));
                     } else {
                         deliveryFeeResultDTO.setMoneyPassed(true);
                     }
@@ -516,7 +516,6 @@ public class ShopStoreSameCityTransportBaseServiceImpl extends BaseServiceImpl<S
                         }
                     }
 
-                    deliveryFeeResultDTO.setAllPassed(true);
                     passed.add(deliveryFeeResultDTO);
                 } else {
                     noPassed.add(deliveryFeeResultDTO);