From c12cbc995ffb88020ae86d6c8323a650a85af7b56ac3a7968078a3eee0d799bd Mon Sep 17 00:00:00 2001
From: yanglei <yanglei@stargraph.cn>
Date: Thu, 26 Feb 2026 16:39:19 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=98=8E=E7=BB=86=E4=BC=98?=
 =?UTF-8?q?=E6=83=A0=E9=87=91=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cdzy/user/enums/EbikeOrderDetailType.java  |  3 ++-
 .../user/model/entity/EbikeOrderDetail.java    |  2 +-
 .../cdzy/user/model/vo/EbikeOrderDetailVo.java |  5 +++++
 .../model/vo/EbikePaymentCostDetailVo.java     |  2 +-
 .../service/impl/EbikeOrderServiceImpl.java    | 18 ++++++++++++++++++
 5 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/ebike-user/src/main/java/com/cdzy/user/enums/EbikeOrderDetailType.java b/ebike-user/src/main/java/com/cdzy/user/enums/EbikeOrderDetailType.java
index ecb20a3..8f5571f 100644
--- a/ebike-user/src/main/java/com/cdzy/user/enums/EbikeOrderDetailType.java
+++ b/ebike-user/src/main/java/com/cdzy/user/enums/EbikeOrderDetailType.java
@@ -16,7 +16,8 @@ public enum EbikeOrderDetailType {
     OPERATION_AREA_DISPATCH_FEE(3, "运营区调度费用"),
     OUT_OF_PARKING_AREA_FEE(4, "停车区外调度费用"),
     NO_PARKING_ZONE_FEE(5, "禁停区调度费用"),
-    HELMET_FEE(6, "头盔使用费用");
+    HELMET_FEE(6, "头盔使用费用"),
+    DISCOUNT_AMOUNT(7, "订单优惠金额");
 
     private final Integer code;
     private final String name;
diff --git a/ebike-user/src/main/java/com/cdzy/user/model/entity/EbikeOrderDetail.java b/ebike-user/src/main/java/com/cdzy/user/model/entity/EbikeOrderDetail.java
index 4e97a6d..f97c2d5 100644
--- a/ebike-user/src/main/java/com/cdzy/user/model/entity/EbikeOrderDetail.java
+++ b/ebike-user/src/main/java/com/cdzy/user/model/entity/EbikeOrderDetail.java
@@ -44,7 +44,7 @@ public class EbikeOrderDetail implements Serializable {
     private Long operatorId;
 
     /**
-     * 费用类型：1-时长费用 2-起步费用 3-运营区调度费用 4-停车区外调度费用 5-禁停区调度费用 6-头盔使用费用
+     * 费用类型：1-时长费用 2-起步费用 3-运营区调度费用 4-停车区外调度费用 5-禁停区调度费用 6-头盔使用费用 7-优惠费用
      */
     private Integer detailType;
 
diff --git a/ebike-user/src/main/java/com/cdzy/user/model/vo/EbikeOrderDetailVo.java b/ebike-user/src/main/java/com/cdzy/user/model/vo/EbikeOrderDetailVo.java
index 0544a1e..eccd7b6 100644
--- a/ebike-user/src/main/java/com/cdzy/user/model/vo/EbikeOrderDetailVo.java
+++ b/ebike-user/src/main/java/com/cdzy/user/model/vo/EbikeOrderDetailVo.java
@@ -194,4 +194,9 @@ public class EbikeOrderDetailVo {
      * 用户头盔费用
      */
     private BigDecimal userHelmetFee;
+
+    /**
+     * 优惠费用
+     */
+    private BigDecimal discountAmount;
 }
diff --git a/ebike-user/src/main/java/com/cdzy/user/model/vo/EbikePaymentCostDetailVo.java b/ebike-user/src/main/java/com/cdzy/user/model/vo/EbikePaymentCostDetailVo.java
index 3d1ab2d..b3aa09d 100644
--- a/ebike-user/src/main/java/com/cdzy/user/model/vo/EbikePaymentCostDetailVo.java
+++ b/ebike-user/src/main/java/com/cdzy/user/model/vo/EbikePaymentCostDetailVo.java
@@ -24,7 +24,7 @@ public class EbikePaymentCostDetailVo implements Serializable {
     private Long detailId;
 
     /**
-     * 费用类型 1-时长费用 2-起步费用 3-运营区调度费用 4-停车区外调度费用 5-禁停区调度费用 6-头盔使用费用
+     * 费用类型 1-时长费用 2-起步费用 3-运营区调度费用 4-停车区外调度费用 5-禁停区调度费用 6-头盔使用费用 7-优惠费用
      */
     private Integer detailType;
 
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 a8ce533..0f29f4a 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
@@ -187,6 +187,10 @@ public class EbikeOrderServiceImpl extends ServiceImpl<EbikeOrderMapper, EbikeOr
                         BigDecimal current = payDetailVo.getDetailAmount();
                         ebikeOrderDetailVo.setUserHelmetFee((current != null ? current : BigDecimal.ZERO));
                     }
+                    case 7 -> {
+                        BigDecimal current = payDetailVo.getDetailAmount();
+                        ebikeOrderDetailVo.setDiscountAmount((current != null ? current : BigDecimal.ZERO));
+                    }
                 }
             }
         }
@@ -394,6 +398,10 @@ public class EbikeOrderServiceImpl extends ServiceImpl<EbikeOrderMapper, EbikeOr
                         BigDecimal current = payDetailVo.getDetailAmount();
                         ebikeOrderDetailVo.setUserHelmetFee((current != null ? current : BigDecimal.ZERO));
                     }
+                    case 7 -> {
+                        BigDecimal current = payDetailVo.getDetailAmount();
+                        ebikeOrderDetailVo.setDiscountAmount((current != null ? current : BigDecimal.ZERO));
+                    }
                 }
             }
         }
@@ -441,6 +449,16 @@ public class EbikeOrderServiceImpl extends ServiceImpl<EbikeOrderMapper, EbikeOr
                 .update();
         // 3 同步修改支付订单的cost_price(用于支付时的实际金额)
         ebikePaymentService.updateCostPrice(ebikeOrder.getOrderId(), paymentAmountDto.getPrice());
+        // 4 生成订单明细优惠金额
+        EbikeOrderDetail orderDetail = EbikeOrderDetail.builder()
+                .orderId(ebikeOrder.getOrderId())
+                .operatorId(ebikeOrder.getOperatorId())
+                .detailType(EbikeOrderDetailType.DISCOUNT_AMOUNT.getCode())
+                .detailDescription("运维人员修改订单减免金额")
+                .detailName(EbikeOrderDetailType.DISCOUNT_AMOUNT.getName())
+                .detailAmount(ebikeOrder.getTotalAmount().subtract(paymentAmountDto.getPrice()))
+                .build();
+        ebikeOrderDetailService.save(orderDetail);
     }
 
     @Transactional