新增菜单与角色管理功能，包括角色分配菜单、菜单树查询和相关接口

杨刚
1 parent 5a1187de
Showing 49 changed files with 1652 additions and 64 deletions
CLAUDE.md
src/main/java/com/diligrp/rider/common/auth/AdminScopeGuard.java
src/main/java/com/diligrp/rider/common/enums/AdminRoleScopeEnum.java
src/main/java/com/diligrp/rider/common/enums/MenuScopeEnum.java
src/main/java/com/diligrp/rider/controller/AdminRefundController.java
src/main/java/com/diligrp/rider/controller/AdminRiderController.java
src/main/java/com/diligrp/rider/controller/PlatformAdminUserController.java
src/main/java/com/diligrp/rider/controller/PlatformSubstationController.java
src/main/java/com/diligrp/rider/controller/PlatformSystemMenuController.java
src/main/java/com/diligrp/rider/controller/PlatformSystemRoleController.java
src/main/java/com/diligrp/rider/controller/RiderExtController.java
src/main/java/com/diligrp/rider/dto/AdminMenuSaveDTO.java
src/main/java/com/diligrp/rider/dto/AdminRoleMenuAssignDTO.java
src/main/java/com/diligrp/rider/entity/AdminUser.java
src/main/java/com/diligrp/rider/entity/Substation.java
src/main/java/com/diligrp/rider/entity/SysMenu.java
src/main/java/com/diligrp/rider/entity/SysRole.java
src/main/java/com/diligrp/rider/entity/SysRoleMenu.java
src/main/java/com/diligrp/rider/mapper/SysMenuMapper.java
src/main/java/com/diligrp/rider/mapper/SysRoleMapper.java
+# CLAUDE.md
+
+This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
+
+## Common commands
+
+- `mvn spring-boot:run` — run the service with the checked-in `src/main/resources/application.yml`
+- `mvn test` — run all tests
+- `mvn -Dtest=DeliveryFeeServiceImplTest test` — run the pricing-engine test class
+- `mvn -Dtest=DeliveryFeeServiceImplTest#shouldApplyMinFee test` — run one test method
+- `mvn package` — build the jar under `target/`
+- `mvn -DskipTests package` — build without running tests
+- `mysql -u root -p dili_rider < src/main/resources/schema.sql` — initialize schema
+- `mysql -u root -p dili_rider < src/main/resources/data-init.sql` — load seed data
+
+Notes:
+- There is no Maven wrapper in this repo; use the system `mvn`.
+- No dedicated lint/format command is configured in `pom.xml`.
+- Test coverage is currently sparse; the only checked-in unit tests are in `src/test/java/com/diligrp/rider/service/impl/DeliveryFeeServiceImplTest.java`.
+
+## Architecture overview
+
+This is a Java 17 / Spring Boot 3.2 monolith for rider delivery operations. The main entrypoint is `src/main/java/com/diligrp/rider/RiderServiceApplication.java`, which enables MyBatis mapper scanning and `@EnableAsync`.
+
+### Main layers
+
+Code follows a conventional Spring layout under `src/main/java/com/diligrp/rider/`:
+- `controller` — REST endpoints grouped by caller type
+- `service` / `service/impl` — business logic
+- `mapper` — MyBatis-Plus mappers
+- `entity` — database entities
+- `dto` / `vo` — request and response shapes
+- `config` — interceptors, JWT utilities, MVC and WebSocket wiring
+- `task` — scheduled background jobs
+- `websocket` — live rider-location subscriptions and push
+- `common` — shared `Result`, enums, and exception handling
+
+Most persistence uses MyBatis-Plus query/update wrappers. XML SQL exists, but only in a few files under `src/main/resources/mapper/`. Logical delete is globally configured through the `isDel` field in `src/main/resources/application.yml`.
+
+### API surfaces
+
+Controllers are split by audience rather than by technical module:
+- `/api/rider/**` — rider app APIs
+- `/api/admin/**` — admin and substation admin APIs
+- `/api/platform/**` — super-admin platform APIs
+- `/api/open/**` — signed open-platform APIs for third-party integrations
+- `/api/delivery/fee/**` — internal fee-calculation APIs
+
+All controllers return the shared `Result<T>` envelope from `src/main/java/com/diligrp/rider/common/result/Result.java`. Cross-cutting exception mapping lives in `src/main/java/com/diligrp/rider/common/exception/GlobalExceptionHandler.java`.
+
+### Authentication and tenant/city scoping
+
+This service does not use Spring Security. Authentication is interceptor-driven:
+- `src/main/java/com/diligrp/rider/config/AuthInterceptor.java` handles JWT auth for rider/admin/platform APIs.
+- `src/main/java/com/diligrp/rider/config/OpenApiInterceptor.java` handles signed auth for `/api/open/**` using `X-App-Key`, `X-Timestamp`, `X-Nonce`, and `X-Sign`.
+- `src/main/java/com/diligrp/rider/config/WebMvcConfig.java` wires both interceptors.
+- JWT creation/parsing lives in `src/main/java/com/diligrp/rider/config/JwtUtil.java`.
+
+Important boundary rule: city/tenant identity is derived from trusted server-side state, not from caller input.
+- Rider/admin JWTs inject `riderId`, `adminId`, `role`, and sometimes `cityId` into the request.
+- Substation admins get `cityId` from the `substation` record, not from the request.
+- Open-platform requests derive `cityId` from the bound `OpenApp`, not from payload fields.
+
+If you touch auth or routing, preserve that pattern.
+
+Also note: password checking in `RiderAuthServiceImpl` and `AdminAuthServiceImpl` uses MD5 hashing, so do not assume bcrypt/Spring Security conventions are already in place.
+
+### Core business flows
+
+#### Delivery pricing is DB-driven
+
+The pricing engine is centered on `src/main/java/com/diligrp/rider/service/impl/DeliveryFeeServiceImpl.java`, but the actual pricing configuration comes from DB tables, not hardcoded constants.
+
+`src/main/java/com/diligrp/rider/service/impl/CityServiceImpl.java` assembles the active pricing plan from:
+- `delivery_fee_plan`
+- `delivery_fee_plan_dimension`
+- `delivery_fee_plan_distance_step`
+- `delivery_fee_plan_piece_rule`
+- `delivery_fee_plan_time_rule`
+
+That assembled config is then used to compute:
+- base fee
+- distance fee / distance steps
+- weight fee
+- piece-count fee
+- time-window surcharge
+- minimum fee
+- estimated delivery time
+
+If you change pricing behavior, check both `CityServiceImpl` and `DeliveryFeeServiceImpl`, and extend `DeliveryFeeServiceImplTest`.
+
+#### Open-platform order creation drives the main order lifecycle
+
+`src/main/java/com/diligrp/rider/service/impl/DeliveryOrderServiceImpl.java` is the main open-platform order entry path. It:
+- resolves the `OpenApp` from `appKey`
+- forces `cityId` from the app binding
+- optionally hydrates store info from merchant data
+- computes the delivery fee
+- creates the `orders` record
+- emits webhook notifications for order events
+
+That service is a good starting point when tracing order ingestion and external callbacks.
+
+#### Dispatch is a scoring engine over DB state
+
+`src/main/java/com/diligrp/rider/service/impl/DispatchServiceImpl.java` performs rider selection. It scores candidates using current city, online/rest state, rider location, order load, refusal history, daily counts, and configured dispatch conditions.
+
+The dispatch engine depends on:
+- the active dispatch rule template for the city
+- current `rider_location` rows
+- open `orders`
+- rider/day statistics
+
+Scheduled jobs then advance the order lifecycle:
+- `src/main/java/com/diligrp/rider/task/DispatchScheduleTask.java` runs every 3 seconds to auto-dispatch timed-out grab orders
+- `src/main/java/com/diligrp/rider/task/OrderScheduleTask.java` runs every 60 seconds to auto-cancel stale unaccepted orders
+
+This app is DB-state-driven; there is no message queue coordinating dispatch.
+
+### Real-time location flow
+
+Live rider location is implemented with raw Spring WebSocket, not STOMP/SockJS.
+- WebSocket endpoint: `/ws/location`
+- Config: `src/main/java/com/diligrp/rider/config/LocationWebSocketConfig.java`
+- Handshake auth: `src/main/java/com/diligrp/rider/websocket/LocationWebSocketHandshakeInterceptor.java`
+- Update/push path: `src/main/java/com/diligrp/rider/service/impl/RiderLocationServiceImpl.java`
+
+Rider location updates are written to `rider_location` and then pushed to subscribed admin clients. Super admins must provide `cityId` when connecting; substation admins derive it from their account.
+
+### External integrations
+
+External notifications are sent asynchronously by `src/main/java/com/diligrp/rider/service/impl/WebhookServiceImpl.java` using JDK `HttpClient` plus `@Async`. There is no Kafka/RabbitMQ-style event bus in this repo.
+
+Redis is present, but its main visible use is SMS verification code storage in `src/main/java/com/diligrp/rider/service/impl/RiderAuthServiceImpl.java`; do not assume Redis-backed sessions or broad caching layers exist.
+
+### Database and runtime config
+
+- Main runtime config is `src/main/resources/application.yml`
+- Schema lives in `src/main/resources/schema.sql`
+- Seed data lives in `src/main/resources/data-init.sql`
+
+There is only one checked-in Spring config file; do not assume profile-specific config files already exist.
+package com.diligrp.rider.common.auth;
+
+import com.diligrp.rider.common.exception.BizException;
+import org.springframework.stereotype.Component;
+
+@Component
+public class AdminScopeGuard {
+
+    public void assertCityAccessible(Long currentCityId, Long targetCityId) {
+        if (currentCityId == null || currentCityId < 1) {
+            return;
+        }
+        if (targetCityId == null || !currentCityId.equals(targetCityId)) {
+            throw new BizException("只能操作当前城市数据");
+        }
+    }
+}
+package com.diligrp.rider.common.enums;
+
+public enum AdminRoleScopeEnum {
+    PLATFORM,
+    SUBSTATION
+}
+package com.diligrp.rider.common.enums;
+
+public enum MenuScopeEnum {
+    PLATFORM,
+    SUBSTATION,
+    BOTH
+}
@@ -5,6 +5,7 @@ import com.diligrp.rider.entity.OrderRefundReason;
 import com.diligrp.rider.entity.OrderRefundRecord;
 import com.diligrp.rider.service.RefundService;
 import com.diligrp.rider.service.RiderEvaluateService;
+import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
  
