From 52081904dc467b81db0b28ff7cfed5979f14d1d2 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期五, 08 十一月 2024 19:52:04 +0800
Subject: [PATCH] add:钱包功能调整1108-2
---
src/main/java/com/mzl/flower/web/v2/wallet/WalletController.java | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 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 63ba753..208b7b0 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
@@ -8,18 +8,18 @@
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.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import com.mzl.flower.entity.wallet.WalletDO;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.Max;
import javax.validation.constraints.Positive;
+import java.math.BigDecimal;
/**
* @author @TaoJie
@@ -27,6 +27,8 @@
*/
@RestController
@RequestMapping("/v2/wallet")
+@Api(value = "供应商-钱包", tags = "供应商-钱包")
+@Validated
public class WalletController extends BaseController {
@Autowired
@@ -53,20 +55,31 @@
}
@GetMapping("/{id}")
- public WalletDO get(@PathVariable(value = "id") @Positive(message = "{id.positive}") Integer id) {
+ public ResponseEntity<ReturnDataDTO> get(@PathVariable(value = "id") @Positive(message = "{id.positive}") Integer id) {
return null;
}
@GetMapping("/supplier")
@ApiOperation(value = "获取供应商钱包", notes = "获取供应商钱包")
- public WalletDO getWalletBySupplierId() {
+ public ResponseEntity<ReturnDataDTO> getWalletBySupplierId() {
// 判断供应商是否存在
final SupplierDTO currentSupplier = supplierService.getCurrentSupplier();
if(null==currentSupplier){
throw new ValidationException("供应商不能为空");
}
+ final WalletDO walletDO = walletService.getCurrentSupplier();
+ if(null!=walletDO){
+ // 根据当前供应商获取待结算的钱
+ BigDecimal waittingSettlementAmount = walletService.getWaittingSettlementAmount(walletDO);
+ walletDO.setSettlingAmount(waittingSettlementAmount);
+ // 总交易额度
+ walletDO.setTotalTransactionAmount(walletService.getSupplierTotalTransactionAmount(walletDO));
+ // 总扣款数量
+ walletDO.setTotalDeduction(walletService.getSupplierDeductAmount(walletDO));
- return walletService.getBySupplierId(currentSupplier.getId());
+ }
+
+ return returnData(R.SUCCESS.getCode(), walletDO);
}
@GetMapping("/page")
--
Gitblit v1.9.3