From eeb3b46afe7da500bce62daad35ded0886df3b88 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期四, 09 一月 2025 18:31:12 +0800
Subject: [PATCH] Merge branch 'master-v4' of http://47.96.225.205:8888/r/flowerbackend-v2 into master-v4
---
src/main/java/com/mzl/flower/web/payment/SettlementController.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/mzl/flower/web/payment/SettlementController.java b/src/main/java/com/mzl/flower/web/payment/SettlementController.java
index 15797b9..196d9f3 100644
--- a/src/main/java/com/mzl/flower/web/payment/SettlementController.java
+++ b/src/main/java/com/mzl/flower/web/payment/SettlementController.java
@@ -4,8 +4,6 @@
import com.mzl.flower.base.BaseController;
import com.mzl.flower.base.R;
import com.mzl.flower.base.ReturnDataDTO;
-import com.mzl.flower.config.security.SecurityUtils;
-import com.mzl.flower.constant.Constants;
import com.mzl.flower.dto.request.payment.OrderSettlementQueryDTO;
import com.mzl.flower.dto.response.payment.OrderSettlementDTO;
import com.mzl.flower.dto.response.payment.OrderSettlementListDTO;
@@ -22,6 +20,8 @@
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletResponse;
@RestController
@RequestMapping("/api/settlement")
@@ -43,6 +43,13 @@
return returnData(R.SUCCESS.getCode(), settlementService.selectSettlementList(page, dto));
}
+ @GetMapping("/export")
+ @ApiOperation(value = "结算列表导出")
+ public void exportSettlementList(HttpServletResponse response, OrderSettlementQueryDTO dto) {
+ settlementService.exportSettlementList(response, dto);
+ }
+
+
@GetMapping("/list/view")
@ApiOperation(value = "结算详情")
@ApiImplicitParams({
--
Gitblit v1.9.3