From 528c681b62b56aca151beba65a95c2173c903334 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 15 七月 2025 18:00:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/admin/src/main/java/com/doumee/api/business/OrdersController.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/server/admin/src/main/java/com/doumee/api/business/OrdersController.java b/server/admin/src/main/java/com/doumee/api/business/OrdersController.java
index 7cc1c54..05784c8 100644
--- a/server/admin/src/main/java/com/doumee/api/business/OrdersController.java
+++ b/server/admin/src/main/java/com/doumee/api/business/OrdersController.java
@@ -4,6 +4,7 @@
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.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.Orders;
@@ -11,6 +12,7 @@
import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -80,11 +82,6 @@
@RequiresPermissions("business:orders:exportExcel")
public void exportExcel (@RequestBody PageWrap<Orders> pageWrap, HttpServletResponse response) {
List<Orders> ordersList = ordersService.findPage(pageWrap).getRecords();
-
-
-
-
-
ExcelExporter.build(Orders.class).export(ordersList, "璁㈠崟淇℃伅璁板綍", response);
}
@@ -94,4 +91,15 @@
public ApiResponse findById(@PathVariable Integer id) {
return ApiResponse.success(ordersService.findById(id));
}
+
+ @ApiOperation("骞冲彴鍙栨秷璁㈠崟")
+ @GetMapping("/cancel")
+ @RequiresPermissions("business:orders:update")
+ public ApiResponse cancel(@RequestParam Integer id) {
+ LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ ordersService.platformCancel(id,loginUserInfo);
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
+
+
}
--
Gitblit v1.9.3