From ef8ec1ea5e2948309d5ee20817d1b28785957923 Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期四, 19 十二月 2024 10:00:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/WithdrawalRequests.java | 2 ++
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WithdrawalRequestsController.java | 6 +++++-
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/RechargeSetController.java | 8 +++++---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/PointSettingController.java | 2 +-
4 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/WithdrawalRequests.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/WithdrawalRequests.java
index da4c39e..9e0fa5d 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/WithdrawalRequests.java
+++ b/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")
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WithdrawalRequestsController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WithdrawalRequestsController.java
index 6d9ebf5..2763610 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WithdrawalRequestsController.java
+++ b/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 = {"后台"})
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/PointSettingController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/PointSettingController.java
index 0e950b5..9824721 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/PointSettingController.java
+++ b/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);
}
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/RechargeSetController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/RechargeSetController.java
index 038d8f0..9812889 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/RechargeSetController.java
+++ b/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();
}
--
Gitblit v1.7.1