@@ -29,8 +30,8 @@ public class AdminRefundController {
  
     /** 查看订单退款记录 */
     @GetMapping("/refund/record")
-    public Result<OrderRefundRecord> record(@RequestParam Long orderId) {
-        return Result.success(refundService.getByOrderId(orderId));
+    public Result<OrderRefundRecord> record(@RequestParam Long orderId, HttpServletRequest request) {
+        return Result.success(refundService.getByOrderId(orderId, resolveScopedCityId(request)));
     }
  
     /**
@@ -42,8 +43,9 @@ public class AdminRefundController {
     public Result<Void> handle(
             @RequestParam Long recordId,
             @RequestParam int status,
-            @RequestParam(required = false, defaultValue = "") String remark) {
-        refundService.handleRefund(recordId, status, remark);
+            @RequestParam(required = false, defaultValue = "") String remark,
+            HttpServletRequest request) {
+        refundService.handleRefund(recordId, status, remark, resolveScopedCityId(request));
         return Result.success();
     }
  
@@ -52,7 +54,14 @@ public class AdminRefundController {
     public Result<List<?>> evaluateList(
             @RequestParam Long riderId,
             @RequestParam(defaultValue = "0") int type,
-            @RequestParam(defaultValue = "1") int page) {
-        return Result.success(evaluateService.getRiderEvaluates(riderId, type, page));
+            @RequestParam(defaultValue = "1") int page,
+            HttpServletRequest request) {
+        return Result.success(evaluateService.getRiderEvaluates(riderId, type, page, resolveScopedCityId(request)));
+    }
+
+    private Long resolveScopedCityId(HttpServletRequest request) {
+        return "substation".equals(request.getAttribute("role"))
+                ? (Long) request.getAttribute("cityId")
+                : null;
     }
 }
@@ -55,8 +55,10 @@ public class AdminRiderController {
  
     /** 审核骑手：status=0拒绝 1通过 */
     @PostMapping("/setStatus")
-    public Result<Void> setStatus(@RequestParam Long riderId, @RequestParam int status) {
-        adminRiderService.setStatus(riderId, status);
+    public Result<Void> setStatus(@RequestParam Long riderId,
+                                  @RequestParam int status,
+                                  HttpServletRequest request) {
+        adminRiderService.setStatus(riderId, status, resolveScopedCityId(request));
         return Result.success();
     }
  
@@ -74,29 +76,37 @@ public class AdminRiderController {
  
     /** 启用/禁用骑手账号：status=0禁用 1启用 */
     @PostMapping("/setEnableStatus")
-    public Result<Void> setEnableStatus(@RequestParam Long riderId, @RequestParam int status) {
-        adminRiderService.setEnableStatus(riderId, status);
+    public Result<Void> setEnableStatus(@RequestParam Long riderId,
+                                        @RequestParam int status,
+                                        HttpServletRequest request) {
+        adminRiderService.setEnableStatus(riderId, status, resolveScopedCityId(request));
         return Result.success();
     }
  
     /** 切换骑手类型：type=1兼职 2全职 */
     @PostMapping("/setType")
-    public Result<Void> setType(@RequestParam Long riderId, @RequestParam int type) {
-        adminRiderService.setType(riderId, type);
+    public Result<Void> setType(@RequestParam Long riderId,
+                                @RequestParam int type,
+                                HttpServletRequest request) {
+        adminRiderService.setType(riderId, type, resolveScopedCityId(request));
         return Result.success();
     }
  
     /** 指派骑手接单 */
     @PostMapping("/order/designate")
-    public Result<Void> designate(@RequestParam Long orderId, @RequestParam Long riderId) {
-        adminRiderService.designate(orderId, riderId);
+    public Result<Void> designate(@RequestParam Long orderId,
+                                  @RequestParam Long riderId,
+                                  HttpServletRequest request) {
+        adminRiderService.designate(orderId, riderId, resolveScopedCityId(request));
         return Result.success();
     }
  
     /** 处理转单申请：trans=1通过 3拒绝 */
     @PostMapping("/order/setTrans")
-    public Result<Void> setTrans(@RequestParam Long orderId, @RequestParam int trans) {
-        adminRiderService.setTrans(orderId, trans);
+    public Result<Void> setTrans(@RequestParam Long orderId,
+                                 @RequestParam int trans,
+                                 HttpServletRequest request) {
+        adminRiderService.setTrans(orderId, trans, resolveScopedCityId(request));
         return Result.success();
     }
  
@@ -145,10 +155,15 @@ public class AdminRiderController {
             @RequestParam(required = false) String appKey,
             @RequestParam(required = false) String outOrderNo,
             @RequestParam(required = false) Integer status,
-            @RequestParam(defaultValue = "1") int page) {
+            @RequestParam(defaultValue = "1") int page,
+            HttpServletRequest request) {
         LambdaQueryWrapper<Orders> wrapper = new LambdaQueryWrapper<Orders>()
                 .eq(Orders::getIsDel, 0)
                 .orderByDesc(Orders::getId);
+        Long cityId = resolveScopedCityId(request);
+        if (cityId != null) {
+            wrapper.eq(Orders::getCityId, cityId);
+        }
         if (appKey != null && !appKey.isBlank()) wrapper.eq(Orders::getAppKey, appKey);
         if (outOrderNo != null && !outOrderNo.isBlank()) wrapper.like(Orders::getOutOrderNo, outOrderNo);
         if (status != null) wrapper.eq(Orders::getStatus, status);
@@ -156,4 +171,10 @@ public class AdminRiderController {
         wrapper.last("LIMIT " + offset + ",20");
         return Result.success(ordersMapper.selectList(wrapper));
     }
+
+    private Long resolveScopedCityId(HttpServletRequest request) {
+        return "substation".equals(request.getAttribute("role"))
+                ? (Long) request.getAttribute("cityId")
+                : null;
+    }
 }
+package com.diligrp.rider.controller;
+
+import com.diligrp.rider.common.result.Result;
+import com.diligrp.rider.dto.ChangePasswordDTO;
+import com.diligrp.rider.entity.AdminUser;
+import com.diligrp.rider.service.AdminUserManageService;
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/api/platform/admin-user")
+@RequiredArgsConstructor
+public class PlatformAdminUserController {
+
+    private final AdminUserManageService adminUserManageService;
+
+    @GetMapping("/list")
+    public Result<List<AdminUser>> list(@RequestParam(required = false) String keyword) {
+        return Result.success(adminUserManageService.list(keyword));
+    }
+
+    @PostMapping("/add")
+    public Result<Void> add(@RequestBody AdminUser adminUser) {
+        adminUserManageService.add(adminUser);
+        return Result.success();
+    }
+
+    @PutMapping("/edit")
+    public Result<Void> edit(@RequestBody AdminUser adminUser) {
+        adminUserManageService.edit(adminUser);
+        return Result.success();
+    }
+
+    @PostMapping("/ban")
+    public Result<Void> ban(@RequestParam Long id) {
+        adminUserManageService.ban(id);
+        return Result.success();
+    }
+
+    @PostMapping("/cancelBan")
+    public Result<Void> cancelBan(@RequestParam Long id) {
+        adminUserManageService.cancelBan(id);
+        return Result.success();
+    }
+
+    @DeleteMapping("/del")
+    public Result<Void> del(@RequestParam Long id) {
+        adminUserManageService.del(id);
+        return Result.success();
+    }
+
+    @PostMapping("/changePassword")
+    public Result<Void> changePassword(@RequestParam Long id,
+                                       @Valid @RequestBody ChangePasswordDTO dto) {
+        adminUserManageService.changePassword(id, dto.getOldPassword(), dto.getNewPassword());
+        return Result.success();
+    }
+}
@@ -70,10 +70,9 @@ public class PlatformSubstationController {
      */
     @PostMapping("/changePassword")
     public Result<Void> changePassword(
-            @Valid @RequestBody ChangePasswordDTO dto,
-            jakarta.servlet.http.HttpServletRequest request) {
-        Long adminId = (Long) request.getAttribute("adminId");
-        substationService.changePassword(adminId, dto.getOldPassword(), dto.getNewPassword());
+            @RequestParam Long id,
+            @Valid @RequestBody ChangePasswordDTO dto) {
+        substationService.changePassword(id, dto.getOldPassword(), dto.getNewPassword());
         return Result.success();
     }
 }
+package com.diligrp.rider.controller;
+
+import com.diligrp.rider.common.result.Result;
+import com.diligrp.rider.dto.AdminMenuSaveDTO;
+import com.diligrp.rider.service.SystemMenuService;
+import com.diligrp.rider.vo.AdminRoleMenuTreeVO;
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/api/platform/system/menu")
+@RequiredArgsConstructor
+public class PlatformSystemMenuController {
+
+    private final SystemMenuService systemMenuService;
+
+    @GetMapping("/tree")
+    public Result<List<AdminRoleMenuTreeVO>> tree() {
+        return Result.success(systemMenuService.tree());
+    }
+
+    @PostMapping("/add")
+    public Result<Void> add(@Valid @RequestBody AdminMenuSaveDTO dto) {
+        systemMenuService.add(dto);
+        return Result.success();
+    }
+
+    @PutMapping("/edit")
+    public Result<Void> edit(@Valid @RequestBody AdminMenuSaveDTO dto) {
+        systemMenuService.edit(dto);
+        return Result.success();
+    }
+
+    @DeleteMapping("/del")
+    public Result<Void> delete(@RequestParam Long id) {
+        systemMenuService.delete(id);
+        return Result.success();
+    }
+
+    @PostMapping("/setVisible")
+    public Result<Void> setVisible(@RequestParam Long id, @RequestParam int visible) {
+        systemMenuService.setVisible(id, visible);
+        return Result.success();
+    }
+
+    @PostMapping("/setStatus")
+    public Result<Void> setStatus(@RequestParam Long id, @RequestParam int status) {
+        systemMenuService.setStatus(id, status);
+        return Result.success();
+    }
+}
+package com.diligrp.rider.controller;
+
+import com.diligrp.rider.common.result.Result;
+import com.diligrp.rider.dto.AdminRoleMenuAssignDTO;
+import com.diligrp.rider.service.SystemRoleMenuService;
+import com.diligrp.rider.vo.AdminRoleMenuTreeVO;
+import com.diligrp.rider.vo.AdminRoleVO;
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/api/platform/system/role")
+@RequiredArgsConstructor
+public class PlatformSystemRoleController {
+
+    private final SystemRoleMenuService systemRoleMenuService;
+
+    @GetMapping("/list")
+    public Result<List<AdminRoleVO>> list() {
+        return Result.success(systemRoleMenuService.listRoles());
+    }
+
+    @GetMapping("/{roleId}/menu-tree")
+    public Result<List<AdminRoleMenuTreeVO>> menuTree(@PathVariable Long roleId) {
+        return Result.success(systemRoleMenuService.getRoleMenuTree(roleId));
+    }
+
+    @PostMapping("/{roleId}/menus")
+    public Result<Void> assignMenus(@PathVariable Long roleId,
+                                    @Valid @RequestBody AdminRoleMenuAssignDTO dto) {
+        systemRoleMenuService.assignMenus(roleId, dto);
+        return Result.success();
+    }
+}
@@ -104,7 +104,7 @@ public class RiderExtController {
             @RequestParam(defaultValue = "1") int page,
             HttpServletRequest request) {
         Long riderId = (Long) request.getAttribute("riderId");
-        return Result.success(evaluateService.getRiderEvaluates(riderId, type, page));
+        return Result.success(evaluateService.getRiderEvaluates(riderId, type, page, null));
     }
  
     /** 本月好评数 */
+package com.diligrp.rider.dto;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+@Data
+public class AdminMenuSaveDTO {
+    private Long id;
+
+    @NotBlank(message = "菜单编码不能为空")
+    private String code;
+
+    @NotBlank(message = "菜单名称不能为空")
+    private String name;
+
+    @NotBlank(message = "菜单类型不能为空")
+    private String type;
+
+    private String path;
+
+    private String icon;
+
+    @NotNull(message = "父级菜单不能为空")
+    private Long parentId;
+
+    @NotBlank(message = "菜单范围不能为空")
+    private String menuScope;
+
+    private Integer listOrder = 0;
+
+    private Integer visible = 1;
+
+    private Integer status = 1;
+}
+package com.diligrp.rider.dto;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+public class AdminRoleMenuAssignDTO {
+    private List<Long> menuIds = new ArrayList<>();
+}
@@ -25,5 +25,8 @@ public class AdminUser {
     /** 状态：0=禁用 1=正常 */
     private Integer userStatus;
  
+    /** 绑定菜单角色ID */
+    private Long roleId;
+
     private Long createTime;
 }
@@ -35,5 +35,8 @@ public class Substation {
     /** 状态：0=禁用 1=正常 */
     private Integer userStatus;
  
+    /** 绑定菜单角色ID */
+    private Long roleId;
+
     private Long createTime;
 }
+package com.diligrp.rider.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+@Data
+@TableName("sys_menu")
+public class SysMenu {
+
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    private String code;
+
+    private String name;
+
+    private String type;
+
+    private String path;
+
+    private String icon;
+
+    private Long parentId;
+
+    private String menuScope;
+
+    private Integer listOrder;
+
+    private Integer visible;
+
+    private Integer status;
+
+    private Long createTime;
+}
+package com.diligrp.rider.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+@Data
+@TableName("sys_role")
+public class SysRole {
+
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    private String code;
+
+    private String name;
+
+    private String roleScope;
+
+    private Integer status;
+
+    private Long createTime;
+}
+package com.diligrp.rider.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+@Data
+@TableName("sys_role_menu")
+public class SysRoleMenu {
+
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    private Long roleId;
+
+    private Long menuId;
+
+    private Long createTime;
+}
+package com.diligrp.rider.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.diligrp.rider.entity.SysMenu;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface SysMenuMapper extends BaseMapper<SysMenu> {
+}
+package com.diligrp.rider.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.diligrp.rider.entity.SysRole;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface SysRoleMapper extends BaseMapper<SysRole> {
+}
+package com.diligrp.rider.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.diligrp.rider.entity.SysRoleMenu;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface SysRoleMenuMapper extends BaseMapper<SysRoleMenu> {
+}
+package com.diligrp.rider.service;
+
+import com.diligrp.rider.entity.SysRole;
+import com.diligrp.rider.vo.AdminMenuVO;
+
+import java.util.List;
+
+public interface AdminMenuService {
+    SysRole resolveRole(Long roleId, String roleType);
+
+    List<AdminMenuVO> getMenus(SysRole role, String roleType);
+
+    String resolveHomePath(List<AdminMenuVO> menus);
+}
@@ -14,15 +14,15 @@ public interface AdminRiderService {
     /** 指派候选骑手列表 */
     List<Rider> designateCandidates(Long orderId, Long cityId);
     /** 审核骑手（通过/拒绝） */
-    void setStatus(Long riderId, int status);
+    void setStatus(Long riderId, int status, Long cityId);
     /** 设置骑手等级，为空则使用默认等级 */
     void setLevel(Long riderId, Long levelId, Long cityId);
     /** 启用/禁用骑手账号 */
-    void setEnableStatus(Long riderId, int status);
+    void setEnableStatus(Long riderId, int status, Long cityId);
     /** 切换全职/兼职 */
-    void setType(Long riderId, int type);
+    void setType(Long riderId, int type, Long cityId);
     /** 指派骑手接单 */
-    void designate(Long orderId, Long riderId);
+    void designate(Long orderId, Long riderId, Long cityId);
     /** 处理转单申请（1=通过 3=拒绝） */
-    void setTrans(Long orderId, int trans);
+    void setTrans(Long orderId, int trans, Long cityId);
 }
+package com.diligrp.rider.service;
+
+import com.diligrp.rider.entity.AdminUser;
+
+import java.util.List;
+
+public interface AdminUserManageService {
+    List<AdminUser> list(String keyword);
+
+    void add(AdminUser adminUser);
+
+    void edit(AdminUser adminUser);
+
+    void ban(Long id);
+
+    void cancelBan(Long id);
+
+    void del(Long id);
+
+    void changePassword(Long id, String oldPassword, String newPassword);
+}
+package com.diligrp.rider.service;
+
+public interface MenuBootstrapService {
+    void initializeDefaults();
+}
@@ -11,7 +11,7 @@ public interface RefundService {
     /** 用户/骑手申请退款 */
     void applyRefund(Long orderId, Long uid, int role, Long reasonId, String reason);
     /** 分站审核退款：status=1通过 2拒绝 */
-    void handleRefund(Long recordId, int status, String remark);
+    void handleRefund(Long recordId, int status, String remark, Long cityId);
     /** 查询订单退款记录 */
-    OrderRefundRecord getByOrderId(Long orderId);
+    OrderRefundRecord getByOrderId(Long orderId, Long cityId);
 }
@@ -8,7 +8,7 @@ public interface RiderEvaluateService {
     /** 用户对骑手评价（订单完成后） */
     void evaluate(Long uid, Long orderId, int star, String content);
     /** 骑手评价列表 */
-    List<RiderEvaluate> getRiderEvaluates(Long riderId, Integer type, int page);
+    List<RiderEvaluate> getRiderEvaluates(Long riderId, Integer type, int page, Long cityId);
     /** 本月好评数 */
     int getMonthGoodCount(Long riderId);
 }
+package com.diligrp.rider.service;
+
+import com.diligrp.rider.entity.SysRole;
+
+public interface RoleScopeGuardService {
+    SysRole requireRole(Long roleId, String requiredScope);
+}
@@ -19,6 +19,6 @@ public interface SubstationService {
     void del(Long id);
     /** 根据城市ID获取分站管理员 */
     Substation getByCityId(Long cityId);
-    /** 分站管理员修改自己的密码 */
+    /** 重置目标分站管理员密码 */
     void changePassword(Long substationId, String oldPassword, String newPassword);
 }
+package com.diligrp.rider.service;
+
+import com.diligrp.rider.dto.AdminMenuSaveDTO;
+import com.diligrp.rider.vo.AdminRoleMenuTreeVO;
+
+import java.util.List;
+
+public interface SystemMenuService {
+    List<AdminRoleMenuTreeVO> tree();
+
+    void add(AdminMenuSaveDTO dto);
+
+    void edit(AdminMenuSaveDTO dto);
+
+    void delete(Long id);
+
+    void setVisible(Long id, int visible);
+
+    void setStatus(Long id, int status);
+}
+package com.diligrp.rider.service;
+
+import com.diligrp.rider.dto.AdminRoleMenuAssignDTO;
+import com.diligrp.rider.vo.AdminRoleMenuTreeVO;
+import com.diligrp.rider.vo.AdminRoleVO;
+
+import java.util.List;
+
+public interface SystemRoleMenuService {
+    List<AdminRoleVO> listRoles();
+
+    List<AdminRoleMenuTreeVO> getRoleMenuTree(Long roleId);
+
+    void assignMenus(Long roleId, AdminRoleMenuAssignDTO dto);
+}
@@ -5,22 +5,34 @@ import com.diligrp.rider.common.exception.BizException;
 import com.diligrp.rider.config.JwtUtil;
 import com.diligrp.rider.dto.AdminLoginDTO;
 import com.diligrp.rider.entity.AdminUser;
+import com.diligrp.rider.entity.City;
 import com.diligrp.rider.entity.Substation;
+import com.diligrp.rider.entity.SysRole;
 import com.diligrp.rider.mapper.AdminUserMapper;
+import com.diligrp.rider.mapper.CityMapper;
 import com.diligrp.rider.mapper.SubstationMapper;
+import com.diligrp.rider.service.AdminMenuService;
+import com.diligrp.rider.vo.AdminLoginUserVO;
 import com.diligrp.rider.vo.AdminLoginVO;
+import com.diligrp.rider.vo.AdminMenuVO;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.util.DigestUtils;
  
 import java.nio.charset.StandardCharsets;
+import java.util.List;
  
 @Service
 @RequiredArgsConstructor
 public class AdminAuthServiceImpl {
  
+    private static final String ROLE_TYPE_ADMIN = "admin";
+    private static final String ROLE_TYPE_SUBSTATION = "substation";
+
     private final AdminUserMapper adminUserMapper;
     private final SubstationMapper substationMapper;
+    private final CityMapper cityMapper;
+    private final AdminMenuService adminMenuService;
     private final JwtUtil jwtUtil;
  
     /**
@@ -29,7 +41,7 @@ public class AdminAuthServiceImpl {
      * role=substation：分站管理员登录（substation表）
      */
     public AdminLoginVO login(AdminLoginDTO dto) {
-        if ("admin".equals(dto.getRole())) {
+        if (ROLE_TYPE_ADMIN.equals(dto.getRole())) {
             return loginAdmin(dto.getAccount(), dto.getPass());
         }
         return loginSubstation(dto.getAccount(), dto.getPass());
@@ -42,12 +54,22 @@ public class AdminAuthServiceImpl {
         if (!encryptPass(pass).equals(user.getUserPass())) throw new BizException("密码错误");
         if (user.getUserStatus() == null || user.getUserStatus() == 0) throw new BizException("账号已被禁用");
  
+        SysRole role = adminMenuService.resolveRole(user.getRoleId(), ROLE_TYPE_ADMIN);
+        List<AdminMenuVO> menus = adminMenuService.getMenus(role, ROLE_TYPE_ADMIN);
+
+        AdminLoginUserVO loginUser = new AdminLoginUserVO();
+        loginUser.setId(user.getId());
+        loginUser.setUserLogin(user.getUserLogin());
+        loginUser.setUserNickname(user.getUserNickname());
+        loginUser.setRole(ROLE_TYPE_ADMIN);
+        loginUser.setRoleType(ROLE_TYPE_ADMIN);
+        loginUser.setRoleCode(role.getCode());
+
         AdminLoginVO vo = new AdminLoginVO();
-        vo.setId(user.getId());
-        vo.setUserLogin(user.getUserLogin());
-        vo.setUserNickname(user.getUserNickname());
-        vo.setRole("admin");
-        vo.setToken(jwtUtil.generateAdminToken(user.getId(), "admin"));
+        vo.setToken(jwtUtil.generateAdminToken(user.getId(), ROLE_TYPE_ADMIN));
+        vo.setUser(loginUser);
+        vo.setMenus(menus);
+        vo.setHomePath(adminMenuService.resolveHomePath(menus));
         return vo;
     }
  
@@ -57,14 +79,27 @@ public class AdminAuthServiceImpl {
         if (sub == null) throw new BizException("账号不存在");
         if (!encryptPass(pass).equals(sub.getUserPass())) throw new BizException("密码错误");
         if (sub.getUserStatus() == null || sub.getUserStatus() == 0) throw new BizException("账号已被禁用");
+        if (sub.getCityId() == null || sub.getCityId() < 1) throw new BizException("当前分站账号未绑定有效城市");
+
+        SysRole role = adminMenuService.resolveRole(sub.getRoleId(), ROLE_TYPE_SUBSTATION);
+        List<AdminMenuVO> menus = adminMenuService.getMenus(role, ROLE_TYPE_SUBSTATION);
+        City city = cityMapper.selectById(sub.getCityId());
+
+        AdminLoginUserVO loginUser = new AdminLoginUserVO();
+        loginUser.setId(sub.getId());
+        loginUser.setUserLogin(sub.getUserLogin());
+        loginUser.setUserNickname(sub.getUserNickname());
+        loginUser.setRole(ROLE_TYPE_SUBSTATION);
+        loginUser.setRoleType(ROLE_TYPE_SUBSTATION);
+        loginUser.setRoleCode(role.getCode());
+        loginUser.setCityId(sub.getCityId());
+        loginUser.setCityName(city != null ? city.getName() : null);
  
         AdminLoginVO vo = new AdminLoginVO();
-        vo.setId(sub.getId());
-        vo.setUserLogin(sub.getUserLogin());
-        vo.setUserNickname(sub.getUserNickname());
-        vo.setRole("substation");
-        vo.setCityId(sub.getCityId());
-        vo.setToken(jwtUtil.generateAdminToken(sub.getId(), "substation"));
+        vo.setToken(jwtUtil.generateAdminToken(sub.getId(), ROLE_TYPE_SUBSTATION));
+        vo.setUser(loginUser);
+        vo.setMenus(menus);
+        vo.setHomePath(adminMenuService.resolveHomePath(menus));
         return vo;
     }
  
+package com.diligrp.rider.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.diligrp.rider.common.enums.AdminRoleScopeEnum;
+import com.diligrp.rider.common.enums.MenuScopeEnum;
+import com.diligrp.rider.common.exception.BizException;
+import com.diligrp.rider.entity.SysMenu;
+import com.diligrp.rider.entity.SysRole;
+import com.diligrp.rider.entity.SysRoleMenu;
+import com.diligrp.rider.mapper.SysMenuMapper;
+import com.diligrp.rider.mapper.SysRoleMapper;
+import com.diligrp.rider.mapper.SysRoleMenuMapper;
+import com.diligrp.rider.service.AdminMenuService;
+import com.diligrp.rider.vo.AdminMenuVO;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+@Service
+@RequiredArgsConstructor
+public class AdminMenuServiceImpl implements AdminMenuService {
+
+    private static final String ROLE_TYPE_ADMIN = "admin";
+    private static final String ROLE_TYPE_SUBSTATION = "substation";
+    private static final String ROLE_CODE_PLATFORM = "platform_admin";
+    private static final String ROLE_CODE_SUBSTATION = "substation_admin";
+
+    private final SysRoleMapper sysRoleMapper;
+    private final SysMenuMapper sysMenuMapper;
+    private final SysRoleMenuMapper sysRoleMenuMapper;
+
+    @Override
+    public SysRole resolveRole(Long roleId, String roleType) {
+        String fallbackCode = ROLE_TYPE_ADMIN.equals(roleType) ? ROLE_CODE_PLATFORM : ROLE_CODE_SUBSTATION;
+        String requiredScope = ROLE_TYPE_ADMIN.equals(roleType)
+                ? AdminRoleScopeEnum.PLATFORM.name()
+                : AdminRoleScopeEnum.SUBSTATION.name();
+
+        SysRole role = null;
+        if (roleId != null && roleId > 0) {
+            role = sysRoleMapper.selectById(roleId);
+        }
+        if (role == null) {
+            role = sysRoleMapper.selectOne(new LambdaQueryWrapper<SysRole>()
+                    .eq(SysRole::getCode, fallbackCode)
+                    .eq(SysRole::getStatus, 1)
+                    .last("LIMIT 1"));
+        }
+        if (role == null || role.getStatus() == null || role.getStatus() != 1) {
+            throw new BizException("当前账号未分配有效菜单角色");
+        }
+        if (!requiredScope.equals(role.getRoleScope())) {
+            throw new BizException("当前账号角色归属不匹配");
+        }
+        return role;
+    }
+
+    @Override
+    public List<AdminMenuVO> getMenus(SysRole role, String roleType) {
+        List<SysRoleMenu> roleMenus = sysRoleMenuMapper.selectList(new LambdaQueryWrapper<SysRoleMenu>()
+                .eq(SysRoleMenu::getRoleId, role.getId()));
+        if (roleMenus.isEmpty()) {
+            return List.of();
+        }
+
+        List<SysMenu> allMenus = sysMenuMapper.selectList(new LambdaQueryWrapper<SysMenu>()
+                .eq(SysMenu::getStatus, 1)
+                .eq(SysMenu::getVisible, 1)
+                .orderByAsc(SysMenu::getListOrder)
+                .orderByAsc(SysMenu::getId));
+        if (allMenus.isEmpty()) {
+            return List.of();
+        }
+
+        Map<Long, SysMenu> menuMap = new LinkedHashMap<>();
+        for (SysMenu menu : allMenus) {
+            if (isScopeAllowed(menu.getMenuScope(), roleType)) {
+                menuMap.put(menu.getId(), menu);
+            }
+        }
+        if (menuMap.isEmpty()) {
+            return List.of();
+        }
+
+        Set<Long> includedIds = new LinkedHashSet<>();
+        for (SysRoleMenu roleMenu : roleMenus) {
+            includeWithParents(roleMenu.getMenuId(), menuMap, includedIds);
+        }
+
+        Map<Long, AdminMenuVO> voMap = new LinkedHashMap<>();
+        List<AdminMenuVO> roots = new ArrayList<>();
+        for (SysMenu menu : allMenus) {
+            if (!includedIds.contains(menu.getId())) {
+                continue;
+            }
+            AdminMenuVO vo = toVO(menu);
+            voMap.put(menu.getId(), vo);
+            Long parentId = menu.getParentId() == null ? 0L : menu.getParentId();
+            if (parentId > 0 && voMap.containsKey(parentId)) {
+                voMap.get(parentId).getChildren().add(vo);
+            } else {
+                roots.add(vo);
+            }
+        }
+        return roots;
+    }
+
+    @Override
+    public String resolveHomePath(List<AdminMenuVO> menus) {
+        String homePath = findPathByCode(menus, "dashboard");
+        if (homePath != null && !homePath.isBlank()) {
+            return homePath;
+        }
+        String firstPath = findFirstPath(menus);
+        return firstPath == null || firstPath.isBlank() ? "/dashboard" : firstPath;
+    }
+
+    private void includeWithParents(Long menuId, Map<Long, SysMenu> menuMap, Set<Long> includedIds) {
+        SysMenu current = menuMap.get(menuId);
+        while (current != null && includedIds.add(current.getId())) {
+            Long parentId = current.getParentId();
+            if (parentId == null || parentId < 1) {
+                break;
+            }
+            current = menuMap.get(parentId);
+        }
+    }
+
+    private boolean isScopeAllowed(String menuScope, String roleType) {
+        if (MenuScopeEnum.BOTH.name().equals(menuScope)) {
+            return true;
+        }
+        if (ROLE_TYPE_ADMIN.equals(roleType)) {
+            return MenuScopeEnum.PLATFORM.name().equals(menuScope);
+        }
+        if (ROLE_TYPE_SUBSTATION.equals(roleType)) {
+            return MenuScopeEnum.SUBSTATION.name().equals(menuScope);
+        }
+        return false;
+    }
+
+    private AdminMenuVO toVO(SysMenu menu) {
+        AdminMenuVO vo = new AdminMenuVO();
+        vo.setId(menu.getId());
+        vo.setCode(menu.getCode());
+        vo.setName(menu.getName());
+        vo.setType(menu.getType());
+        vo.setPath(menu.getPath());
+        vo.setIcon(menu.getIcon());
+        return vo;
+    }
+
+    private String findPathByCode(List<AdminMenuVO> menus, String code) {
+        for (AdminMenuVO menu : menus) {
+            if (code.equals(menu.getCode()) && menu.getPath() != null && !menu.getPath().isBlank()) {
+                return menu.getPath();
+            }
+            String nested = findPathByCode(menu.getChildren(), code);
+            if (nested != null) {
+                return nested;
+            }
+        }
+        return null;
+    }
+
+    private String findFirstPath(List<AdminMenuVO> menus) {
+        for (AdminMenuVO menu : menus) {
+            if (menu.getPath() != null && !menu.getPath().isBlank()) {
+                return menu.getPath();
+            }
+            String nested = findFirstPath(menu.getChildren());
+            if (nested != null) {
+                return nested;
+            }
+        }
+        return null;
+    }
+}
@@ -2,6 +2,7 @@ package com.diligrp.rider.service.impl;
  
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.diligrp.rider.common.auth.AdminScopeGuard;
 import com.diligrp.rider.common.exception.BizException;
 import com.diligrp.rider.dto.AdminRiderAddDTO;
 import com.diligrp.rider.entity.Orders;
@@ -35,6 +36,7 @@ public class AdminRiderServiceImpl implements AdminRiderService {
     private final RiderLevelMapper riderLevelMapper;
     private final OrdersMapper ordersMapper;
     private final RiderBalanceMapper balanceMapper;
+    private final AdminScopeGuard adminScopeGuard;
  
     @Override
     public void add(AdminRiderAddDTO dto, Long cityId) {
@@ -107,9 +109,10 @@ public class AdminRiderServiceImpl implements AdminRiderService {
     }
  
     @Override
-    public void setStatus(Long riderId, int status) {
+    public void setStatus(Long riderId, int status, Long cityId) {
         Rider rider = riderMapper.selectById(riderId);
         if (rider == null) throw new BizException("骑手不存在");
+        adminScopeGuard.assertCityAccessible(cityId, rider.getCityId());
         riderMapper.update(null, new LambdaUpdateWrapper<Rider>()
                 .eq(Rider::getId, riderId)
                 .set(Rider::getUserStatus, status));
@@ -135,9 +138,10 @@ public class AdminRiderServiceImpl implements AdminRiderService {
     }
  
     @Override
-    public void setEnableStatus(Long riderId, int status) {
+    public void setEnableStatus(Long riderId, int status, Long cityId) {
         Rider rider = riderMapper.selectById(riderId);
         if (rider == null) throw new BizException("骑手不存在");
+        adminScopeGuard.assertCityAccessible(cityId, rider.getCityId());
         riderMapper.update(null, new LambdaUpdateWrapper<Rider>()
                 .eq(Rider::getId, riderId)
                 .set(Rider::getStatus, status));
@@ -145,9 +149,10 @@ public class AdminRiderServiceImpl implements AdminRiderService {
  
     @Override
     @Transactional
-    public void setType(Long riderId, int type) {
+    public void setType(Long riderId, int type, Long cityId) {
         Rider rider = riderMapper.selectById(riderId);
         if (rider == null) throw new BizException("骑手不存在");
+        adminScopeGuard.assertCityAccessible(cityId, rider.getCityId());
         if (type == 2) {
             if (rider.getBalance() != null && rider.getBalance().compareTo(BigDecimal.ZERO) > 0) {
                 throw new BizException("变更为全职前要保证余额为0");
@@ -164,9 +169,15 @@ public class AdminRiderServiceImpl implements AdminRiderService {
  
     @Override
     @Transactional
-    public void designate(Long orderId, Long riderId) {
+    public void designate(Long orderId, Long riderId, Long cityId) {
         Orders order = ordersMapper.selectById(orderId);
         if (order == null) throw new BizException("订单不存在");
+        adminScopeGuard.assertCityAccessible(cityId, order.getCityId());
+        Rider rider = riderMapper.selectById(riderId);
+        if (rider == null) throw new BizException("骑手不存在");
+        if (!order.getCityId().equals(rider.getCityId())) {
+            throw new BizException("骑手与订单城市不匹配");
+        }
         if (order.getStatus() == 1) throw new BizException("订单未支付，无法指派");
         if (order.getStatus() == 10) throw new BizException("订单已取消，无法指派");
         if (order.getStatus() != 2) throw new BizException("订单已服务中，无法指派");
@@ -191,9 +202,10 @@ public class AdminRiderServiceImpl implements AdminRiderService {
  
     @Override
     @Transactional
-    public void setTrans(Long orderId, int trans) {
+    public void setTrans(Long orderId, int trans, Long cityId) {
         Orders order = ordersMapper.selectById(orderId);
         if (order == null) throw new BizException("订单不存在");
+        adminScopeGuard.assertCityAccessible(cityId, order.getCityId());
         if (order.getStatus() != 4) throw new BizException("订单状态错误，无法操作");
         if (order.getIsTrans() != 2) throw new BizException("订单未申请转单，无法操作");
  
+package com.diligrp.rider.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.diligrp.rider.common.enums.AdminRoleScopeEnum;
+import com.diligrp.rider.common.exception.BizException;
+import com.diligrp.rider.entity.AdminUser;
+import com.diligrp.rider.mapper.AdminUserMapper;
+import com.diligrp.rider.service.AdminUserManageService;
+import com.diligrp.rider.service.RoleScopeGuardService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.util.DigestUtils;
+
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+
+@Service
+@RequiredArgsConstructor
+public class AdminUserManageServiceImpl implements AdminUserManageService {
+
+    private final AdminUserMapper adminUserMapper;
+    private final RoleScopeGuardService roleScopeGuardService;
+
+    @Override
+    public List<AdminUser> list(String keyword) {
+        LambdaQueryWrapper<AdminUser> wrapper = new LambdaQueryWrapper<AdminUser>()
+                .orderByDesc(AdminUser::getId);
+        if (keyword != null && !keyword.isBlank()) {
+            wrapper.like(AdminUser::getUserLogin, keyword)
+                    .or().like(AdminUser::getUserNickname, keyword);
+        }
+        return adminUserMapper.selectList(wrapper);
+    }
+
+    @Override
+    public void add(AdminUser adminUser) {
+        Long exists = adminUserMapper.selectCount(new LambdaQueryWrapper<AdminUser>()
+                .eq(AdminUser::getUserLogin, adminUser.getUserLogin()));
+        if (exists > 0) {
+            throw new BizException("账号已存在，请更换");
+        }
+        roleScopeGuardService.requireRole(adminUser.getRoleId(), AdminRoleScopeEnum.PLATFORM.name());
+        adminUser.setUserPass(encryptPass(adminUser.getUserPass()));
+        adminUser.setUserStatus(1);
+        adminUser.setCreateTime(System.currentTimeMillis() / 1000);
+        adminUserMapper.insert(adminUser);
+    }
+
+    @Override
+    public void edit(AdminUser adminUser) {
+        AdminUser existing = adminUserMapper.selectById(adminUser.getId());
+        if (existing == null) {
+            throw new BizException("平台账号不存在");
+        }
+        roleScopeGuardService.requireRole(adminUser.getRoleId(), AdminRoleScopeEnum.PLATFORM.name());
+        if (adminUser.getUserPass() == null || adminUser.getUserPass().isBlank()) {
+            adminUser.setUserPass(null);
+        } else {
+            adminUser.setUserPass(encryptPass(adminUser.getUserPass()));
+        }
+        adminUserMapper.updateById(adminUser);
+    }
+
+    @Override
+    public void ban(Long id) {
+        adminUserMapper.update(null, new LambdaUpdateWrapper<AdminUser>()
+                .eq(AdminUser::getId, id)
+                .set(AdminUser::getUserStatus, 0));
+    }
+
+    @Override
+    public void cancelBan(Long id) {
+        adminUserMapper.update(null, new LambdaUpdateWrapper<AdminUser>()
+                .eq(AdminUser::getId, id)
+                .set(AdminUser::getUserStatus, 1));
+    }
+
+    @Override
+    public void del(Long id) {
+        adminUserMapper.deleteById(id);
+    }
+
+    @Override
+    public void changePassword(Long id, String oldPassword, String newPassword) {
+        AdminUser user = adminUserMapper.selectById(id);
+        if (user == null) {
+            throw new BizException("平台账号不存在");
+        }
+        if (!encryptPass(oldPassword).equals(user.getUserPass())) {
+            throw new BizException("原密码不正确");
+        }
+        if (encryptPass(newPassword).equals(user.getUserPass())) {
+            throw new BizException("新密码不能与原密码相同");
+        }
+        adminUserMapper.update(null, new LambdaUpdateWrapper<AdminUser>()
+                .eq(AdminUser::getId, id)
+                .set(AdminUser::getUserPass, encryptPass(newPassword)));
+    }
+
+    private String encryptPass(String pass) {
+        return DigestUtils.md5DigestAsHex(pass.getBytes(StandardCharsets.UTF_8));
+    }
+}
+package com.diligrp.rider.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.diligrp.rider.common.enums.AdminRoleScopeEnum;
+import com.diligrp.rider.common.enums.MenuScopeEnum;
+import com.diligrp.rider.entity.SysMenu;
+import com.diligrp.rider.entity.SysRole;
+import com.diligrp.rider.entity.SysRoleMenu;
+import com.diligrp.rider.mapper.SysMenuMapper;
+import com.diligrp.rider.mapper.SysRoleMapper;
+import com.diligrp.rider.mapper.SysRoleMenuMapper;
+import com.diligrp.rider.service.MenuBootstrapService;
+import jakarta.annotation.PostConstruct;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+@Service
+@RequiredArgsConstructor
+public class MenuBootstrapServiceImpl implements MenuBootstrapService {
+
+    private final SysRoleMapper sysRoleMapper;
+    private final SysMenuMapper sysMenuMapper;
+    private final SysRoleMenuMapper sysRoleMenuMapper;
+
+    @PostConstruct
+    @Override
+    public void initializeDefaults() {
+        SysRole platformRole = ensureRole("platform_admin", "平台管理员", AdminRoleScopeEnum.PLATFORM.name());
+        SysRole substationRole = ensureRole("substation_admin", "分站管理员", AdminRoleScopeEnum.SUBSTATION.name());
+
+        List<SysMenu> seededMenus = seedMenus();
+        bindMenus(platformRole, seededMenus, MenuScopeEnum.PLATFORM, MenuScopeEnum.BOTH);
+        bindMenus(substationRole, seededMenus, MenuScopeEnum.SUBSTATION, MenuScopeEnum.BOTH);
+    }
+
+    private SysRole ensureRole(String code, String name, String scope) {
+        SysRole role = sysRoleMapper.selectOne(new LambdaQueryWrapper<SysRole>()
+                .eq(SysRole::getCode, code)
+                .last("LIMIT 1"));
+        if (role != null) {
+            return role;
+        }
+        role = new SysRole();
+        role.setCode(code);
+        role.setName(name);
+        role.setRoleScope(scope);
+        role.setStatus(1);
+        role.setCreateTime(System.currentTimeMillis() / 1000);
+        sysRoleMapper.insert(role);
+        return role;
+    }
+
+    private List<SysMenu> seedMenus() {
+        List<SysMenu> defaults = new ArrayList<>();
+        defaults.add(menu("dashboard", "工作台", "MENU", "/dashboard", "HomeOutlined", 0L, MenuScopeEnum.BOTH, 10));
+        defaults.add(menu("city.manage", "租户管理", "MENU", "/city", "GlobalOutlined", 0L, MenuScopeEnum.PLATFORM, 20));
+        defaults.add(menu("substation.manage", "分站管理", "MENU", "/substation", "ApartmentOutlined", 0L, MenuScopeEnum.PLATFORM, 30));
+        defaults.add(menu("merchant.root", "商家管理", "DIR", "", "ShopOutlined", 0L, MenuScopeEnum.PLATFORM, 40));
+        defaults.add(menu("merchant.enter", "入驻申请", "MENU", "/merchant/enter", "", 0L, MenuScopeEnum.PLATFORM, 41));
+        defaults.add(menu("merchant.store", "店铺管理", "MENU", "/merchant/store", "", 0L, MenuScopeEnum.PLATFORM, 42));
+        defaults.add(menu("rider.list", "骑手管理", "MENU", "/rider", "UserOutlined", 0L, MenuScopeEnum.BOTH, 50));
+        defaults.add(menu("rider.evaluate", "骑手评价", "MENU", "/rider/evaluate", "StarOutlined", 0L, MenuScopeEnum.BOTH, 60));
+        defaults.add(menu("order.root", "订单管理", "DIR", "", "UnorderedListOutlined", 0L, MenuScopeEnum.BOTH, 70));
+        defaults.add(menu("order.list", "订单列表", "MENU", "/order", "", 0L, MenuScopeEnum.BOTH, 71));
+        defaults.add(menu("order.refund", "退款管理", "MENU", "/refund", "", 0L, MenuScopeEnum.BOTH, 72));
+        defaults.add(menu("order.delivery", "配送订单", "MENU", "/delivery/order", "", 0L, MenuScopeEnum.BOTH, 73));
+        defaults.add(menu("config.root", "配置中心", "DIR", "", "ControlOutlined", 0L, MenuScopeEnum.BOTH, 80));
+        defaults.add(menu("fee.plan", "配送费配置", "MENU", "/config/fee-plan", "", 0L, MenuScopeEnum.BOTH, 81));
+        defaults.add(menu("dispatch.rule", "调度配置", "MENU", "/dispatch/rule", "", 0L, MenuScopeEnum.BOTH, 82));
+        defaults.add(menu("open.root", "开放平台", "DIR", "", "ApiOutlined", 0L, MenuScopeEnum.PLATFORM, 90));
+        defaults.add(menu("open.app", "应用管理", "MENU", "/open", "", 0L, MenuScopeEnum.PLATFORM, 91));
+        defaults.add(menu("open.mock_delivery", "模拟推单", "MENU", "/open/mock-delivery", "", 0L, MenuScopeEnum.PLATFORM, 92));
+        defaults.add(menu("system.root", "系统管理", "DIR", "", "ControlOutlined", 0L, MenuScopeEnum.PLATFORM, 100));
+        defaults.add(menu("system.menu", "菜单管理", "MENU", "/system/menu", "", 0L, MenuScopeEnum.PLATFORM, 101));
+        defaults.add(menu("system.role_menu", "角色菜单", "MENU", "/system/role-menu", "", 0L, MenuScopeEnum.PLATFORM, 102));
+        defaults.add(menu("admin.user", "平台账号", "MENU", "/admin-user", "", 0L, MenuScopeEnum.PLATFORM, 103));
+
+        Map<String, SysMenu> persisted = new LinkedHashMap<>();
+        for (SysMenu menu : defaults) {
+            SysMenu existing = sysMenuMapper.selectOne(new LambdaQueryWrapper<SysMenu>()
+                    .eq(SysMenu::getCode, menu.getCode())
+                    .last("LIMIT 1"));
+            if (existing == null) {
+                menu.setCreateTime(System.currentTimeMillis() / 1000);
+                sysMenuMapper.insert(menu);
+                existing = menu;
+            }
+            persisted.put(existing.getCode(), existing);
+        }
+
+        persisted.get("merchant.enter").setParentId(persisted.get("merchant.root").getId());
+        persisted.get("merchant.store").setParentId(persisted.get("merchant.root").getId());
+        persisted.get("order.list").setParentId(persisted.get("order.root").getId());
+        persisted.get("order.refund").setParentId(persisted.get("order.root").getId());
+        persisted.get("order.delivery").setParentId(persisted.get("order.root").getId());
+        persisted.get("fee.plan").setParentId(persisted.get("config.root").getId());
+        persisted.get("dispatch.rule").setParentId(persisted.get("config.root").getId());
+        persisted.get("open.app").setParentId(persisted.get("open.root").getId());
+        persisted.get("open.mock_delivery").setParentId(persisted.get("open.root").getId());
+        persisted.get("system.menu").setParentId(persisted.get("system.root").getId());
+        persisted.get("system.role_menu").setParentId(persisted.get("system.root").getId());
+        persisted.get("admin.user").setParentId(persisted.get("system.root").getId());
+
+        for (SysMenu menu : persisted.values()) {
+            sysMenuMapper.updateById(menu);
+        }
+        return new ArrayList<>(persisted.values());
+    }
+
+    private void bindMenus(SysRole role, List<SysMenu> menus, MenuScopeEnum primaryScope, MenuScopeEnum commonScope) {
+        for (SysMenu menu : menus) {
+            if (!primaryScope.name().equals(menu.getMenuScope()) && !commonScope.name().equals(menu.getMenuScope())) {
+                continue;
+            }
+            Long exists = sysRoleMenuMapper.selectCount(new LambdaQueryWrapper<SysRoleMenu>()
+                    .eq(SysRoleMenu::getRoleId, role.getId())
+                    .eq(SysRoleMenu::getMenuId, menu.getId()));
+            if (exists > 0) {
+                continue;
+            }
+            SysRoleMenu roleMenu = new SysRoleMenu();
+            roleMenu.setRoleId(role.getId());
+            roleMenu.setMenuId(menu.getId());
+            roleMenu.setCreateTime(System.currentTimeMillis() / 1000);
+            sysRoleMenuMapper.insert(roleMenu);
+        }
+    }
+
+    private SysMenu menu(String code, String name, String type, String path, String icon,
+                         Long parentId, MenuScopeEnum scope, int sort) {
+        SysMenu menu = new SysMenu();
+        menu.setCode(code);
+        menu.setName(name);
+        menu.setType(type);
+        menu.setPath(path);
+        menu.setIcon(icon);
+        menu.setParentId(parentId);
+        menu.setMenuScope(scope.name());
+        menu.setListOrder(sort);
+        menu.setVisible(1);
+        menu.setStatus(1);
+        return menu;
+    }
+}
@@ -2,6 +2,7 @@ package com.diligrp.rider.service.impl;
  
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.diligrp.rider.common.auth.AdminScopeGuard;
 import com.diligrp.rider.common.exception.BizException;
 import com.diligrp.rider.entity.OrderRefundReason;
 import com.diligrp.rider.entity.OrderRefundRecord;
@@ -33,6 +34,7 @@ public class RefundServiceImpl implements RefundService {
     private final OrdersMapper ordersMapper;
     private final WebhookService webhookService;
     private final ObjectMapper objectMapper;
+    private final AdminScopeGuard adminScopeGuard;
  
     @Override
     public List<OrderRefundReason> getReasons(int role) {
@@ -88,11 +90,16 @@ public class RefundServiceImpl implements RefundService {
  
     @Override
     @Transactional
-    public void handleRefund(Long recordId, int status, String remark) {
+    public void handleRefund(Long recordId, int status, String remark, Long cityId) {
         OrderRefundRecord record = recordMapper.selectById(recordId);
         if (record == null) throw new BizException("退款记录不存在");
         if (record.getStatus() != 0) throw new BizException("该退款申请已处理");
  
+        Orders order = ordersMapper.selectById(record.getOid());
+        if (order != null) {
+            adminScopeGuard.assertCityAccessible(cityId, order.getCityId());
+        }
+
         long now = System.currentTimeMillis() / 1000;
         recordMapper.update(null, new LambdaUpdateWrapper<OrderRefundRecord>()
                 .eq(OrderRefundRecord::getId, recordId)
@@ -100,7 +107,7 @@ public class RefundServiceImpl implements RefundService {
                 .set(OrderRefundRecord::getRemark, remark)
                 .set(OrderRefundRecord::getHandleTime, now));
  
-        Orders order = ordersMapper.selectById(record.getOid());
+        order = ordersMapper.selectById(record.getOid());
         if (order == null) return;
  
         if (status == 1) {
@@ -119,7 +126,12 @@ public class RefundServiceImpl implements RefundService {
     }
  
     @Override
-    public OrderRefundRecord getByOrderId(Long orderId) {
+    public OrderRefundRecord getByOrderId(Long orderId, Long cityId) {
+        Orders order = ordersMapper.selectById(orderId);
+        if (order == null) {
+            return null;
+        }
+        adminScopeGuard.assertCityAccessible(cityId, order.getCityId());
         return recordMapper.selectOne(new LambdaQueryWrapper<OrderRefundRecord>()
                 .eq(OrderRefundRecord::getOid, orderId)
                 .orderByDesc(OrderRefundRecord::getId)
@@ -2,6 +2,7 @@ package com.diligrp.rider.service.impl;
  
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.diligrp.rider.common.auth.AdminScopeGuard;
 import com.diligrp.rider.common.exception.BizException;
 import com.diligrp.rider.entity.Orders;
 import com.diligrp.rider.entity.RiderEvaluate;
@@ -25,6 +26,7 @@ public class RiderEvaluateServiceImpl implements RiderEvaluateService {
     private final RiderEvaluateMapper evaluateMapper;
     private final OrdersMapper ordersMapper;
     private final RiderMapper riderMapper;
+    private final AdminScopeGuard adminScopeGuard;
  
     private static final int PAGE_SIZE = 20;
  
@@ -68,7 +70,12 @@ public class RiderEvaluateServiceImpl implements RiderEvaluateService {
     }
  
     @Override
-    public List<RiderEvaluate> getRiderEvaluates(Long riderId, Integer type, int page) {
+    public List<RiderEvaluate> getRiderEvaluates(Long riderId, Integer type, int page, Long cityId) {
+        Rider rider = riderMapper.selectById(riderId);
+        if (rider == null) {
+            throw new BizException("骑手不存在");
+        }
+        adminScopeGuard.assertCityAccessible(cityId, rider.getCityId());
         LambdaQueryWrapper<RiderEvaluate> wrapper = new LambdaQueryWrapper<RiderEvaluate>()
                 .eq(RiderEvaluate::getRid, riderId)
                 .orderByDesc(RiderEvaluate::getId);
+package com.diligrp.rider.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.diligrp.rider.common.exception.BizException;
+import com.diligrp.rider.entity.SysRole;
+import com.diligrp.rider.mapper.SysRoleMapper;
+import com.diligrp.rider.service.RoleScopeGuardService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+@Service
+@RequiredArgsConstructor
+public class RoleScopeGuardServiceImpl implements RoleScopeGuardService {
+
+    private final SysRoleMapper sysRoleMapper;
+
+    @Override
+    public SysRole requireRole(Long roleId, String requiredScope) {
+        if (roleId == null || roleId < 1) {
+            throw new BizException("角色不能为空");
+        }
+        SysRole role = sysRoleMapper.selectOne(new LambdaQueryWrapper<SysRole>()
+                .eq(SysRole::getId, roleId)
+                .eq(SysRole::getStatus, 1)
+                .last("LIMIT 1"));
+        if (role == null) {
+            throw new BizException("角色不存在或已禁用");
+        }
+        if (!requiredScope.equals(role.getRoleScope())) {
+            throw new BizException("角色归属不匹配");
+        }
+        return role;
+    }
+}
@@ -2,9 +2,11 @@ package com.diligrp.rider.service.impl;
  
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.diligrp.rider.common.enums.AdminRoleScopeEnum;
 import com.diligrp.rider.common.exception.BizException;
 import com.diligrp.rider.entity.Substation;
 import com.diligrp.rider.mapper.SubstationMapper;
+import com.diligrp.rider.service.RoleScopeGuardService;
 import com.diligrp.rider.service.SubstationService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -18,6 +20,7 @@ import java.util.List;
 public class SubstationServiceImpl implements SubstationService {
  
     private final SubstationMapper substationMapper;
+    private final RoleScopeGuardService roleScopeGuardService;
  
     @Override
     public List<Substation> list(String keyword) {
@@ -41,6 +44,7 @@ public class SubstationServiceImpl implements SubstationService {
                 .eq(Substation::getUserLogin, substation.getUserLogin()));
         if (loginExists > 0) throw new BizException("账号已存在，请更换");
  
+        roleScopeGuardService.requireRole(substation.getRoleId(), AdminRoleScopeEnum.SUBSTATION.name());
         substation.setUserPass(encryptPass(substation.getUserPass()));
         substation.setUserStatus(1);
         substation.setCreateTime(System.currentTimeMillis() / 1000);
@@ -51,6 +55,7 @@ public class SubstationServiceImpl implements SubstationService {
     public void edit(Substation substation) {
         Substation existing = substationMapper.selectById(substation.getId());
         if (existing == null) throw new BizException("分站管理员不存在");
+        roleScopeGuardService.requireRole(substation.getRoleId(), AdminRoleScopeEnum.SUBSTATION.name());
         // 密码为空则不更新
         if (substation.getUserPass() == null || substation.getUserPass().isBlank()) {
             substation.setUserPass(null);
+package com.diligrp.rider.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.diligrp.rider.common.enums.MenuScopeEnum;
+import com.diligrp.rider.common.exception.BizException;
+import com.diligrp.rider.dto.AdminMenuSaveDTO;
+import com.diligrp.rider.entity.SysMenu;
+import com.diligrp.rider.mapper.SysMenuMapper;
+import com.diligrp.rider.service.SystemMenuService;
+import com.diligrp.rider.vo.AdminRoleMenuTreeVO;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+@Service
+@RequiredArgsConstructor
+public class SystemMenuServiceImpl implements SystemMenuService {
+
+    private final SysMenuMapper sysMenuMapper;
+
+    @Override
+    public List<AdminRoleMenuTreeVO> tree() {
+        List<SysMenu> menus = listAllMenus();
+        return buildTree(menus, Map.of(), false);
+    }
+
+    @Override
+    public void add(AdminMenuSaveDTO dto) {
+        validateSave(dto, null);
+        SysMenu menu = new SysMenu();
+        apply(menu, dto);
+        menu.setCreateTime(System.currentTimeMillis() / 1000);
+        sysMenuMapper.insert(menu);
+    }
+
+    @Override
+    public void edit(AdminMenuSaveDTO dto) {
+        if (dto.getId() == null || dto.getId() < 1) {
+            throw new BizException("菜单ID不能为空");
+        }
+        SysMenu existing = requireMenu(dto.getId());
+        validateSave(dto, existing);
+        apply(existing, dto);
+        sysMenuMapper.updateById(existing);
+    }
+
+    @Override
+    @Transactional
+    public void delete(Long id) {
+        SysMenu menu = requireMenu(id);
+        Long childCount = sysMenuMapper.selectCount(new LambdaQueryWrapper<SysMenu>()
+                .eq(SysMenu::getParentId, id));
+        if (childCount != null && childCount > 0) {
+            throw new BizException("请先删除子菜单");
+        }
+        sysMenuMapper.deleteById(menu.getId());
+    }
+
+    @Override
+    public void setVisible(Long id, int visible) {
+        requireMenu(id);
+        sysMenuMapper.update(null, new LambdaUpdateWrapper<SysMenu>()
+                .eq(SysMenu::getId, id)
+                .set(SysMenu::getVisible, visible));
+    }
+
+    @Override
+    public void setStatus(Long id, int status) {
+        requireMenu(id);
+        sysMenuMapper.update(null, new LambdaUpdateWrapper<SysMenu>()
+                .eq(SysMenu::getId, id)
+                .set(SysMenu::getStatus, status));
+    }
+
+    public List<SysMenu> listAllMenus() {
+        return sysMenuMapper.selectList(new LambdaQueryWrapper<SysMenu>()
+                .orderByAsc(SysMenu::getListOrder)
+                .orderByAsc(SysMenu::getId));
+    }
+
+    public List<AdminRoleMenuTreeVO> buildTree(List<SysMenu> menus, Map<Long, Boolean> checkedMap, boolean disableByScope) {
+        Map<Long, AdminRoleMenuTreeVO> voMap = new LinkedHashMap<>();
+        List<AdminRoleMenuTreeVO> roots = new ArrayList<>();
+        for (SysMenu menu : menus) {
+            AdminRoleMenuTreeVO vo = toVO(menu, checkedMap.get(menu.getId()));
+            if (disableByScope && checkedMap.get(menu.getId()) == null) {
+                vo.setDisabled(true);
+            }
+            voMap.put(menu.getId(), vo);
+            Long parentId = menu.getParentId() == null ? 0L : menu.getParentId();
+            if (parentId > 0 && voMap.containsKey(parentId)) {
+                voMap.get(parentId).getChildren().add(vo);
+            } else {
+                roots.add(vo);
+            }
+        }
+        return roots;
+    }
+
+    private void validateSave(AdminMenuSaveDTO dto, SysMenu existing) {
+        validateTypeAndPath(dto);
+        validateScope(dto.getMenuScope());
+
+        SysMenu duplicate = sysMenuMapper.selectOne(new LambdaQueryWrapper<SysMenu>()
+                .eq(SysMenu::getCode, dto.getCode())
+                .ne(existing != null, SysMenu::getId, existing != null ? existing.getId() : null)
+                .last("LIMIT 1"));
+        if (duplicate != null) {
+            throw new BizException("菜单编码已存在");
+        }
+
+        Long parentId = dto.getParentId() == null ? 0L : dto.getParentId();
+        if (parentId > 0) {
+            SysMenu parent = requireMenu(parentId);
+            if (existing != null && existing.getId().equals(parent.getId())) {
+                throw new BizException("父级菜单不能选择自己");
+            }
+            if (existing != null) {
+                ensureNotDescendant(parent.getId(), existing.getId());
+            }
+        }
+    }
+
+    private void validateTypeAndPath(AdminMenuSaveDTO dto) {
+        if (!"DIR".equals(dto.getType()) && !"MENU".equals(dto.getType())) {
+            throw new BizException("菜单类型只能是 DIR 或 MENU");
+        }
+        if ("MENU".equals(dto.getType()) && !StringUtils.hasText(dto.getPath())) {
+            throw new BizException("菜单路由不能为空");
+        }
+    }
+
+    private void validateScope(String scope) {
+        for (MenuScopeEnum value : MenuScopeEnum.values()) {
+            if (value.name().equals(scope)) {
+                return;
+            }
+        }
+        throw new BizException("菜单范围不合法");
+    }
+
+    private void ensureNotDescendant(Long parentId, Long selfId) {
+        Long currentId = parentId;
+        while (currentId != null && currentId > 0) {
+            if (currentId.equals(selfId)) {
+                throw new BizException("父级菜单不能选择当前菜单的子节点");
+            }
+            SysMenu current = sysMenuMapper.selectById(currentId);
+            currentId = current == null ? null : current.getParentId();
+        }
+    }
+
+    private SysMenu requireMenu(Long id) {
+        SysMenu menu = sysMenuMapper.selectById(id);
+        if (menu == null) {
+            throw new BizException("菜单不存在");
+        }
+        return menu;
+    }
+
+    private void apply(SysMenu menu, AdminMenuSaveDTO dto) {
+        menu.setCode(dto.getCode());
+        menu.setName(dto.getName());
+        menu.setType(dto.getType());
+        menu.setPath(StringUtils.hasText(dto.getPath()) ? dto.getPath().trim() : "");
+        menu.setIcon(StringUtils.hasText(dto.getIcon()) ? dto.getIcon().trim() : "");
+        menu.setParentId(dto.getParentId());
+        menu.setMenuScope(dto.getMenuScope());
+        menu.setListOrder(dto.getListOrder() == null ? 0 : dto.getListOrder());
+        menu.setVisible(dto.getVisible() == null ? 1 : dto.getVisible());
+        menu.setStatus(dto.getStatus() == null ? 1 : dto.getStatus());
+    }
+
+    private AdminRoleMenuTreeVO toVO(SysMenu menu, Boolean checked) {
+        AdminRoleMenuTreeVO vo = new AdminRoleMenuTreeVO();
+        vo.setId(menu.getId());
+        vo.setCode(menu.getCode());
+        vo.setName(menu.getName());
+        vo.setType(menu.getType());
+        vo.setPath(menu.getPath());
+        vo.setIcon(menu.getIcon());
+        vo.setMenuScope(menu.getMenuScope());
+        vo.setVisible(menu.getVisible());
+        vo.setStatus(menu.getStatus());
+        vo.setListOrder(menu.getListOrder());
+        vo.setChecked(Boolean.TRUE.equals(checked));
+        return vo;
+    }
+}
+package com.diligrp.rider.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.diligrp.rider.common.enums.AdminRoleScopeEnum;
+import com.diligrp.rider.common.enums.MenuScopeEnum;
+import com.diligrp.rider.common.exception.BizException;
+import com.diligrp.rider.dto.AdminRoleMenuAssignDTO;
+import com.diligrp.rider.entity.SysMenu;
+import com.diligrp.rider.entity.SysRole;
+import com.diligrp.rider.entity.SysRoleMenu;
+import com.diligrp.rider.mapper.SysRoleMapper;
+import com.diligrp.rider.mapper.SysRoleMenuMapper;
+import com.diligrp.rider.service.SystemRoleMenuService;
+import com.diligrp.rider.vo.AdminRoleMenuTreeVO;
+import com.diligrp.rider.vo.AdminRoleVO;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+@Service
+@RequiredArgsConstructor
+public class SystemRoleMenuServiceImpl implements SystemRoleMenuService {
+
+    private final SysRoleMapper sysRoleMapper;
+    private final SysRoleMenuMapper sysRoleMenuMapper;
+    private final SystemMenuServiceImpl systemMenuService;
+
+    @Override
+    public List<AdminRoleVO> listRoles() {
+        List<SysRole> roles = sysRoleMapper.selectList(new LambdaQueryWrapper<SysRole>()
+                .eq(SysRole::getStatus, 1)
+                .orderByAsc(SysRole::getId));
+        List<AdminRoleVO> result = new ArrayList<>();
+        for (SysRole role : roles) {
+            AdminRoleVO vo = new AdminRoleVO();
+            vo.setId(role.getId());
+            vo.setCode(role.getCode());
+            vo.setName(role.getName());
+            vo.setRoleScope(role.getRoleScope());
+            result.add(vo);
+        }
+        return result;
+    }
+
+    @Override
+    public List<AdminRoleMenuTreeVO> getRoleMenuTree(Long roleId) {
+        SysRole role = requireRole(roleId);
+        List<SysMenu> allowedMenus = filterMenusByScope(systemMenuService.listAllMenus(), role);
+        List<SysRoleMenu> assigned = sysRoleMenuMapper.selectList(new LambdaQueryWrapper<SysRoleMenu>()
+                .eq(SysRoleMenu::getRoleId, roleId));
+        Set<Long> assignedIds = assigned.stream().map(SysRoleMenu::getMenuId).collect(Collectors.toSet());
+        Map<Long, Boolean> checkedMap = new LinkedHashMap<>();
+        for (SysMenu menu : allowedMenus) {
+            checkedMap.put(menu.getId(), assignedIds.contains(menu.getId()));
+        }
+        return systemMenuService.buildTree(allowedMenus, checkedMap, false);
+    }
+
+    @Override
+    @Transactional
+    public void assignMenus(Long roleId, AdminRoleMenuAssignDTO dto) {
+        SysRole role = requireRole(roleId);
+        List<SysMenu> allowedMenus = filterMenusByScope(systemMenuService.listAllMenus(), role);
+        Set<Long> allowedIds = allowedMenus.stream().map(SysMenu::getId).collect(Collectors.toSet());
+        List<Long> menuIds = dto.getMenuIds() == null ? List.of() : dto.getMenuIds();
+        for (Long menuId : menuIds) {
+            if (!allowedIds.contains(menuId)) {
+                throw new BizException("存在不允许分配的菜单");
+            }
+        }
+
+        sysRoleMenuMapper.delete(new LambdaQueryWrapper<SysRoleMenu>()
+                .eq(SysRoleMenu::getRoleId, roleId));
+        long now = System.currentTimeMillis() / 1000;
+        for (Long menuId : menuIds) {
+            SysRoleMenu roleMenu = new SysRoleMenu();
+            roleMenu.setRoleId(roleId);
+            roleMenu.setMenuId(menuId);
+            roleMenu.setCreateTime(now);
+            sysRoleMenuMapper.insert(roleMenu);
+        }
+    }
+
+    private SysRole requireRole(Long roleId) {
+        SysRole role = sysRoleMapper.selectById(roleId);
+        if (role == null || role.getStatus() == null || role.getStatus() != 1) {
+            throw new BizException("角色不存在或已禁用");
+        }
+        return role;
+    }
+
+    private List<SysMenu> filterMenusByScope(List<SysMenu> menus, SysRole role) {
+        return menus.stream().filter(menu -> isScopeAllowed(role, menu)).collect(Collectors.toList());
+    }
+
+    private boolean isScopeAllowed(SysRole role, SysMenu menu) {
+        if (MenuScopeEnum.BOTH.name().equals(menu.getMenuScope())) {
+            return true;
+        }
+        if (AdminRoleScopeEnum.PLATFORM.name().equals(role.getRoleScope())) {
+            return MenuScopeEnum.PLATFORM.name().equals(menu.getMenuScope());
+        }
+        if (AdminRoleScopeEnum.SUBSTATION.name().equals(role.getRoleScope())) {
+            return MenuScopeEnum.SUBSTATION.name().equals(menu.getMenuScope());
+        }
+        return false;
+    }
+}
+package com.diligrp.rider.vo;
+
+import lombok.Data;
+
+@Data
+public class AdminLoginUserVO {
+    private Long id;
+    private String userLogin;
+    private String userNickname;
+    /** 兼容前端现有判断：admin / substation */
+    private String role;
+    private String roleType;
+    private String roleCode;
+    private Long cityId;
+    private String cityName;
+}
@@ -2,14 +2,12 @@ package com.diligrp.rider.vo;
  
 import lombok.Data;
  
+import java.util.List;
+
 @Data
 public class AdminLoginVO {
-    private Long id;
-    private String userLogin;
-    private String userNickname;
-    /** 角色：admin / substation */
-    private String role;
-    /** 分站关联城市ID（substation角色才有） */
-    private Long cityId;
     private String token;
+    private AdminLoginUserVO user;
+    private List<AdminMenuVO> menus;
+    private String homePath;
 }
+package com.diligrp.rider.vo;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+public class AdminMenuVO {
+    private Long id;
+    private String code;
+    private String name;
+    private String type;
+    private String path;
+    private String icon;
+    private List<AdminMenuVO> children = new ArrayList<>();
+}
+package com.diligrp.rider.vo;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+public class AdminRoleMenuTreeVO {
+    private Long id;
+    private String code;
+    private String name;
+    private String type;
+    private String path;
+    private String icon;
+    private String menuScope;
+    private Integer visible;
+    private Integer status;
+    private Integer listOrder;
+    private Boolean checked = false;
+    private Boolean disabled = false;
+    private List<AdminRoleMenuTreeVO> children = new ArrayList<>();
+}
+package com.diligrp.rider.vo;
+
+import lombok.Data;
+
+@Data
+public class AdminRoleVO {
+    private Long id;
+    private String code;
+    private String name;
+    private String roleScope;
+}
@@ -64,9 +64,43 @@ INSERT INTO `city` (`id`, `pid`, `name`, `area_code`, `status`, `rate`, `list_or
 -- 2. 分站管理员（每个已开通城市一个）
 -- 默认密码均为 admin123（MD5: 0192023a7bbd73250516f069df18b500）
 -- ============================================================
-INSERT INTO `substation` (`city_id`, `user_login`, `user_nickname`, `user_pass`, `mobile`, `user_status`, `create_time`) VALUES
-(2, 'gz_admin', '广州分站管理员', '0192023a7bbd73250516f069df18b500', '13800000001', 1, UNIX_TIMESTAMP()),
-(3, 'sz_admin', '深圳分站管理员', '0192023a7bbd73250516f069df18b500', '13800000002', 1, UNIX_TIMESTAMP());
+INSERT INTO `sys_role` (`code`, `name`, `role_scope`, `status`, `create_time`) VALUES
+('platform_admin', '平台管理员', 'PLATFORM', 1, UNIX_TIMESTAMP()),
+('substation_admin', '分站管理员', 'SUBSTATION', 1, UNIX_TIMESTAMP());
+
+INSERT INTO `sys_menu` (`code`, `name`, `type`, `path`, `icon`, `parent_id`, `menu_scope`, `list_order`, `visible`, `status`, `create_time`) VALUES
+('dashboard', '工作台', 'MENU', '/dashboard', 'HomeOutlined', 0, 'BOTH', 10, 1, 1, UNIX_TIMESTAMP()),
+('city.manage', '租户管理', 'MENU', '/city', 'GlobalOutlined', 0, 'PLATFORM', 20, 1, 1, UNIX_TIMESTAMP()),
+('substation.manage', '分站管理', 'MENU', '/substation', 'ApartmentOutlined', 0, 'PLATFORM', 30, 1, 1, UNIX_TIMESTAMP()),
+('merchant.root', '商家管理', 'DIR', '', 'ShopOutlined', 0, 'PLATFORM', 40, 1, 1, UNIX_TIMESTAMP()),
+('merchant.enter', '入驻申请', 'MENU', '/merchant/enter', '', 4, 'PLATFORM', 41, 1, 1, UNIX_TIMESTAMP()),
+('merchant.store', '店铺管理', 'MENU', '/merchant/store', '', 4, 'PLATFORM', 42, 1, 1, UNIX_TIMESTAMP()),
+('rider.list', '骑手管理', 'MENU', '/rider', 'UserOutlined', 0, 'BOTH', 50, 1, 1, UNIX_TIMESTAMP()),
+('rider.evaluate', '骑手评价', 'MENU', '/rider/evaluate', 'StarOutlined', 0, 'BOTH', 60, 1, 1, UNIX_TIMESTAMP()),
+('order.root', '订单管理', 'DIR', '', 'UnorderedListOutlined', 0, 'BOTH', 70, 1, 1, UNIX_TIMESTAMP()),
+('order.list', '订单列表', 'MENU', '/order', '', 9, 'BOTH', 71, 1, 1, UNIX_TIMESTAMP()),
+('order.refund', '退款管理', 'MENU', '/refund', '', 9, 'BOTH', 72, 1, 1, UNIX_TIMESTAMP()),
+('order.delivery', '配送订单', 'MENU', '/delivery/order', '', 9, 'BOTH', 73, 1, 1, UNIX_TIMESTAMP()),
+('config.root', '配置中心', 'DIR', '', 'ControlOutlined', 0, 'BOTH', 80, 1, 1, UNIX_TIMESTAMP()),
+('fee.plan', '配送费配置', 'MENU', '/config/fee-plan', '', 13, 'BOTH', 81, 1, 1, UNIX_TIMESTAMP()),
+('dispatch.rule', '调度配置', 'MENU', '/dispatch/rule', '', 13, 'BOTH', 82, 1, 1, UNIX_TIMESTAMP()),
+('open.root', '开放平台', 'DIR', '', 'ApiOutlined', 0, 'PLATFORM', 90, 1, 1, UNIX_TIMESTAMP()),
+('open.app', '应用管理', 'MENU', '/open', '', 16, 'PLATFORM', 91, 1, 1, UNIX_TIMESTAMP()),
+('open.mock_delivery', '模拟推单', 'MENU', '/open/mock-delivery', '', 16, 'PLATFORM', 92, 1, 1, UNIX_TIMESTAMP()),
+('system.root', '系统管理', 'DIR', '', 'ControlOutlined', 0, 'PLATFORM', 100, 1, 1, UNIX_TIMESTAMP()),
+('system.menu', '菜单管理', 'MENU', '/system/menu', '', 19, 'PLATFORM', 101, 1, 1, UNIX_TIMESTAMP()),
+('system.role_menu', '角色菜单', 'MENU', '/system/role-menu', '', 19, 'PLATFORM', 102, 1, 1, UNIX_TIMESTAMP()),
+('admin.user', '平台账号', 'MENU', '/admin-user', '', 19, 'PLATFORM', 103, 1, 1, UNIX_TIMESTAMP());
+
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`, `create_time`)
+SELECT 1, id, UNIX_TIMESTAMP() FROM `sys_menu` WHERE `menu_scope` IN ('PLATFORM', 'BOTH');
+
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`, `create_time`)
+SELECT 2, id, UNIX_TIMESTAMP() FROM `sys_menu` WHERE `menu_scope` IN ('SUBSTATION', 'BOTH');
+
+INSERT INTO `substation` (`city_id`, `user_login`, `user_nickname`, `user_pass`, `mobile`, `user_status`, `role_id`, `create_time`) VALUES
+(2, 'gz_admin', '广州分站管理员', '0192023a7bbd73250516f069df18b500', '13800000001', 1, 2, UNIX_TIMESTAMP()),
+(3, 'sz_admin', '深圳分站管理员', '0192023a7bbd73250516f069df18b500', '13800000002', 1, 2, UNIX_TIMESTAMP());
  
 -- ============================================================
 -- 3. 骑手等级配置（广州）
@@ -135,7 +169,8 @@ SELECT &#39;开放平台 AppKey: TESTAPPKEY00001&#39; AS 开放平台;
 -- 7. 超级管理员账号
 -- 默认密码：admin123（MD5: 0192023a7bbd73250516f069df18b500）
 -- ============================================================
-INSERT INTO `admin_user` (`user_login`, `user_pass`, `user_nickname`, `user_status`, `create_time`) VALUES
-('admin', '0192023a7bbd73250516f069df18b500', '超级管理员', 1, UNIX_TIMESTAMP());
+INSERT INTO `admin_user` (`user_login`, `user_pass`, `user_nickname`, `user_status`, `role_id`, `create_time`) VALUES
+('admin', '0192023a7bbd73250516f069df18b500', '超级管理员', 1, 1, UNIX_TIMESTAMP());
  
 SELECT '超级管理员: admin / admin123（role=admin）' AS 超管账号;
+SELECT '系统管理菜单: /system/menu /system/role-menu /admin-user' AS 系统管理;
@@ -258,6 +258,7 @@ CREATE TABLE `substation` (
   `mobile`        VARCHAR(20)     NOT NULL DEFAULT '' COMMENT '手机号',
   `avatar`        VARCHAR(255)    NOT NULL DEFAULT '' COMMENT '头像',
   `user_status`   TINYINT         NOT NULL DEFAULT 1 COMMENT '状态：0=禁用 1=正常',
+  `role_id`       BIGINT UNSIGNED NOT NULL DEFAULT 0 COMMENT '菜单角色ID',
   `create_time`   BIGINT UNSIGNED NOT NULL DEFAULT 0 COMMENT '创建时间',
   PRIMARY KEY (`id`),
   UNIQUE KEY `uk_user_login` (`user_login`)
@@ -366,11 +367,51 @@ CREATE TABLE `admin_user` (
   `user_pass`     VARCHAR(128)    NOT NULL DEFAULT '' COMMENT '密码（MD5）',
   `user_nickname` VARCHAR(64)     NOT NULL DEFAULT '' COMMENT '昵称',
   `user_status`   TINYINT         NOT NULL DEFAULT 1 COMMENT '状态：0=禁用 1=正常',
+  `role_id`       BIGINT UNSIGNED NOT NULL DEFAULT 0 COMMENT '菜单角色ID',
   `create_time`   BIGINT UNSIGNED NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`),
   UNIQUE KEY `uk_user_login` (`user_login`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='超级管理员表';
  
+CREATE TABLE `sys_role` (
+  `id`          BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
+  `code`        VARCHAR(64)     NOT NULL DEFAULT '' COMMENT '角色编码',
+  `name`        VARCHAR(64)     NOT NULL DEFAULT '' COMMENT '角色名称',
+  `role_scope`  VARCHAR(32)     NOT NULL DEFAULT 'PLATFORM' COMMENT '角色归属：PLATFORM/SUBSTATION',
+  `status`      TINYINT         NOT NULL DEFAULT 1 COMMENT '状态：0=禁用 1=正常',
+  `create_time` BIGINT UNSIGNED NOT NULL DEFAULT 0,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uk_role_code` (`code`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='后台菜单角色表';
+
+CREATE TABLE `sys_menu` (
+  `id`          BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
+  `code`        VARCHAR(64)     NOT NULL DEFAULT '' COMMENT '菜单编码',
+  `name`        VARCHAR(64)     NOT NULL DEFAULT '' COMMENT '菜单名称',
+  `type`        VARCHAR(16)     NOT NULL DEFAULT 'MENU' COMMENT '类型：DIR/MENU',
+  `path`        VARCHAR(128)    NOT NULL DEFAULT '' COMMENT '前端路由路径',
+  `icon`        VARCHAR(64)     NOT NULL DEFAULT '' COMMENT '前端图标名',
+  `parent_id`   BIGINT UNSIGNED NOT NULL DEFAULT 0 COMMENT '父级菜单ID',
+  `menu_scope`  VARCHAR(32)     NOT NULL DEFAULT 'BOTH' COMMENT '菜单归属：PLATFORM/SUBSTATION/BOTH',
+  `list_order`  INT             NOT NULL DEFAULT 0 COMMENT '排序',
+  `visible`     TINYINT         NOT NULL DEFAULT 1 COMMENT '是否显示：0=否 1=是',
+  `status`      TINYINT         NOT NULL DEFAULT 1 COMMENT '状态：0=禁用 1=正常',
+  KEY `idx_scope_parent` (`menu_scope`, `parent_id`, `list_order`),
+  `create_time` BIGINT UNSIGNED NOT NULL DEFAULT 0,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uk_menu_code` (`code`),
+  KEY `idx_parent_order` (`parent_id`, `list_order`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='后台菜单表';
+
+CREATE TABLE `sys_role_menu` (
+  `id`          BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
+  `role_id`     BIGINT UNSIGNED NOT NULL DEFAULT 0 COMMENT '角色ID',
+  `menu_id`     BIGINT UNSIGNED NOT NULL DEFAULT 0 COMMENT '菜单ID',
+  `create_time` BIGINT UNSIGNED NOT NULL DEFAULT 0,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uk_role_menu` (`role_id`, `menu_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='后台角色菜单关系表';
+
 -- orders 表补充字段（如已有 orders 表，执行以下 ALTER）
 ALTER TABLE `orders` ADD COLUMN `out_order_no` VARCHAR(64) NOT NULL DEFAULT '' COMMENT '外部系统订单号' AFTER `order_no`;
 ALTER TABLE `orders` ADD COLUMN `app_key` VARCHAR(32) NOT NULL DEFAULT '' COMMENT '接入方AppKey' AFTER `out_order_no`;