From 51b4f41d032d9b57e89f32e66ea6969391ef0bfffef391ba3254576b01676981 Mon Sep 17 00:00:00 2001
From: yanglei <yanglei@stargraph.cn>
Date: Fri, 16 Jan 2026 09:42:44 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=B9=E7=94=A8=E8=AE=A1=E7=AE=97=E8=A7=84?=
 =?UTF-8?q?=E5=88=99=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/EbikeOrderServiceImpl.java   | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeOrderServiceImpl.java b/ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeOrderServiceImpl.java
index 265f26b..b1145e7 100644
--- a/ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeOrderServiceImpl.java
+++ b/ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeOrderServiceImpl.java
@@ -450,11 +450,13 @@ public class EbikeOrderServiceImpl extends ServiceImpl<EbikeOrderMapper, EbikeOr
         // 1. 基础参数
         BigDecimal baseFee = Objects.requireNonNullElse(order.getBaseFee(), BigDecimal.ZERO);
         BigDecimal durationFee = Objects.requireNonNullElse(order.getDurationFee(), BigDecimal.ZERO);
-        Integer freeDurationMinutes = Objects.requireNonNullElse(order.getFreeDurationMinutes(), 0);
-        Integer baseDurationMinutes = Objects.requireNonNullElse(order.getBaseDurationMinutes(), 0);
+        int freeDurationMinutes = Objects.requireNonNullElse(order.getFreeDurationMinutes(), 0);
+        int baseDurationMinutes = Objects.requireNonNullElse(order.getBaseDurationMinutes(), 0);
         int chargeDurationMinutes = Objects.requireNonNullElse(order.getChargeDurationMinutes(), 1);
-
-        // 2. 计算调度费用
+        if (chargeDurationMinutes <= 0) {
+            chargeDurationMinutes = 1;
+        }
+        // 2. 计算调度费用(运营区域外>停车区外>禁停区)
         BigDecimal additionalFee = BigDecimal.ZERO;
         if (data != null) {
             if (Boolean.FALSE.equals(data.getBikeInRegion())) {
@@ -480,16 +482,15 @@ public class EbikeOrderServiceImpl extends ServiceImpl<EbikeOrderMapper, EbikeOr
             return dto;
         }
 
-        // 5. 起步阶段：免费之后，但未超出起步时长 只收起步费
-        long includedInBaseMinutes = freeDurationMinutes + baseDurationMinutes;
-        if (totalRideMinutes <= includedInBaseMinutes) {
+        // 5.  起步阶段（免费 < 骑行 ≤ 起步） （只收起步费用）
+        if (totalRideMinutes <= baseDurationMinutes) {
             dto.setBaseFee(baseFee);
             dto.setTotalCost(baseFee.add(additionalFee));
             return dto;
         }
 
         // 6. 超出起步阶段：计算额外时长费用
-        long extraMinutes = totalRideMinutes - includedInBaseMinutes;
+        long extraMinutes = totalRideMinutes - baseDurationMinutes;
         long chargeUnits = (extraMinutes + chargeDurationMinutes - 1) / chargeDurationMinutes;
         BigDecimal durationCost = durationFee.multiply(BigDecimal.valueOf(chargeUnits));
 
@@ -497,7 +498,7 @@ public class EbikeOrderServiceImpl extends ServiceImpl<EbikeOrderMapper, EbikeOr
         dto.setDurationFee(durationCost);
         BigDecimal baseCost = baseFee.add(durationCost);
 
-        // 7. 总费用 + 封顶
+        // 7. 总费用 是否 大于封顶费用 大于则直接用封顶费用
         BigDecimal totalCost = baseCost.add(additionalFee);
         BigDecimal maxFee = order.getMaxFeeAmount();
         if (maxFee != null && totalCost.compareTo(maxFee) > 0) {