From a28cd59edcd6014ce5293c67ef9444e034904c28 Mon Sep 17 00:00:00 2001
From: attiya <2413103649@qq.com>
Date: Fri, 25 Apr 2025 09:46:02 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E5=90=8D=E3=80=81=E5=AE=9E=E4=BD=93?=
 =?UTF-8?q?=E5=89=8D=E7=BC=80=E7=BB=9F=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/EbikeUserController.java       |  4 +--
 .../controller/EbikeUserOrdersController.java |  8 ++---
 .../cdzy/orders/mapper/UserOrdersMapper.java  |  4 +--
 .../{UserOrders.java => EbikeUserOrders.java} |  4 +--
 .../orders/service/UserOrdersService.java     |  6 ++--
 .../service/impl/UserOrdersServiceImpl.java   | 34 +++++++++----------
 6 files changed, 30 insertions(+), 30 deletions(-)
 rename ebike-orders/src/main/java/com/cdzy/orders/model/entity/{UserOrders.java => EbikeUserOrders.java} (96%)

diff --git a/ebike-orders/src/main/java/com/cdzy/orders/controller/EbikeUserController.java b/ebike-orders/src/main/java/com/cdzy/orders/controller/EbikeUserController.java
index c3b8a2cf..f970c548 100644
--- a/ebike-orders/src/main/java/com/cdzy/orders/controller/EbikeUserController.java
+++ b/ebike-orders/src/main/java/com/cdzy/orders/controller/EbikeUserController.java
@@ -6,7 +6,7 @@ import com.cdzy.orders.model.dto.req.ReqEbikeUserDto;
 import com.cdzy.orders.model.dto.req.ReqWechatInfoDto;
 import com.cdzy.orders.model.dto.res.EbikeUserDto;
 import com.cdzy.orders.model.entity.EbikeUser;
-import com.cdzy.orders.model.entity.UserOrders;
+import com.cdzy.orders.model.entity.EbikeUserOrders;
 import com.cdzy.orders.service.UserOrdersService;
 import com.cdzy.orders.uitls.WechatUtil;
 import com.mybatisflex.core.paginate.Page;
