From 13346d3da51ad942abd0ce78a6703b10f6814bd89f8155b0f83a2585dad449cc Mon Sep 17 00:00:00 2001
From: yanglei <yanglei@stargraph.cn>
Date: Wed, 31 Dec 2025 10:27:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E5=85=B3=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cdzy/payment/model/entity/EbikeOrder.java | 24 -----------------
 .../user/model/dto/EbikeFaultReportDto.java   |  5 ----
 .../model/dto/EbikeFaultReportQueryDto.java   |  5 ----
 .../user/model/entity/EbikeFaultReport.java   |  5 ----
 .../cdzy/user/model/entity/EbikeOrder.java    | 26 -------------------
 .../user/model/entity/EbikeOrderDetail.java   |  5 ----
 .../impl/EbikeFaultReportServiceImpl.java     |  7 -----
 .../service/impl/EbikeOrderServiceImpl.java   |  5 ++--
 8 files changed, 2 insertions(+), 80 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 258ca95..1ffa110 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
@@ -98,16 +98,6 @@ public class EbikeOrder implements Serializable {
      */
     private Integer paymentMethod;
 
-    /**
-     * 使用卡券ID集合（JSON数组）
-     */
-    private String couponIds;
-
-    /**
-     * 优惠明细（结构化存储，便于对账）
-     */
-    private String discountDetails;
-
     /**
      * 起步费用
      */
@@ -153,10 +143,6 @@ public class EbikeOrder implements Serializable {
      */
     private BigDecimal helmetManagementFee;
 
-    /**
-     * 地理位置GeoHash编码（用于区域优惠分析）
-     */
-    private String geoHash;
 
     /**
      * 骑行起始点
@@ -174,16 +160,6 @@ public class EbikeOrder implements Serializable {
     @JsonDeserialize(using = PointDeserializer.class)
     private Point endLocation;
 
-    /**
-     * 取消时间
-     */
-    private LocalDateTime cancelTime;
-
-    /**
-     * 是否临时锁车 0-未临时锁车 -1-临时锁车
-     */
-    private Integer tempLock;
-
 
     /**
      * 创建人
diff --git a/ebike-user/src/main/java/com/cdzy/user/model/dto/EbikeFaultReportDto.java b/ebike-user/src/main/java/com/cdzy/user/model/dto/EbikeFaultReportDto.java
index 392eaff..c474cec 100644
--- a/ebike-user/src/main/java/com/cdzy/user/model/dto/EbikeFaultReportDto.java
+++ b/ebike-user/src/main/java/com/cdzy/user/model/dto/EbikeFaultReportDto.java
@@ -78,11 +78,6 @@ public class EbikeFaultReportDto {
      */
     private Long orderId;
 
-    /**
-     * 工单ID
-     */
-    private Long reviewId;
-
     /**
      * 附件文件列表
      */
diff --git a/ebike-user/src/main/java/com/cdzy/user/model/dto/EbikeFaultReportQueryDto.java b/ebike-user/src/main/java/com/cdzy/user/model/dto/EbikeFaultReportQueryDto.java
index 344a158..4b7883f 100644
--- a/ebike-user/src/main/java/com/cdzy/user/model/dto/EbikeFaultReportQueryDto.java
+++ b/ebike-user/src/main/java/com/cdzy/user/model/dto/EbikeFaultReportQueryDto.java
@@ -18,11 +18,6 @@ public class EbikeFaultReportQueryDto {
     @NotBlank(message = "车辆编号不能为空")
     private String bikeCode;
 
-    /**
-     * 工单ID
-     */
-    private Long reviewId;
-
     /**
      * 故障部件
      */
diff --git a/ebike-user/src/main/java/com/cdzy/user/model/entity/EbikeFaultReport.java b/ebike-user/src/main/java/com/cdzy/user/model/entity/EbikeFaultReport.java
index 3f0d5fe..1903964 100644
--- a/ebike-user/src/main/java/com/cdzy/user/model/entity/EbikeFaultReport.java
+++ b/ebike-user/src/main/java/com/cdzy/user/model/entity/EbikeFaultReport.java
@@ -89,11 +89,6 @@ public class EbikeFaultReport implements Serializable {
      */
     private Long orderId;
 
-    /**
-     * 工单ID
-     */
-    private Long reviewId;
-
     /**
      * 创建人
      */
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 fe04498..b582dd9 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
@@ -98,16 +98,6 @@ public class EbikeOrder implements Serializable {
      */
     private Integer paymentMethod;
 
-    /**
-     * 使用卡券ID集合（JSON数组）
-     */
-    private String couponIds;
-
-    /**
-     * 优惠明细（结构化存储，便于对账）
-     */
-    private String discountDetails;
-
     /**
      * 起步费用
      */
@@ -153,11 +143,6 @@ public class EbikeOrder implements Serializable {
      */
     private BigDecimal helmetManagementFee;
 
-    /**
-     * 地理位置GeoHash编码（用于区域优惠分析）
-     */
-    private String geoHash;
-
     /**
      * 骑行起始点
      */
@@ -174,17 +159,6 @@ public class EbikeOrder implements Serializable {
     @JsonDeserialize(using = PointDeserializer.class)
     private Point endLocation;
 
-    /**
-     * 取消时间
-     */
-    private LocalDateTime cancelTime;
-
-    /**
-     * 是否临时锁车 0-未临时锁车 -1-临时锁车
-     */
-    private Integer tempLock;
-
-
     /**
      * 创建人
      */
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 15d92f0..4e97a6d 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
@@ -63,11 +63,6 @@ public class EbikeOrderDetail implements Serializable {
      */
     private BigDecimal detailAmount;
 
-    /**
-     * 优惠券Id
-     */
-    private String couponId;
-
     /**
      * 创建人
      */
diff --git a/ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeFaultReportServiceImpl.java b/ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeFaultReportServiceImpl.java
index 99ec26e..7b60684 100644
--- a/ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeFaultReportServiceImpl.java
+++ b/ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeFaultReportServiceImpl.java
@@ -78,7 +78,6 @@ public class EbikeFaultReportServiceImpl extends ServiceImpl<EbikeFaultReportMap
                 .location(ebikeFaultReportDto.getLocation())
                 .handleStatus(EbikeFaultReportStatus.PENDING)
                 .orderId(ebikeFaultReportDto.getOrderId())
-                .reviewId(ebikeFaultReportDto.getReviewId())
                 .createBy(ebikeFaultReportDto.getUserId())
                 .build();
         this.save(userFaultReport);
@@ -200,7 +199,6 @@ public class EbikeFaultReportServiceImpl extends ServiceImpl<EbikeFaultReportMap
                 .reportSource(ebikeFaultReportDto.getReportSource())
                 .location(ebikeFaultReportDto.getLocation())
                 .orderId(ebikeFaultReportDto.getOrderId())
-                .reviewId(ebikeFaultReportDto.getReviewId())
                 .updateBy(ebikeFaultReportDto.getUserId())
                 .build();
         this.updateById(userFaultReport);
@@ -297,7 +295,6 @@ public class EbikeFaultReportServiceImpl extends ServiceImpl<EbikeFaultReportMap
                 .reportSource(report.getReportSource())
                 .location(report.getLocation())
                 .orderId(report.getOrderId())
-                .reviewId(report.getReviewId())
                 .attachmentFiles(fileInfo)
                 .build();
     }
@@ -308,9 +305,6 @@ public class EbikeFaultReportServiceImpl extends ServiceImpl<EbikeFaultReportMap
         QueryWrapper query = QueryWrapper.create()
                 .where(EBIKE_FAULT_REPORT.BIKE_CODE.eq(ebikeFaultReportQueryDto.getBikeCode()))
                 .and(EBIKE_FAULT_REPORT.IS_DELETED.eq(false));
-        if (ebikeFaultReportQueryDto.getReviewId() != null) {
-            query.and(EBIKE_FAULT_REPORT.REVIEW_ID.eq(ebikeFaultReportQueryDto.getReviewId()));
-        }
         List<EbikeFaultReport> reports = this.list(query);
         if (reports.isEmpty()) {
             return Collections.emptyList();
@@ -359,7 +353,6 @@ public class EbikeFaultReportServiceImpl extends ServiceImpl<EbikeFaultReportMap
                     .reportSource(report.getReportSource())
                     .location(report.getLocation())
                     .orderId(report.getOrderId())
-                    .reviewId(report.getReviewId())
                     .attachmentFiles(fileDtos)
                     .build();
         }).collect(Collectors.toList());
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 55cc471..2e9ca13 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
@@ -108,7 +108,7 @@ public class EbikeOrderServiceImpl extends ServiceImpl<EbikeOrderMapper, EbikeOr
                 .outOfParkingAreaFee(bikeInfo.getOutOfParkingAreaFee())
                 .outOfServiceAreaFee(bikeInfo.getOutOfServiceAreaFee())
                 .maxFeeAmount(bikeInfo.getMaxFeeAmount())
-                .createTime(LocalDateTime.now())
+                .createBy(userId)
                 .build();
         save(order);
         // 尝试开锁
@@ -120,7 +120,6 @@ public class EbikeOrderServiceImpl extends ServiceImpl<EbikeOrderMapper, EbikeOr
         EbikeOrder orders = EbikeOrder.builder()
                 .orderId(order.getOrderId())
                 .orderStatus(OrderStatus.IN_PROGRESS)
-                .updateTime(LocalDateTime.now())
                 .build();
         updateById(orders);
         return getById(order.getOrderId());
@@ -374,7 +373,7 @@ public class EbikeOrderServiceImpl extends ServiceImpl<EbikeOrderMapper, EbikeOr
                 .detailDescription(orderDetailType.getName())
                 .detailName(detailName)
                 .detailAmount(amount)
-                .couponId(order.getCouponIds())
+                .createBy(order.getUserId())
                 .build();
     }