From 2855ae89d2ab6268e1edc42c3e9d7e73c8e7259e Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 03 九月 2024 10:09:24 +0800
Subject: [PATCH] 8.9
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/UserManageController.java | 64 +++++++++++++++++++++++++++++---
1 files changed, 58 insertions(+), 6 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/UserManageController.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/UserManageController.java
index 5e310fa..041ea0f 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/UserManageController.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/UserManageController.java
@@ -29,6 +29,7 @@
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
@@ -139,8 +140,52 @@
if (null == loginUser) {
return R.loginExpire("登录失效！");
}
- R<Page<Order>> iPageR = orderClient.orderList(userId, pageNum, pageSize);
- return R.ok(iPageR.getData());
+
+ List<String> cityList= new ArrayList<>();
+ if (loginUser.getCityList()!=null) {
+ cityList = loginUser.getCityList();
+ }
+ R<Page<Order>> iPageR = orderClient.orderList1(userId,cityList, pageNum, pageSize);
+ Page<Order> data = iPageR.getData();
+
+ List<Order> records = data.getRecords();
+ if (!records.isEmpty()) {
+ for (Order record : records) {
+ if (record.getAddress() != null) {
+ record.setReservationAddress(record.getReservationAddress() + record.getAddress());
+ }
+
+ }
+ }
+
+ return R.ok(data);
+ }
+
+
+ @ApiOperation(value = "师傅订单详情", tags = {"后台-师傅管理-师傅列表管理"})
+ @GetMapping(value = "/workOrderList")
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "用户id", name = "workId", dataType = "Integer", required = true),
+ @ApiImplicitParam(value = "页码", name = "pageNum", dataType = "Integer", required = true),
+ @ApiImplicitParam(value = "每页条数", name = "pageSize", dataType = "Integer", required = true)
+ })
+ public R<IPage<Order>> workOrderList(@RequestParam("workId") Integer workId,
+ @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
+ LoginUser loginUser = tokenService.getLoginUser();
+ if (null == loginUser) {
+ return R.loginExpire("登录失效！");
+ }
+ R<Page<Order>> iPageR = orderClient.workOrderList(workId, pageNum, pageSize);
+ Page<Order> data = iPageR.getData();
+ List<Order> records = data.getRecords();
+ for (Order record : records) {
+ if (record.getAddress()!=null) {
+ record.setReservationAddress(record.getReservationAddress() + record.getAddress());
+ }
+
+ }
+ return R.ok(data);
}
/**
@@ -162,7 +207,9 @@
public R<Page<EvaluatePageVO>> evaluateList(Integer userId,
@RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
- return evaluateClient.evaluateList(userId, pageNum, pageSize);
+ LoginUser loginUser = tokenService.getLoginUser();
+ List<String> cityList = loginUser.getCityList();
+ return evaluateClient.evaluateList1(cityList,userId, pageNum, pageSize);
}
/**
@@ -176,7 +223,7 @@
@ApiImplicitParams({
@ApiImplicitParam(value = "评价记录id", name = "id", dataType = "Integer", required = true)
})
- public R<String> deleteEvaluateRecord(@RequestParam Integer id) {
+ public R<String> deleteEvaluateRecord(@RequestParam Long id) {
return evaluateClient.batchDelete(String.valueOf(id));
}
@@ -234,7 +281,12 @@
public R<Page<UserWithdrawRecordVO>> withdrawList(@RequestParam Integer userId,
@RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
- return withdrawClient.withdrawList(userId, pageNum, pageSize);
+ LoginUser loginUser = tokenService.getLoginUser();
+ List<String> cityList = new ArrayList<>();
+ if (loginUser.getCityList()!=null) {
+ cityList = loginUser.getCityList();
+ }
+ return withdrawClient.withdrawList1(cityList,userId, pageNum, pageSize);
}
/**
@@ -248,7 +300,7 @@
@ApiImplicitParams({
@ApiImplicitParam(value = "提现记录id", name = "id", dataType = "Integer", required = true)
})
- public R<String> deleteWithdrawRecord(@RequestParam Integer id) {
+ public R<String> deleteWithdrawRecord(@RequestParam Long id) {
return withdrawClient.batchDelete(String.valueOf(id));
}
--
Gitblit v1.7.1