From 6c823dd44dbde79f008001a2a11e7bf9bc6bf8cc Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期三, 04 十二月 2024 18:15:44 +0800
Subject: [PATCH] fix:合伙人列表操作日志
---
src/main/java/com/mzl/flower/web/v2/wallet/WalletWithdrawRecordController.java | 39 ++++++++++++++++++++++-----------------
1 files changed, 22 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/mzl/flower/web/v2/wallet/WalletWithdrawRecordController.java b/src/main/java/com/mzl/flower/web/v2/wallet/WalletWithdrawRecordController.java
index 54061b1..e3bdbc9 100644
--- a/src/main/java/com/mzl/flower/web/v2/wallet/WalletWithdrawRecordController.java
+++ b/src/main/java/com/mzl/flower/web/v2/wallet/WalletWithdrawRecordController.java
@@ -5,7 +5,8 @@
import com.mzl.flower.base.BaseController;
import com.mzl.flower.base.R;
import com.mzl.flower.base.ReturnDataDTO;
-import com.mzl.flower.dto.request.wallet.QueryWalletDTO;
+import com.mzl.flower.constant.Constants;
+import com.mzl.flower.dto.request.wallet.QueryWalletWithdrawDTO;
import com.mzl.flower.dto.request.wallet.WalletWithdrawRecordDTO;
import com.mzl.flower.dto.response.wallet.WalletWithdrawRecordVO;
import com.mzl.flower.service.wallet.WalletWithdrawRecordService;
@@ -26,10 +27,7 @@
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestParam;
import com.mzl.flower.entity.wallet.WalletWithdrawRecordDO;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.Max;
import javax.validation.constraints.Positive;
/**
@@ -51,20 +49,30 @@
private WalletService walletService;
@GetMapping("/list")
- @ApiOperation(value = "查询提现记录", httpMethod = "GET")
- public ResponseEntity<ReturnDataDTO<Page<WalletWithdrawRecordVO>>> getMemberList(Page page, QueryWalletDTO dto) {
+ @ApiOperation(value = "查询提现记录-分页", httpMethod = "GET")
+ public ResponseEntity<ReturnDataDTO<Page<WalletWithdrawRecordVO>>> getMemberList(Page page, QueryWalletWithdrawDTO dto) {
return returnData(R.SUCCESS.getCode(), walletWithdrawRecordService.queryPage(dto, page));
}
- @PostMapping(value = "/edit")
- @ApiOperation(value = "修改", httpMethod = "POST")
+ @PostMapping(value = "/pass")
+ @ApiOperation(value = "通过", httpMethod = "POST")
public ResponseEntity update(@RequestBody WalletWithdrawRecordDTO walletWithdrawRecordDTO) {
+ walletWithdrawRecordDTO.setApproveState(Constants.WALLET_APPROVE_STATE.APPROVE.name());
walletWithdrawRecordService.updateWallet(walletWithdrawRecordDTO);
return returnData(R.SUCCESS.getCode(), null);
}
+ @PostMapping(value = "/refuse")
+ @ApiOperation(value = "拒绝", httpMethod = "POST")
+ public ResponseEntity refuse(@RequestBody WalletWithdrawRecordDTO walletWithdrawRecordDTO) {
+ walletWithdrawRecordDTO.setApproveState(Constants.WALLET_APPROVE_STATE.REJECT.name());
+ walletWithdrawRecordService.updateWallet(walletWithdrawRecordDTO);
+ return returnData(R.SUCCESS.getCode(), null);
+ }
+
+
@PostMapping("")
- public ResponseEntity<ReturnDataDTO> create(@Validated CreateWalletWithdrawRecordDTO walletWithdrawRecordDTO) {
+ public ResponseEntity<ReturnDataDTO> create(@Validated @RequestBody CreateWalletWithdrawRecordDTO walletWithdrawRecordDTO) {
walletWithdrawRecordService.create(walletWithdrawRecordDTO);
@@ -86,15 +94,12 @@
return null;
}
- @GetMapping("/page")
- public ResponseEntity<ReturnDataDTO<Page<WalletWithdrawRecordDO>>> page(
- @RequestParam(name = "page", required = false, defaultValue = "0")
- @Min(value = 0, message = "{page.number.min}") Integer page,
- @RequestParam(name = "count", required = false, defaultValue = "10")
- @Min(value = 1, message = "{page.count.min}")
- @Max(value = 30, message = "{page.count.max}") Integer count
+ @GetMapping("/supplier/page")
+ public ResponseEntity<ReturnDataDTO<Page<WalletWithdrawRecordDO>>> page(Page page, QueryWalletWithdrawDTO dto
) {
- return null;
+ // 根据当前用户获取供应商
+ dto.setSupplierId(String.valueOf(supplierService.getCurrentSupplier().getId()));
+ return returnData(R.SUCCESS.getCode(), walletWithdrawRecordService.queryPage(dto, page));
}
}
--
Gitblit v1.9.3