From 1442f149019ee0590389abd7a88a79c4d9b59034 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 27 五月 2025 18:23:34 +0800
Subject: [PATCH] bug修改
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/RecoveryServeController.java | 35 +++++++++++++++++++++++++++++++----
1 files changed, 31 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/RecoveryServeController.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/RecoveryServeController.java
index 6a120af..68a3a4a 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/RecoveryServeController.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/RecoveryServeController.java
@@ -76,6 +76,28 @@
return R.ok(wrapper.eq(RecoveryServe::getIsDelete, 0)
.orderByDesc(RecoveryServe::getCreateTime).page(Page.of(pageNum, pageSize)));
}
+ @ApiOperation(value = "服务名称下拉列表", tags = {"后台-订单管理-服务名称下拉列表"})
+ @GetMapping(value = "/pageList")
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "服务名称", name = "serveName", dataType = "String"),
+ @ApiImplicitParam(value = "回收价格起点", name = "startPrice", dataType = "String"),
+ @ApiImplicitParam(value = "回收价格终点", name = "endPrice", dataType = "String"),
+ @ApiImplicitParam(value = "页码", name = "pageNum", dataType = "Integer", required = true),
+ @ApiImplicitParam(value = "每页条数", name = "pageSize", dataType = "Integer", required = true)
+ })
+ public R<IPage<RecoveryServe>> pageList(String serveName, String startPrice, String endPrice,
+ @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
+ LambdaQueryChainWrapper<RecoveryServe> wrapper = recoveryServeService.lambdaQuery();
+ wrapper.orderByDesc(RecoveryServe::getSort);
+ // 服务名称模糊匹配
+ wrapper = StringUtils.isNotBlank(serveName) ? wrapper.like(RecoveryServe::getServeName, serveName) : wrapper;
+ // 回收价格区间匹配
+ wrapper = null != startPrice ? wrapper.ge(RecoveryServe::getDefaultPrice, startPrice) : wrapper;
+ wrapper = null != endPrice ? wrapper.le(RecoveryServe::getDefaultPrice, endPrice) : wrapper;
+ return R.ok(wrapper.eq(RecoveryServe::getIsDelete, 0)
+ .page(Page.of(pageNum, pageSize)));
+ }
/**
* 回收服务列表
@@ -106,7 +128,7 @@
*
* @param id 回收服务id
*/
- @RequiresPermissions("serve_recycling_list")
+ @RequiresPermissions("serve_detail")
@ApiOperation(value = "回收服务详情", tags = {"后台-回收管理-回收服务管理"})
@GetMapping(value = "/detail")
@ApiImplicitParams({
@@ -125,7 +147,7 @@
*
* @param recoveryServeRequest 回收服务信息
*/
- @RequiresPermissions("serve_recycling_list")
+ @RequiresPermissions("serve_save")
@ApiOperation(value = "新增回收服务", tags = {"后台-回收管理-回收服务管理"})
@PostMapping(value = "/save")
public R<String> save(@RequestBody RecoveryServeRequest recoveryServeRequest) {
@@ -141,6 +163,7 @@
price.setRecoveryServeId(serve.getId());
price.setRecoveryPrice(recoveryPrice);
price.setCity(city);
+ price.setCityCode(data.getCityCode());
save = save && recoveryServePriceService.save(price);
}
}
@@ -152,7 +175,7 @@
*
* @param recoveryServeRequest 回收服务信息
*/
- @RequiresPermissions("serve_recycling_list")
+ @RequiresPermissions("serve_update")
@ApiOperation(value = "修改回收服务", tags = {"后台-回收管理-回收服务管理"})
@PostMapping(value = "/update")
public R<String> update(@RequestBody RecoveryServeRequest recoveryServeRequest) {
@@ -179,6 +202,7 @@
price.setRecoveryServeId(serve.getId());
price.setRecoveryPrice(recoveryPrice);
price.setCity(city);
+ price.setCityCode(data.getCityCode());
update = update && recoveryServePriceService.save(price);
}
}
@@ -190,7 +214,7 @@
*
* @param ids 回收服务多条id拼接
*/
- @RequiresPermissions("serve_recycling_list")
+ @RequiresPermissions("serve_delete")
@ApiOperation(value = "批量删除回收服务", tags = {"后台-回收管理-回收服务管理"})
@GetMapping(value = "/batchDelete")
@ApiImplicitParams({
@@ -200,6 +224,9 @@
List<String> idList = Arrays.stream(ids.split(",")).collect(Collectors.toList());
List<RecoveryServe> list = recoveryServeService.lambdaQuery().in(RecoveryServe::getId, idList).list();
list.forEach(data -> data.setIsDelete(1));
+ recoveryServePriceService.lambdaUpdate()
+ .set(RecoveryServePrice::getIsDelete, Constants.ONE)
+ .in(RecoveryServePrice::getRecoveryServeId, idList).update();
return recoveryServeService.updateBatchById(list) ? R.ok() : R.fail();
}
--
Gitblit v1.7.1