From 6244b737b5f12036f7b4b90f9bfd95655e08fc1c Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期三, 23 十月 2024 16:24:12 +0800
Subject: [PATCH] 1.供应商-钱包-提现记录

---
 src/main/java/com/mzl/flower/web/v2/wallet/WalletWithdrawRecordController.java |   21 +++++++++------------
 1 files changed, 9 insertions(+), 12 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..d402fe2 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,7 @@
 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.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;
@@ -51,8 +51,8 @@
     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));
     }
 
@@ -64,7 +64,7 @@
     }
 
     @PostMapping("")
-    public ResponseEntity<ReturnDataDTO> create(@Validated CreateWalletWithdrawRecordDTO walletWithdrawRecordDTO) {
+    public ResponseEntity<ReturnDataDTO> create(@Validated @RequestBody CreateWalletWithdrawRecordDTO walletWithdrawRecordDTO) {
 
         walletWithdrawRecordService.create(walletWithdrawRecordDTO);
 
@@ -86,15 +86,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(supplierService.getCurrentSupplier().getId());
+        return returnData(R.SUCCESS.getCode(), walletWithdrawRecordService.queryPage(dto, page));
     }
 
 }

--
Gitblit v1.9.3