From 3819ff43fe6e89adf97cf2504e9d7da1a2ac40f2 Mon Sep 17 00:00:00 2001 From: cloudroam <cloudroam> Date: 星期二, 29 十月 2024 11:35:38 +0800 Subject: [PATCH] fix:短信模板调整 --- src/main/java/com/mzl/flower/web/v2/wallet/WalletBillRecordController.java | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/mzl/flower/web/v2/wallet/WalletBillRecordController.java b/src/main/java/com/mzl/flower/web/v2/wallet/WalletBillRecordController.java index 5a2d202..30c458a 100644 --- a/src/main/java/com/mzl/flower/web/v2/wallet/WalletBillRecordController.java +++ b/src/main/java/com/mzl/flower/web/v2/wallet/WalletBillRecordController.java @@ -5,11 +5,10 @@ import com.mzl.flower.base.BaseController; import com.mzl.flower.base.R; import com.mzl.flower.base.ReturnDataDTO; -import com.mzl.flower.dto.request.report.QueryPartnerOrderDTO; +import com.mzl.flower.dto.request.wallet.QueryWalletBillDTO; import com.mzl.flower.dto.request.wallet.QueryWalletBillRecordDTO; -import com.mzl.flower.dto.request.wallet.QueryWalletWithdrawDTO; import com.mzl.flower.dto.response.wallet.WalletBillRecordVO; -import com.mzl.flower.dto.response.wallet.WalletWithdrawRecordVO; +import com.mzl.flower.service.supplier.SupplierService; import com.mzl.flower.service.wallet.WalletBillRecordService; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -31,6 +30,8 @@ @Autowired private WalletBillRecordService walletBillRecordService; + @Autowired + private SupplierService supplierService; @GetMapping("/list") @ApiOperation(value = "供应商财务-分页", httpMethod = "GET") @@ -38,10 +39,18 @@ return returnData(R.SUCCESS.getCode(), walletBillRecordService.queryPage(dto, page)); } + @GetMapping("/page") + public ResponseEntity<ReturnDataDTO<Page<WalletBillRecordVO>>> page(Page page, QueryWalletBillDTO dto + ) { + // 根据当前用户获取供应商 + dto.setSupplierId(supplierService.getCurrentSupplier().getId()); + return returnData(R.SUCCESS.getCode(), walletBillRecordService.getPage(page, dto)); + + } @GetMapping({"/export"}) @ApiOperation(value = "供应商财务导出") - public void partnerExportSales(HttpServletResponse response, @Validated QueryWalletBillRecordDTO dto){ + public void partnerExportSales(HttpServletResponse response, @Validated QueryWalletBillRecordDTO dto) { walletBillRecordService.exportSupplierFinanceList(response, dto); } - } + -- Gitblit v1.9.3