合并代码

puzhibing

2024-12-19 27408731d4d6857b025294822d6298b7d721a10e

合并代码

 ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/WithdrawalRequests.java

@@ -29,6 +29,8 @@
    @ApiModelProperty(value = "主键")
    @TableId(value = "id", type = IdType.AUTO)
    private Long id;
    @TableField(exist = false)
    private String idStr;

    @ApiModelProperty(value = "删除标志（0=否，1=是）")
    @TableField("del_flag")

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WithdrawalRequestsController.java

@@ -49,7 +49,11 @@
    @PostMapping("/page")
    @ApiOperation(value = "提现申请列表", tags = {"后台"})
    public R<IPage<WithdrawalRequests>> page(@RequestBody WithQuery withQuery){
            return R.ok(withdrawalRequestsService.pageList(withQuery));
        IPage<WithdrawalRequests> withdrawalRequestsIPage = withdrawalRequestsService.pageList(withQuery);
        for (WithdrawalRequests record : withdrawalRequestsIPage.getRecords()) {
            record.setIdStr(record.getId().toString());
        }
        return R.ok(withdrawalRequestsIPage);
    }
    @PostMapping("/auth")
    @ApiOperation(value = "提现申请审批", tags = {"后台"})

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/PointSettingController.java

@@ -35,7 +35,7 @@
    }
    @GetMapping("/search")
    @ApiOperation(value = "积分配置查询", tags = {"后台"})
    public R<List<PointSetting>> search(@RequestParam Integer id) {
    public R<List<PointSetting>> search() {
        List<PointSetting> list = pointSettingService.list();
        return R.ok(list);
    }

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/RechargeSetController.java

@@ -6,6 +6,7 @@
import com.ruoyi.account.api.model.UserClickLog;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.other.api.domain.RechargeSet;
import com.ruoyi.other.dto.RechargeDto;
import com.ruoyi.other.service.RechargeSetService;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
@@ -34,9 +35,10 @@
    }
    @PostMapping("/set")
    @ApiOperation(value = "充值设置", tags = {"后台"})
    public R<List<RechargeSet>> detail(@RequestBody List<RechargeSet> rechargeSets) {
        boolean remove = rechargeSetService.remove(Wrappers.lambdaQuery());
        rechargeSetService.saveBatch(rechargeSets);
    public R<List<RechargeSet>> detail(@RequestBody RechargeDto rechargeDto) {
        List<RechargeSet> list = rechargeSetService.list();
        rechargeSetService.removeBatchByIds(list);
        rechargeSetService.saveBatch(rechargeDto.getRechargeSets());
        return R.ok();
    }