From 12b95a4ef0392330f275f0a9fa9da42bb39bb5bd Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期二, 07 一月 2025 16:10:51 +0800
Subject: [PATCH] add:配置2
---
src/main/java/com/mzl/flower/web/payment/SettlementController.java | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 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..05ab24c 100644
--- a/src/main/java/com/mzl/flower/web/payment/SettlementController.java
+++ b/src/main/java/com/mzl/flower/web/payment/SettlementController.java
@@ -4,11 +4,12 @@
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.base.annotation.OperationLog;
import com.mzl.flower.dto.request.payment.OrderSettlementQueryDTO;
import com.mzl.flower.dto.response.payment.OrderSettlementDTO;
import com.mzl.flower.dto.response.payment.OrderSettlementListDTO;
+import com.mzl.flower.entity.log.OperationRecord;
+import com.mzl.flower.entity.payment.OrderSettlement;
import com.mzl.flower.schedule.ScheduleService;
import com.mzl.flower.service.payment.OrderSettlementService;
import io.swagger.annotations.Api;
@@ -22,6 +23,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 +46,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({
@@ -53,13 +63,17 @@
}
@GetMapping("/list/transfer")
+ @OperationLog(value = "结算转账", type = "settlement_list")
@ApiOperation(value = "结算转账")
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "结算id", required = true, dataType = "String", paramType = "query")
})
public ResponseEntity<ReturnDataDTO<?>> doSettlementTransfer(String id){
settlementService.doSettlementTransfer(id);
- return returnData(R.SUCCESS.getCode(), null);
+ OrderSettlement settlement = settlementService.selectOrderSettlementById(id);
+ String content = "结算转账：id：【" + id + "】，用户id【" + settlement.getUserId() + "】，结算金额：【" + settlement.getSettlementAmount() + "】";
+ OperationRecord operationRecord = getOperationRecord(content);
+ return returnData(R.SUCCESS.getCode(), null, operationRecord);
}
@GetMapping("/do")
--
Gitblit v1.9.3