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/WalletController.java | 14 ++++++++------ 1 files changed, 8 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 ceee11d..7f44be0 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,17 +8,16 @@ 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; /** @@ -27,6 +26,8 @@ */ @RestController @RequestMapping("/v2/wallet") +@Api(value = "供应商-钱包", tags = "供应商-钱包") +@Validated public class WalletController extends BaseController { @Autowired @@ -53,20 +54,21 @@ } @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("供应商不能为空"); } - return walletService.getBySupplierId(); + + return returnData(R.SUCCESS.getCode(), walletService.getCurrentSupplier()); } @GetMapping("/page") -- Gitblit v1.9.3