@@ -107,7 +107,7 @@ public class EbikeUserController {
     @PostMapping("deRegister")
     public JsonResult<?> deRegister(@RequestBody EbikeUser ebikeUser) {
         // 需要检测用户是否还有未支付的订单，如果有则不能注销
-        UserOrders unpayed = userOrdersService.checkHistoryOrder(ebikeUser.getUserId());
+        EbikeUserOrders unpayed = userOrdersService.checkHistoryOrder(ebikeUser.getUserId());
         if (unpayed != null) {
             return JsonResult.failed("用户还有未完成的订单，不能注销", unpayed);
         }
diff --git a/ebike-orders/src/main/java/com/cdzy/orders/controller/EbikeUserOrdersController.java b/ebike-orders/src/main/java/com/cdzy/orders/controller/EbikeUserOrdersController.java
index 0c6670e1..a2679657 100644
--- a/ebike-orders/src/main/java/com/cdzy/orders/controller/EbikeUserOrdersController.java
+++ b/ebike-orders/src/main/java/com/cdzy/orders/controller/EbikeUserOrdersController.java
@@ -6,7 +6,7 @@ import com.cdzy.orders.model.dto.req.ReqBikeDto;
 import com.cdzy.orders.model.dto.req.ReqOrderDto;
 import com.ebike.feign.model.res.ResFeignOrderPaymentDto;
 import com.cdzy.orders.model.dto.res.RspBikeDto;
-import com.cdzy.orders.model.entity.UserOrders;
+import com.cdzy.orders.model.entity.EbikeUserOrders;
 import com.cdzy.orders.service.UserOrdersService;
 import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.query.QueryWrapper;
@@ -67,7 +67,7 @@ public class EbikeUserOrdersController {
      */
     @GetMapping("checkHistoryOrder")
     public JsonResult<?> checkHistoryOrder(@Validated @NotBlank(message = "用户id不能为空") @RequestParam("userId") String userId) {
-        UserOrders userOrders = userOrdersService.checkHistoryOrder(userId);
+        EbikeUserOrders userOrders = userOrdersService.checkHistoryOrder(userId);
         return JsonResult.success(userOrders);
     }
 
@@ -177,7 +177,7 @@ public class EbikeUserOrdersController {
      */
     @GetMapping("getInfo/{id}")
     public JsonResult<?> getInfo(@PathVariable("id") String id) {
-        UserOrders userOrders = userOrdersService.getById(id);
+        EbikeUserOrders userOrders = userOrdersService.getById(id);
         return JsonResult.success(userOrders);
     }
 
@@ -192,7 +192,7 @@ public class EbikeUserOrdersController {
         QueryWrapper queryWrapper = QueryWrapper.create()
                 .from(USER_ORDERS)
                 .where(USER_ORDERS.BIKE_ID.eq(bikeId, bikeId != null));
-        Page<UserOrders> page = userOrdersService.page(pageParam.getPage(), queryWrapper);
+        Page<EbikeUserOrders> page = userOrdersService.page(pageParam.getPage(), queryWrapper);
         return JsonResult.success(page);
     }
 
diff --git a/ebike-orders/src/main/java/com/cdzy/orders/mapper/UserOrdersMapper.java b/ebike-orders/src/main/java/com/cdzy/orders/mapper/UserOrdersMapper.java
index bf320396..1d39ed4c 100644
--- a/ebike-orders/src/main/java/com/cdzy/orders/mapper/UserOrdersMapper.java
+++ b/ebike-orders/src/main/java/com/cdzy/orders/mapper/UserOrdersMapper.java
@@ -1,7 +1,7 @@
 package com.cdzy.orders.mapper;
 
 import com.mybatisflex.core.BaseMapper;
-import com.cdzy.orders.model.entity.UserOrders;
+import com.cdzy.orders.model.entity.EbikeUserOrders;
 
 /**
  * 用户订单表 映射层。
@@ -9,6 +9,6 @@ import com.cdzy.orders.model.entity.UserOrders;
  * @author attiya
  * @since 2025-03-28
  */
-public interface UserOrdersMapper extends BaseMapper<UserOrders> {
+public interface UserOrdersMapper extends BaseMapper<EbikeUserOrders> {
 
 }
diff --git a/ebike-orders/src/main/java/com/cdzy/orders/model/entity/UserOrders.java b/ebike-orders/src/main/java/com/cdzy/orders/model/entity/EbikeUserOrders.java
similarity index 96%
rename from ebike-orders/src/main/java/com/cdzy/orders/model/entity/UserOrders.java
rename to ebike-orders/src/main/java/com/cdzy/orders/model/entity/EbikeUserOrders.java
index 37e961ea..45349231 100644
--- a/ebike-orders/src/main/java/com/cdzy/orders/model/entity/UserOrders.java
+++ b/ebike-orders/src/main/java/com/cdzy/orders/model/entity/EbikeUserOrders.java
@@ -24,8 +24,8 @@ import lombok.NoArgsConstructor;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-@Table("user_orders")
-public class UserOrders implements Serializable {
+@Table("ebike_user_orders")
+public class EbikeUserOrders implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;
diff --git a/ebike-orders/src/main/java/com/cdzy/orders/service/UserOrdersService.java b/ebike-orders/src/main/java/com/cdzy/orders/service/UserOrdersService.java
index 4bfa9f9c..c7bd3653 100644
--- a/ebike-orders/src/main/java/com/cdzy/orders/service/UserOrdersService.java
+++ b/ebike-orders/src/main/java/com/cdzy/orders/service/UserOrdersService.java
@@ -5,7 +5,7 @@ import com.cdzy.orders.model.dto.req.ReqOrderDto;
 import com.ebike.feign.model.res.ResFeignOrderPaymentDto;
 import com.cdzy.orders.model.dto.res.RspBikeDto;
 import com.mybatisflex.core.service.IService;
-import com.cdzy.orders.model.entity.UserOrders;
+import com.cdzy.orders.model.entity.EbikeUserOrders;
 
 import java.util.List;
 
@@ -15,7 +15,7 @@ import java.util.List;
  * @author attiya
  * @since 2025-03-28
  */
-public interface UserOrdersService extends IService<UserOrders> {
+public interface UserOrdersService extends IService<EbikeUserOrders> {
 
     /**
      * 生成骑行订单
@@ -39,7 +39,7 @@ public interface UserOrdersService extends IService<UserOrders> {
      * 检查历史订单
      * @param userId 用户id
      */
-    UserOrders checkHistoryOrder(String userId);
+    EbikeUserOrders checkHistoryOrder(String userId);
 
     /**
      * 车辆位置列表
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 a66b218b..52da6457 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
@@ -15,7 +15,7 @@ import com.cdzy.orders.model.dto.req.ReqOrderDto;
 import com.ebike.feign.model.res.ResFeignOrderPaymentDto;
 import com.cdzy.orders.model.dto.res.RedisPoint;
 import com.cdzy.orders.model.dto.res.RspBikeDto;
-import com.cdzy.orders.model.entity.UserOrders;
+import com.cdzy.orders.model.entity.EbikeUserOrders;
 import com.cdzy.orders.service.UserOrdersService;
 import com.cdzy.orders.uitls.NumberUtils;
 import com.cdzy.orders.uitls.RedisUtil;
@@ -49,7 +49,7 @@ import static com.cdzy.orders.model.entity.table.UserOrdersTableDef.USER_ORDERS;
  * @since 2025-03-28
  */
 @Service
-public class UserOrdersServiceImpl extends ServiceImpl<UserOrdersMapper, UserOrders> implements UserOrdersService {
+public class UserOrdersServiceImpl extends ServiceImpl<UserOrdersMapper, EbikeUserOrders> implements UserOrdersService {
 
     @Resource
     UserOrdersMapper userOrdersMapper;
@@ -70,14 +70,14 @@ public class UserOrdersServiceImpl extends ServiceImpl<UserOrdersMapper, UserOrd
     @Transactional
     public Long saveRide(ReqOrderDto orderDto) {
         String userId = orderDto.getUserId();
-        UserOrders history = checkHistoryOrder(userId);
+        EbikeUserOrders history = checkHistoryOrder(userId);
         if (history != null && history.getStatus() == OrderStatus.IN_PROGRESS) {
             throw new RuntimeException("请完成当前订单后再试");
         }
         if (history != null && history.getStatus() == OrderStatus.PENDING_PAYMENT) {
             throw new RuntimeException("请支付未支付订单后再试");
         }
-        UserOrders userOrders = new UserOrders();
+        EbikeUserOrders userOrders = new EbikeUserOrders();
         userOrders.setUserId(userId);
         userOrders.setBikeCode(orderDto.getBikeCode());
         userOrders.setOrderType(OrderType.ONCE);
@@ -125,7 +125,7 @@ public class UserOrdersServiceImpl extends ServiceImpl<UserOrdersMapper, UserOrd
 
     @Override
     public void cancelRide(ReqOrderDto orderDto) {
-        UserOrders userOrders = getOrder(orderDto);
+        EbikeUserOrders userOrders = getOrder(orderDto);
         userOrders.setStatus(OrderStatus.CANCELLED);
         userOrdersMapper.update(userOrders);
     }
@@ -134,7 +134,7 @@ public class UserOrdersServiceImpl extends ServiceImpl<UserOrdersMapper, UserOrd
     @Transactional
     public Long doneRide(ReqOrderDto orderDto) {
         String userId = orderDto.getUserId();
-        UserOrders userOrders = getOrder(orderDto);
+        EbikeUserOrders userOrders = getOrder(orderDto);
         userOrders.setEndTime(LocalDateTime.now());
         JsonResult<FeignEbikeBikeInfoDto> jsonResult = maintenanceFeignClient.getEbikeInfoByCode(orderDto.getBikeCode());
         if (jsonResult.getCode() != Code.SUCCESS) {
@@ -169,12 +169,12 @@ public class UserOrdersServiceImpl extends ServiceImpl<UserOrdersMapper, UserOrd
         return userOrders.getOrderId();
     }
 
-    private UserOrders getOrder(ReqOrderDto orderDto) {
+    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));
-        UserOrders userOrders = userOrdersMapper.selectOneByQuery(queryWrapper);
+        EbikeUserOrders userOrders = userOrdersMapper.selectOneByQuery(queryWrapper);
         if (userOrders == null) {
             throw new RuntimeException("该订单不存在");
         }
@@ -187,7 +187,7 @@ public class UserOrdersServiceImpl extends ServiceImpl<UserOrdersMapper, UserOrd
      * @param userId 用户id
      */
     @Override
-    public UserOrders checkHistoryOrder(String userId) {
+    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)));
@@ -215,7 +215,7 @@ public class UserOrdersServiceImpl extends ServiceImpl<UserOrdersMapper, UserOrd
     @Transactional
     public void tempLock(ReqOrderDto orderDto) {
         String userId = orderDto.getUserId();
-        UserOrders userOrders = getOrder(orderDto);
+        EbikeUserOrders userOrders = getOrder(orderDto);
         JsonResult<FeignEbikeBikeInfoDto> jsonResult = maintenanceFeignClient.getEbikeInfoByCode(orderDto.getBikeCode());
         if (jsonResult.getCode() != Code.SUCCESS) {
             throw new RuntimeException("获取车辆信息失败");
@@ -236,7 +236,7 @@ public class UserOrdersServiceImpl extends ServiceImpl<UserOrdersMapper, UserOrd
     @Transactional
     public void continueCycling(ReqOrderDto orderDto) {
         String userId = orderDto.getUserId();
-        UserOrders userOrders = getOrder(orderDto);
+        EbikeUserOrders userOrders = getOrder(orderDto);
         JsonResult<FeignEbikeBikeInfoDto> jsonResult = maintenanceFeignClient.getEbikeInfoByCode(orderDto.getBikeCode());
         if (jsonResult.getCode() != Code.SUCCESS) {
             throw new RuntimeException("获取车辆信息失败");
@@ -294,7 +294,7 @@ public class UserOrdersServiceImpl extends ServiceImpl<UserOrdersMapper, UserOrd
         QueryWrapper queryWrapper = QueryWrapper.create()
                 .where(USER_ORDERS.ORDER_ID.eq(orderId))
                 .where(USER_ORDERS.STATUS.eq(OrderStatus.PAID));
-        UserOrders userOrders = this.mapper.selectOneByQuery(queryWrapper);
+        EbikeUserOrders userOrders = this.mapper.selectOneByQuery(queryWrapper);
         userOrders.setStatus(OrderStatus.REFUNDING);
         this.mapper.update(userOrders);
     }
@@ -304,7 +304,7 @@ public class UserOrdersServiceImpl extends ServiceImpl<UserOrdersMapper, UserOrd
         QueryWrapper queryWrapper = QueryWrapper.create()
                 .where(USER_ORDERS.ORDER_ID.eq(orderId))
                 .where(USER_ORDERS.STATUS.eq(OrderStatus.REFUNDING));
-        UserOrders userOrders = this.mapper.selectOneByQuery(queryWrapper);
+        EbikeUserOrders userOrders = this.mapper.selectOneByQuery(queryWrapper);
         userOrders.setStatus(OrderStatus.REFUNDED);
         this.mapper.update(userOrders);
     }
@@ -316,7 +316,7 @@ public class UserOrdersServiceImpl extends ServiceImpl<UserOrdersMapper, UserOrd
 
     @Override
     public void payment(ResFeignOrderPaymentDto paymentDto) {
-        UserOrders userOrders = this.mapper.selectOneById(paymentDto.getOrderId());
+        EbikeUserOrders userOrders = this.mapper.selectOneById(paymentDto.getOrderId());
         userOrders.setStatus(OrderStatus.PAID);
         userOrders.setPaymentTime(paymentDto.getPaymentTime());
         userOrders.setPaymentMethod(paymentDto.getPaymentMethod());
@@ -337,7 +337,7 @@ public class UserOrdersServiceImpl extends ServiceImpl<UserOrdersMapper, UserOrd
      * @param regionDto                运营区域信息
      * @param userOrders               订单信息
      */
-    void costCalculation(ResFeignEbikeSysRcostsetDto feignEbikeSysRcostsetDto, ResGPSDto resGpsDto, FeignEbikeRegionDto regionDto, UserOrders userOrders) {
+    void costCalculation(ResFeignEbikeSysRcostsetDto feignEbikeSysRcostsetDto, ResGPSDto resGpsDto, FeignEbikeRegionDto regionDto, EbikeUserOrders userOrders) {
         BigDecimal totalAmount = new BigDecimal(0);
         //是否在运营区内
         boolean pointInOperation = bikeInOperation(resGpsDto.getLongitude(), resGpsDto.getLatitude(), regionDto.getOrgId(), regionDto.getRegionId());
@@ -379,7 +379,7 @@ public class UserOrdersServiceImpl extends ServiceImpl<UserOrdersMapper, UserOrd
      * @param feignEbikeSysRcostsetDto 计费规则
      * @return 计费后总金额
      */
-    BigDecimal timeSlotCostCalculation(BigDecimal totalAmount, long minutes, UserOrders userOrders, ResFeignEbikeSysRcostsetDto feignEbikeSysRcostsetDto) {
+    BigDecimal timeSlotCostCalculation(BigDecimal totalAmount, long minutes, EbikeUserOrders userOrders, ResFeignEbikeSysRcostsetDto feignEbikeSysRcostsetDto) {
         return totalAmount;
     }
 
@@ -392,7 +392,7 @@ public class UserOrdersServiceImpl extends ServiceImpl<UserOrdersMapper, UserOrd
      * @param feignEbikeSysRcostsetDto 计费规则
      * @return 计费后总金额
      */
-    BigDecimal weekCostCalculation(BigDecimal totalAmount, long minutes, UserOrders userOrders, ResFeignEbikeSysRcostsetDto feignEbikeSysRcostsetDto) {
+    BigDecimal weekCostCalculation(BigDecimal totalAmount, long minutes, EbikeUserOrders userOrders, ResFeignEbikeSysRcostsetDto feignEbikeSysRcostsetDto) {
         return totalAmount;
     }