订单接口修改

car-wash-admin/src/main/java/com/kym/admin/controller/WashOrderController.java

@@ -46,11 +46,18 @@ public class WashOrderController extends IController {
     }
 
 
+    /**
+     * 获取订单详情
+     * 注意：此接口接收订单号（orderId），而不是主键ID
+     *
+     * @param orderId 订单号
+     * @return 订单详情
+     */
     @SaCheckPermission("washOrder.list")
     @SysLog("详情")
-    @GetMapping("detail/{id}")
-    R<?> detail(@PathVariable long id) {
-        return R.success(washOrderService.detail(id));
+    @GetMapping("detail/{orderId}")
+    R<?> detail(@PathVariable String orderId) {
+        return R.success(washOrderService.detail(orderId));
     }
 
 

car-wash-service/src/main/java/com/kym/service/WashOrderService.java

@@ -37,7 +37,12 @@ public interface WashOrderService extends MyBaseService<WashOrder> {
 
     Object list(WashOrderQueryParams query);
 
-    Object detail(long id);
+    /**
+     * 获取订单详情
+     * @param orderId 订单号
+     * @return 订单详情
+     */
+    WashOrderVo detail(String orderId);
 
     Map<String, Integer> sumAmountByDate(LocalDate statDay);
 

car-wash-service/src/main/java/com/kym/service/impl/WashOrderServiceImpl.java

@@ -229,9 +229,30 @@ public class WashOrderServiceImpl extends MyBaseServiceImpl<WashOrderMapper, Was
         return new PageBean<>(list);
     }
 
+    /**
+     * 获取订单详情
+     * 根据订单号查询，而不是主键ID
+     *
+     * @param orderId 订单号
+     * @return 订单详情
+     */
     @Override
-    public WashOrder detail(long id) {
-        return getById(id);
+    public WashOrderVo detail(String orderId) {
+        MPJLambdaWrapper<WashOrder> wrapper = JoinWrappers.lambda(WashOrder.class)
+                .selectAsClass(WashOrder.class, WashOrderVo.class)
+                .selectAs(User::getMobilePhone, WashOrderVo::getMobilePhone)
+                .leftJoin(User.class, User::getId, WashOrder::getUserId)
+                .eq(WashOrder::getOrderId, orderId);
+        
+        WashOrderVo washOrderVo = selectJoinOne(WashOrderVo.class, wrapper);
+        
+        if (washOrderVo != null) {
+            washOrderVo.setStationName(KymCache.INSTANCE.getStationNameById(washOrderVo.getStationId()));
+            washOrderVo.setUserStationId(KymCache.INSTANCE.getUserStationId(washOrderVo.getUserId()));
+            washOrderVo.setUserStationName(KymCache.INSTANCE.getStationNameById(washOrderVo.getUserStationId()));
+        }
+        
+        return washOrderVo;
     }
 
     /**