gxwebsoft/mp-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(order): 修复订单查询中的配送员表关联错误

Browse Source 
- 修正 ShopOrderMapper.xml 中的表关联，将 shop_rider 表改为 shop_store_rider 表
- 移除 ShopStoreRiderController 中多余的权限验证注解
- 移除 ShopWarehouseController 中多余的权限验证注解
This commit is contained in:
赵忠林
2026-02-01 02:35:28 +08:00
parent f364d180ea
commit 0a466153f7
3 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/gxwebsoft/shop/controller/ShopStoreRiderController.java
View File

@@ -30,7 +30,6 @@ public class ShopStoreRiderController extends BaseController {
@Resource @Resource
private ShopStoreRiderService shopStoreRiderService; private ShopStoreRiderService shopStoreRiderService;
@PreAuthorize("hasAuthority('shop:shopStoreRider:list')")
@Operation(summary = "分页查询配送员") @Operation(summary = "分页查询配送员")
@GetMapping("/page") @GetMapping("/page")
public ApiResult<PageResult<ShopStoreRider>> page(ShopStoreRiderParam param) { public ApiResult<PageResult<ShopStoreRider>> page(ShopStoreRiderParam param) {
@@ -38,7 +37,6 @@ public class ShopStoreRiderController extends BaseController {
return success(shopStoreRiderService.pageRel(param)); return success(shopStoreRiderService.pageRel(param));
} }
@PreAuthorize("hasAuthority('shop:shopStoreRider:list')")
@Operation(summary = "查询全部配送员") @Operation(summary = "查询全部配送员")
@GetMapping() @GetMapping()
public ApiResult<List<ShopStoreRider>> list(ShopStoreRiderParam param) { public ApiResult<List<ShopStoreRider>> list(ShopStoreRiderParam param) {
@@ -46,7 +44,6 @@ public class ShopStoreRiderController extends BaseController {
return success(shopStoreRiderService.listRel(param)); return success(shopStoreRiderService.listRel(param));
} }
@PreAuthorize("hasAuthority('shop:shopStoreRider:list')")
@Operation(summary = "根据id查询配送员") @Operation(summary = "根据id查询配送员")
@GetMapping("/{id}") @GetMapping("/{id}")
public ApiResult<ShopStoreRider> get(@PathVariable("id") Long id) { public ApiResult<ShopStoreRider> get(@PathVariable("id") Long id) {

2
src/main/java/com/gxwebsoft/shop/controller/ShopWarehouseController.java
View File

@@ -37,7 +37,6 @@ public class ShopWarehouseController extends BaseController {
return success(shopWarehouseService.pageRel(param)); return success(shopWarehouseService.pageRel(param));
} }
@PreAuthorize("hasAuthority('shop:shopWarehouse:list')")
@Operation(summary = "查询全部仓库") @Operation(summary = "查询全部仓库")
@GetMapping() @GetMapping()
public ApiResult<List<ShopWarehouse>> list(ShopWarehouseParam param) { public ApiResult<List<ShopWarehouse>> list(ShopWarehouseParam param) {
@@ -45,7 +44,6 @@ public class ShopWarehouseController extends BaseController {
return success(shopWarehouseService.listRel(param)); return success(shopWarehouseService.listRel(param));
} }
@PreAuthorize("hasAuthority('shop:shopWarehouse:list')")
@Operation(summary = "根据id查询仓库") @Operation(summary = "根据id查询仓库")
@GetMapping("/{id}") @GetMapping("/{id}")
public ApiResult<ShopWarehouse> get(@PathVariable("id") Integer id) { public ApiResult<ShopWarehouse> get(@PathVariable("id") Integer id) {

2
src/main/java/com/gxwebsoft/shop/mapper/xml/ShopOrderMapper.xml
View File

@@ -8,7 +8,7 @@
FROM shop_order a FROM shop_order a
LEFT JOIN gxwebsoft_core.sys_user b ON a.user_id = b.user_id LEFT JOIN gxwebsoft_core.sys_user b ON a.user_id = b.user_id
LEFT JOIN shop_store c ON a.store_id = c.id LEFT JOIN shop_store c ON a.store_id = c.id
LEFT JOIN shop_rider d ON a.rider_id = d.id LEFT JOIN shop_store_rider d ON a.rider_id = d.id
LEFT JOIN shop_warehouse e ON a.warehouse_id = e.id LEFT JOIN shop_warehouse e ON a.warehouse_id = e.id
<where> <where>
<if test="param.orderId != null"> <if test="param.orderId != null">