From 1efc548877b061e7b1eba5a71570387ab8c6e807 Mon Sep 17 00:00:00 2001
From: 彭雪彬 <1724387007@qq.com>
Date: Thu, 04 Sep 2025 15:59:20 +0800
Subject: [PATCH] 骑手id自动获取
---
oying-system/src/main/java/com/oying/modules/rider/domain/dto/RiderIncomeDetailQueryCriteria.java | 2 +-
oying-system/src/main/java/com/oying/modules/rider/service/RiderWalletInfoService.java | 2 +-
oying-system/src/main/java/com/oying/modules/rider/service/impl/RiderWalletInfoServiceImpl.java | 2 +-
oying-system/src/main/java/com/oying/modules/rider/rest/WxRiderController.java | 12 ++++++------
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/rider/domain/dto/RiderIncomeDetailQueryCriteria.java b/oying-system/src/main/java/com/oying/modules/rider/domain/dto/RiderIncomeDetailQueryCriteria.java
index dc150eb..f13e9b3 100644
--- a/oying-system/src/main/java/com/oying/modules/rider/domain/dto/RiderIncomeDetailQueryCriteria.java
+++ b/oying-system/src/main/java/com/oying/modules/rider/domain/dto/RiderIncomeDetailQueryCriteria.java
@@ -22,7 +22,7 @@
private String riderName;
@ApiModelProperty(value = "骑手ID")
- private String riderId;
+ private Long riderId;
@ApiModelProperty(value = "骑手手机号")
private String riderPhone;
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..27f8b21 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));
}
@@ -68,7 +65,7 @@
@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));
diff --git a/oying-system/src/main/java/com/oying/modules/rider/service/RiderWalletInfoService.java b/oying-system/src/main/java/com/oying/modules/rider/service/RiderWalletInfoService.java
index 38e7248..93b0eab 100644
--- a/oying-system/src/main/java/com/oying/modules/rider/service/RiderWalletInfoService.java
+++ b/oying-system/src/main/java/com/oying/modules/rider/service/RiderWalletInfoService.java
@@ -62,5 +62,5 @@
* @param riderId 条件
* @return RiderWalletInfo
*/
- RiderWalletInfo getRiderWalletInfo(String riderId);
+ RiderWalletInfo getRiderWalletInfo(Long riderId);
}
diff --git a/oying-system/src/main/java/com/oying/modules/rider/service/impl/RiderWalletInfoServiceImpl.java b/oying-system/src/main/java/com/oying/modules/rider/service/impl/RiderWalletInfoServiceImpl.java
index e651a2d..32560bd 100644
--- a/oying-system/src/main/java/com/oying/modules/rider/service/impl/RiderWalletInfoServiceImpl.java
+++ b/oying-system/src/main/java/com/oying/modules/rider/service/impl/RiderWalletInfoServiceImpl.java
@@ -89,7 +89,7 @@
}
@Override
- public RiderWalletInfo getRiderWalletInfo(String riderId) {
+ public RiderWalletInfo getRiderWalletInfo(Long riderId) {
QueryWrapper<RiderWalletInfo> queryWrapper = new QueryWrapper<>();
queryWrapper.eq(RiderWalletInfo.COL_RIDER_ID, riderId);
return riderWalletInfoMapper.selectOne(queryWrapper);
--
Gitblit v1.9.3