From 0ac9091ca1afc9d7e9516e71e0e2806c352d0d5d Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期三, 23 十月 2024 17:35:25 +0800
Subject: [PATCH] fix:结算

---
 src/main/java/com/mzl/flower/web/v2/wallet/WalletWithdrawRecordController.java |   44 ++++++++++++++++++++++++++++++++------------
 1 files changed, 32 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 a4d75b4..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,15 +5,28 @@
 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;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
+import com.mzl.flower.dto.request.wallet.CreateWalletWithdrawRecordDTO;
+import com.mzl.flower.service.supplier.SupplierService;
+import com.mzl.flower.service.wallet.WalletBillRecordService;
+import com.mzl.flower.service.wallet.WalletService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+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;
@@ -30,9 +43,16 @@
 public class WalletWithdrawRecordController extends BaseController {
 
     private final WalletWithdrawRecordService walletWithdrawRecordService;
+
+    private final WalletBillRecordService walletBillRecordService;
+
+    private final SupplierService supplierService;
+    @Autowired
+    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));
     }
 
@@ -44,7 +64,10 @@
     }
 
     @PostMapping("")
-    public ResponseEntity<ReturnDataDTO> create() {
+    public ResponseEntity<ReturnDataDTO> create(@Validated @RequestBody CreateWalletWithdrawRecordDTO walletWithdrawRecordDTO) {
+
+        walletWithdrawRecordService.create(walletWithdrawRecordDTO);
+
         return returnData(R.SUCCESS.getCode(), null);
     }
 
@@ -63,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