From 1668fe1b912d07191c9fd7f20808d7d2162bc8e8 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 21 四月 2025 17:09:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/RecoveryServeController.java | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 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 aacae71..63b88e7 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)));
+ }
/**
* 回收服务列表
@@ -159,6 +181,7 @@
public R<String> update(@RequestBody RecoveryServeRequest recoveryServeRequest) {
RecoveryServe serve = recoveryServeRequest.getServe();
serve.setId(recoveryServeRequest.getId());
+ serve.setRecycleSubsidy(recoveryServeRequest.getRecycleSubsidy());
boolean update = recoveryServeService.updateById(serve);
// 城市及对应回收价
List<RecoveryServePrice> priceList = recoveryServePriceService.lambdaQuery()
--
Gitblit v1.7.1