From 4086aeda018db3910e542f97a3d486bc4493eaca Mon Sep 17 00:00:00 2001
From: wuchunlei <mailcauchy@gmail.com>
Date: Tue, 19 Aug 2025 09:19:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=BA=E4=B8=B0=E8=BF=90?=
 =?UTF-8?q?=E8=B4=B9=E4=B8=AA=E7=9C=81=E4=BB=BD=E4=BB=B7=E6=A0=BC=20?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E8=BF=90=E8=B4=B975=E6=8A=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../book/service/impl/ExpressFeeServiceImpl.java       | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/peanut/modules/book/service/impl/ExpressFeeServiceImpl.java b/src/main/java/com/peanut/modules/book/service/impl/ExpressFeeServiceImpl.java
index ca78d4eb..a67520c7 100644
--- a/src/main/java/com/peanut/modules/book/service/impl/ExpressFeeServiceImpl.java
+++ b/src/main/java/com/peanut/modules/book/service/impl/ExpressFeeServiceImpl.java
@@ -70,15 +70,20 @@ public class ExpressFeeServiceImpl extends ServiceImpl<ExpressFeeDao, ExpressFee
         } else{
             int weightInterval;
             BigDecimal additionalWeight;
+            BigDecimal thridLevel = new BigDecimal(20);
+            if (regionCode.startsWith("15")||regionCode.startsWith("51")||regionCode.startsWith("64")
+                    ||regionCode.startsWith("46")||regionCode.startsWith("62")||regionCode.startsWith("35")){
+                thridLevel = new BigDecimal(15);
+            }
             if (weight.compareTo(new BigDecimal(0)) >= 0 && weight.compareTo(new BigDecimal(3)) < 0) {
                 weightInterval = 1;
                 additionalWeight = weight.subtract(new BigDecimal(1));
-            } else if (weight.compareTo(new BigDecimal(3)) >= 0 && weight.compareTo(new BigDecimal(15)) < 0) {
+            } else if (weight.compareTo(new BigDecimal(3)) >= 0 && weight.compareTo(thridLevel) < 0) {
                 weightInterval = 2;
                 additionalWeight = weight.subtract(new BigDecimal(3));
             } else {
                 weightInterval = 3;
-                additionalWeight = weight.subtract(new BigDecimal(15));
+                additionalWeight = weight.subtract(thridLevel);
             }
             QueryWrapper<ExpressFee> queryWrapper = new QueryWrapper<>();
             if (!regionCode.startsWith("11") && !regionCode.startsWith("12") && !regionCode.startsWith("31") && !regionCode.startsWith("50")) {
@@ -91,6 +96,7 @@ public class ExpressFeeServiceImpl extends ServiceImpl<ExpressFeeDao, ExpressFee
             BigDecimal firstWeightFee = expressFee.getFirstWeightFee();
             BigDecimal additionalWeightFee = (expressFee.getAdditionalWeightFee()).multiply(additionalWeight);
             flag = firstWeightFee.add(additionalWeightFee);
+            flag = flag.multiply(new BigDecimal(0.75)).setScale(2,BigDecimal.ROUND_HALF_UP);
         }
         return flag;
     }