From c63181147fc67d6b04d145ff557509318da73cec Mon Sep 17 00:00:00 2001
From: attiya <2413103649@qq.com>
Date: Sun, 27 Apr 2025 10:07:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DTableDef=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/UserOrdersServiceImpl.java   | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/ebike-orders/src/main/java/com/cdzy/orders/service/impl/UserOrdersServiceImpl.java b/ebike-orders/src/main/java/com/cdzy/orders/service/impl/UserOrdersServiceImpl.java
index 04c11dc6..8d2c400a 100644
--- a/ebike-orders/src/main/java/com/cdzy/orders/service/impl/UserOrdersServiceImpl.java
+++ b/ebike-orders/src/main/java/com/cdzy/orders/service/impl/UserOrdersServiceImpl.java
@@ -38,7 +38,7 @@ import java.util.concurrent.CompletableFuture;
 
 import static com.cdzy.orders.enums.TimeDivisionCharging.TIME_SLOT;
 import static com.cdzy.orders.enums.TimeDivisionCharging.WEEK;
-import static com.cdzy.orders.model.entity.table.UserOrdersTableDef.USER_ORDERS;
+import static com.cdzy.orders.model.entity.table.EbikeUserOrdersTableDef.EBIKE_USER_ORDERS;
 
 /**
  * 用户订单表 服务层实现。
@@ -169,9 +169,9 @@ public class UserOrdersServiceImpl extends ServiceImpl<UserOrdersMapper, EbikeUs
 
     private EbikeUserOrders getOrder(ReqOrderDto orderDto) {
         QueryWrapper queryWrapper = QueryWrapper.create()
-                .where(USER_ORDERS.BIKE_CODE.eq(orderDto.getBikeCode()))
-                .where(USER_ORDERS.USER_ID.eq(orderDto.getUserId()))
-                .where(USER_ORDERS.STATUS.eq(OrderStatus.IN_PROGRESS));
+                .where(EBIKE_USER_ORDERS.BIKE_CODE.eq(orderDto.getBikeCode()))
+                .where(EBIKE_USER_ORDERS.USER_ID.eq(orderDto.getUserId()))
+                .where(EBIKE_USER_ORDERS.STATUS.eq(OrderStatus.IN_PROGRESS));
         EbikeUserOrders userOrders = userOrdersMapper.selectOneByQuery(queryWrapper);
         if (userOrders == null) {
             throw new RuntimeException("该订单不存在");
@@ -187,8 +187,8 @@ public class UserOrdersServiceImpl extends ServiceImpl<UserOrdersMapper, EbikeUs
     @Override
     public EbikeUserOrders checkHistoryOrder(String userId) {
         QueryWrapper queryWrapper = QueryWrapper.create()
-                .where(USER_ORDERS.USER_ID.eq(userId))
-                .where(USER_ORDERS.STATUS.eq(OrderStatus.IN_PROGRESS).or(USER_ORDERS.STATUS.eq(OrderStatus.PENDING_PAYMENT)));
+                .where(EBIKE_USER_ORDERS.USER_ID.eq(userId))
+                .where(EBIKE_USER_ORDERS.STATUS.eq(OrderStatus.IN_PROGRESS).or(EBIKE_USER_ORDERS.STATUS.eq(OrderStatus.PENDING_PAYMENT)));
         return userOrdersMapper.selectOneByQuery(queryWrapper);
     }
 
@@ -285,8 +285,8 @@ public class UserOrdersServiceImpl extends ServiceImpl<UserOrdersMapper, EbikeUs
     @Override
     public void refund(Long orderId) {
         QueryWrapper queryWrapper = QueryWrapper.create()
-                .where(USER_ORDERS.ORDER_ID.eq(orderId))
-                .where(USER_ORDERS.STATUS.eq(OrderStatus.PAID));
+                .where(EBIKE_USER_ORDERS.ORDER_ID.eq(orderId))
+                .where(EBIKE_USER_ORDERS.STATUS.eq(OrderStatus.PAID));
         EbikeUserOrders userOrders = this.mapper.selectOneByQuery(queryWrapper);
         userOrders.setStatus(OrderStatus.REFUNDING);
         this.mapper.update(userOrders);
@@ -295,8 +295,8 @@ public class UserOrdersServiceImpl extends ServiceImpl<UserOrdersMapper, EbikeUs
     @Override
     public void doneRefund(Long orderId) {
         QueryWrapper queryWrapper = QueryWrapper.create()
-                .where(USER_ORDERS.ORDER_ID.eq(orderId))
-                .where(USER_ORDERS.STATUS.eq(OrderStatus.REFUNDING));
+                .where(EBIKE_USER_ORDERS.ORDER_ID.eq(orderId))
+                .where(EBIKE_USER_ORDERS.STATUS.eq(OrderStatus.REFUNDING));
         EbikeUserOrders userOrders = this.mapper.selectOneByQuery(queryWrapper);
         userOrders.setStatus(OrderStatus.REFUNDED);
         this.mapper.update(userOrders);