From a21a8b9b733edd59dbcd3f696d2b69f10c4c3fc9 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Fri, 12 Sep 2025 15:11:24 +0800
Subject: [PATCH] Merge branch 'pxb' into xin
---
oying-system/src/main/java/com/oying/modules/rider/rest/WxRiderController.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/rider/rest/WxRiderController.java b/oying-system/src/main/java/com/oying/modules/rider/rest/WxRiderController.java
index 9fe5d74..e49e0bb 100644
--- a/oying-system/src/main/java/com/oying/modules/rider/rest/WxRiderController.java
+++ b/oying-system/src/main/java/com/oying/modules/rider/rest/WxRiderController.java
@@ -12,10 +12,7 @@
import com.oying.modules.rider.service.*;
import com.oying.modules.rider.utils.Constants;
import com.oying.service.BucketStorageService;
-import com.oying.utils.FileUtil;
-import com.oying.utils.PageResult;
-import com.oying.utils.R;
-import com.oying.utils.StringUtils;
+import com.oying.utils.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
@@ -52,7 +49,7 @@
@ApiOperation("查询第三方数据骑手信息")
// @PreAuthorize("@el.check('riderInfo:list')")
public ResponseEntity<?> getRiderSourceInfo(@PathVariable Long riderId) {
- RiderInfo riderInfo = riderInfoService.getRiderSourceInfo(riderId);
+ RiderInfo riderInfo = riderInfoService.getRiderSourceInfo(SecurityUtils.getCurrentUserId());
return ResponseEntity.ok(R.success(riderInfo));
}
@@ -60,15 +57,15 @@
@ApiOperation("同步查询第三方骑手信息 LY")
// @PreAuthorize("@el.check('riderInfo:edit')")
public ResponseEntity<?> syncRiderSourceInfo(@PathVariable String sourcePlatform) {
- riderInfoService.syncRiderSourceInfo(sourcePlatform);
- return ResponseEntity.ok(R.success("操作成功"));
+ R result = riderInfoService.syncRiderSourceInfo(sourcePlatform);
+ return ResponseEntity.ok(result);
}
@GetMapping("getRiderWalletInfo/{riderId}")
@ApiOperation("查询骑手钱包信息")
// @PreAuthorize("@el.check('riderWalletInfo:list')")
public ResponseEntity<?> getRiderWalletInfo(@PathVariable String riderId) {
- RiderWalletInfo riderWalletInfo = riderWalletInfoService.getRiderWalletInfo(riderId);
+ RiderWalletInfo riderWalletInfo = riderWalletInfoService.getRiderWalletInfo(SecurityUtils.getCurrentUserId());
return ResponseEntity.ok(R.success(riderWalletInfo));
}
@@ -76,6 +73,7 @@
@ApiOperation("查询骑手订单收入明细分页")
// @PreAuthorize("@el.check('riderIncomeDetail:list')")
public ResponseEntity<?> getRiderIncomeDetail(RiderIncomeDetailQueryCriteria criteria) {
+ criteria.setRiderId(SecurityUtils.getCurrentUserId());
Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
PageResult<RiderIncomeDetail> riderIncomeDetails = riderIncomeDetailService.queryAll(criteria, page);
return ResponseEntity.ok(R.success(riderIncomeDetails));
@@ -85,6 +83,7 @@
@ApiOperation("查询骑手提现记录分页")
// @PreAuthorize("@el.check('riderWithdrawalRecord:list')")
public ResponseEntity<?> getRiderWithdrawalRecord(RiderWithdrawalRecordQueryCriteria criteria) {
+ criteria.setRiderId(SecurityUtils.getCurrentUserId());
Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
PageResult<RiderWithdrawalRecord> riderIncomeDetails = riderWithdrawalRecordService.queryAll(criteria, page);
return ResponseEntity.ok(R.success(riderIncomeDetails));
@@ -94,6 +93,7 @@
@ApiOperation("查询骑手订单记录分页")
// @PreAuthorize("@el.check('riderOrderRecord:list')")
public ResponseEntity<?> getRiderOrderRecord(RiderOrderRecordQueryCriteria criteria) {
+ criteria.setRiderId(SecurityUtils.getCurrentUserId());
Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
PageResult<RiderOrderRecord> riderOrderRecordPageResult = riderOrderRecordService.queryAll(criteria, page);
return ResponseEntity.ok(R.success(riderOrderRecordPageResult));
--
Gitblit v1.9.3