From 4ab710d8d70017f090dd9601099ded1a50a58a10 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 27 四月 2026 22:34:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/admin/src/main/java/com/doumee/api/business/OrdersRefundController.java | 28 ++++++++++++++++++++++++++--
1 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/server/admin/src/main/java/com/doumee/api/business/OrdersRefundController.java b/server/admin/src/main/java/com/doumee/api/business/OrdersRefundController.java
index fa4d284..e8acaaa 100644
--- a/server/admin/src/main/java/com/doumee/api/business/OrdersRefundController.java
+++ b/server/admin/src/main/java/com/doumee/api/business/OrdersRefundController.java
@@ -1,17 +1,22 @@
package com.doumee.api.business;
import com.doumee.api.BaseController;
+import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.OrdersRefund;
+import com.doumee.dao.dto.OrdersRefundPageDTO;
+import com.doumee.dao.vo.OrdersRefundPageVO;
import com.doumee.service.business.OrdersRefundService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.List;
@@ -69,8 +74,8 @@
@ApiOperation("鍒嗛〉鏌ヨ")
@PostMapping("/page")
@RequiresPermissions("business:ordersRefund:query")
- public ApiResponse<PageData<OrdersRefund>> findPage(@RequestBody PageWrap<OrdersRefund> pageWrap) {
- return ApiResponse.success(ordersRefundService.findPage(pageWrap));
+ public ApiResponse<PageData<OrdersRefundPageVO>> findPage(@RequestBody PageWrap<OrdersRefundPageDTO> pageWrap) {
+ return ApiResponse.success(ordersRefundService.refundPage(pageWrap));
}
@ApiOperation("鏍规嵁ID鏌ヨ")
@@ -79,4 +84,23 @@
public ApiResponse findById(@PathVariable Integer id) {
return ApiResponse.success(ordersRefundService.findById(id));
}
+
+ @PreventRepeat
+ @ApiOperation("閲嶆柊閫�娆�")
+ @PostMapping("/retryRefund/{id}")
+ @RequiresPermissions("business:ordersRefund:update")
+ public ApiResponse retryRefund(@PathVariable Integer id) {
+ ordersRefundService.retryRefund(id);
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
+
+ @ApiOperation("瀵煎嚭Excel")
+ @PostMapping("/exportExcel")
+ @RequiresPermissions("business:ordersRefund:exportExcel")
+ public void exportExcel(@RequestBody PageWrap<OrdersRefundPageDTO> pageWrap, HttpServletResponse response) {
+ pageWrap.setPage(1);
+ pageWrap.setCapacity(99999);
+ PageData<OrdersRefundPageVO> pageData = ordersRefundService.refundPage(pageWrap);
+ ExcelExporter.build(OrdersRefundPageVO.class).export(pageData.getRecords(), "閫�娆捐褰�", response);
+ }
}
--
Gitblit v1.9.3