Merge remote-tracking branch 'origin/dev' into dev

无关风月

2025-04-21 1668fe1b912d07191c9fd7f20808d7d2162bc8e8

 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,12 +175,13 @@
     *
     * @param recoveryServeRequest 回收服务信息
     */
    @RequiresPermissions("serve_recycling_list")
    @RequiresPermissions("serve_update")
    @ApiOperation(value = "修改回收服务", tags = {"后台-回收管理-回收服务管理"})
    @PostMapping(value = "/update")
    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()
@@ -179,6 +203,7 @@
                price.setRecoveryServeId(serve.getId());
                price.setRecoveryPrice(recoveryPrice);
                price.setCity(city);
                price.setCityCode(data.getCityCode());
                update = update && recoveryServePriceService.save(price);
            }
        }
@@ -190,7 +215,7 @@
     *
     * @param ids 回收服务多条id拼接
     */
    @RequiresPermissions("serve_recycling_list")
    @RequiresPermissions("serve_delete")
    @ApiOperation(value = "批量删除回收服务", tags = {"后台-回收管理-回收服务管理"})
    @GetMapping(value = "/batchDelete")
    @ApiImplicitParams({
@@ -200,6 +225,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();
    }