From b4aa242d1b818a8ad3a285166caedb699bbcb460 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期三, 23 十月 2024 10:51:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v4' into master-v4
---
src/main/java/com/mzl/flower/web/v2/wallet/WalletController.java | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/mzl/flower/web/v2/wallet/WalletController.java b/src/main/java/com/mzl/flower/web/v2/wallet/WalletController.java
index 5a545c3..ceee11d 100644
--- a/src/main/java/com/mzl/flower/web/v2/wallet/WalletController.java
+++ b/src/main/java/com/mzl/flower/web/v2/wallet/WalletController.java
@@ -5,9 +5,13 @@
import com.mzl.flower.base.BaseController;
import com.mzl.flower.base.R;
import com.mzl.flower.base.ReturnDataDTO;
+import com.mzl.flower.config.exception.ValidationException;
import com.mzl.flower.dto.request.wallet.QueryWalletDTO;
+import com.mzl.flower.dto.response.supplier.SupplierDTO;
import com.mzl.flower.entity.wallet.WalletBillRecordDO;
+import com.mzl.flower.service.supplier.SupplierService;
import com.mzl.flower.service.wallet.WalletService;
+import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
@@ -27,6 +31,9 @@
@Autowired
private WalletService walletService;
+
+ @Autowired
+ private SupplierService supplierService;
@PostMapping("")
public ResponseEntity<ReturnDataDTO> create() {
@@ -50,10 +57,21 @@
return null;
}
+ @GetMapping("/supplier")
+ @ApiOperation(value = "获取供应商钱包", notes = "获取供应商钱包")
+ public WalletDO getWalletBySupplierId() {
+ // 判断供应商是否存在
+ final SupplierDTO currentSupplier = supplierService.getCurrentSupplier();
+ if(null==currentSupplier){
+ throw new ValidationException("供应商不能为空");
+ }
+
+ return walletService.getBySupplierId();
+ }
+
@GetMapping("/page")
public ResponseEntity<ReturnDataDTO<Page<WalletDO>>> page(@RequestBody QueryWalletDTO dto
) {
- // 帮我写分页查询
return null;
}
--
Gitblit v1.9.3