From 7a6e27980ad6def63ba810ceb66608607ae7373b638a0ff55198e8bf092b7238 Mon Sep 17 00:00:00 2001
From: yanglei <yanglei@stargraph.cn>
Date: Wed, 17 Dec 2025 16:24:55 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=96=B0=E5=A2=9E=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E5=85=8D=E8=B4=B9=E8=AE=A2=E5=8D=95=E6=A0=87=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cdzy/payment/model/entity/EbikeOrder.java |  5 +++
 .../cdzy/user/model/entity/EbikeOrder.java    |  5 +++
 .../service/impl/EbikeOrderServiceImpl.java   | 33 +++++++++----------
 3 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/ebike-payment/src/main/java/com/cdzy/payment/model/entity/EbikeOrder.java b/ebike-payment/src/main/java/com/cdzy/payment/model/entity/EbikeOrder.java
index a52b3f0..8cc91ad 100644
--- a/ebike-payment/src/main/java/com/cdzy/payment/model/entity/EbikeOrder.java
+++ b/ebike-payment/src/main/java/com/cdzy/payment/model/entity/EbikeOrder.java
@@ -211,4 +211,9 @@ public class EbikeOrder implements Serializable {
      * 删除状态（true表示已删除）
      */
     private Boolean isDeleted;
+
+    /**
+     * 是否免费订单 true-免费 false-收费
+     */
+    private Boolean isFreeOrder;
 }
diff --git a/ebike-user/src/main/java/com/cdzy/user/model/entity/EbikeOrder.java b/ebike-user/src/main/java/com/cdzy/user/model/entity/EbikeOrder.java
index a58ad66..0852ffe 100644
--- a/ebike-user/src/main/java/com/cdzy/user/model/entity/EbikeOrder.java
+++ b/ebike-user/src/main/java/com/cdzy/user/model/entity/EbikeOrder.java
@@ -211,4 +211,9 @@ public class EbikeOrder implements Serializable {
      * 删除状态（true表示已删除）
      */
     private Boolean isDeleted;
+
+    /**
+     * 是否免费订单 true-免费 false-收费
+     */
+    private Boolean isFreeOrder;
 }
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 30700e3..4947a7a 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
@@ -96,24 +96,19 @@ public class EbikeOrderServiceImpl extends ServiceImpl<EbikeOrderMapper, EbikeOr
                 .createTime(LocalDateTime.now())
                 .build();
         save(order);
-        try {
-            // 尝试开锁
-            EbikeUnlockResultDto unlockResult = attemptUnlockWithValidation(bikeCode, userId);
-            if (!unlockResult.isSuccess()) {
-                throw new EbikeException("开锁失败: " + unlockResult.getErrorMsg());
-            }
-            // 开锁成功
-            EbikeOrder orders = EbikeOrder.builder()
-                    .orderId(order.getOrderId())
-                    .orderStatus(OrderStatus.IN_PROGRESS)
-                    .updateTime(LocalDateTime.now())
-                    .build();
-            updateById(orders);
-            return getById(order.getOrderId());
-        } catch (Exception e) {
-            log.error("开锁失败, userId={}, bikeCode={}", userId, bikeCode, e);
-            throw new RuntimeException("开锁失败", e);
+        // 尝试开锁
+        EbikeUnlockResultDto unlockResult = attemptUnlockWithValidation(bikeCode, userId);
+        if (!unlockResult.isSuccess()) {
+            throw new EbikeException("开锁失败: " + unlockResult.getErrorMsg());
         }
+        // 开锁成功
+        EbikeOrder orders = EbikeOrder.builder()
+                .orderId(order.getOrderId())
+                .orderStatus(OrderStatus.IN_PROGRESS)
+                .updateTime(LocalDateTime.now())
+                .build();
+        updateById(orders);
+        return getById(order.getOrderId());
     }
 
 
@@ -252,12 +247,14 @@ public class EbikeOrderServiceImpl extends ServiceImpl<EbikeOrderMapper, EbikeOr
             order.setTotalAmount(BigDecimal.ZERO);
             order.setActualAmount(BigDecimal.ZERO);
             order.setOrderStatus(OrderStatus.PAID);
+            order.setIsFreeOrder(Boolean.TRUE);
             updateById(order);
             return order.getOrderId();
         }
         order.setOrderStatus(OrderStatus.PENDING_PAYMENT);
         order.setTotalAmount(totalAmount);
         order.setActualAmount(totalAmount);
+        order.setIsFreeOrder(Boolean.FALSE);
         updateById(order);
         //生成支付订单
         EbikePayment payment = EbikePayment.builder()
@@ -422,7 +419,7 @@ public class EbikeOrderServiceImpl extends ServiceImpl<EbikeOrderMapper, EbikeOr
         long freeDurationSeconds = freeDurationMinutes * GlobalConstants.LONG_SIXTY;
         // 如果骑行时长小于等于免费时长,不收费
         BigDecimal baseCost;
-        if (totalRideSeconds  <= freeDurationSeconds) {
+        if (totalRideSeconds <= freeDurationSeconds) {
             return BigDecimal.ZERO;
         } else {
             long totalRoundedMinutes = (totalRideSeconds + GlobalConstants.NUMBER_FIFTY_NINE) / GlobalConstants.NUMBER_SIXTY;