From bd6229ebd9cb543a22944ecb1142fad92b675dce Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 13 十月 2025 14:26:25 +0800
Subject: [PATCH] bug 修复
---
server/admin/src/main/java/com/doumee/api/business/OrdersController.java | 32 +++++++++++++++++++++++---------
1 files changed, 23 insertions(+), 9 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 998fd71..983a2e0 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,12 +4,15 @@
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;
import com.doumee.service.business.OrdersService;
+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.*;
@@ -59,13 +62,13 @@
return ApiResponse.success(null);
}
- @ApiOperation("鏍规嵁ID淇敼")
- @PostMapping("/updateById")
- @RequiresPermissions("business:orders:update")
- public ApiResponse updateById(@RequestBody Orders orders) {
- ordersService.updateById(orders);
- return ApiResponse.success(null);
- }
+// @ApiOperation("鏍规嵁ID淇敼")
+// @PostMapping("/updateById")
+// @RequiresPermissions("business:orders:update")
+// public ApiResponse updateById(@RequestBody Orders orders) {
+// ordersService.updateById(orders);
+// return ApiResponse.success(null);
+// }
@ApiOperation("鍒嗛〉鏌ヨ")
@PostMapping("/page")
@@ -78,13 +81,24 @@
@PostMapping("/exportExcel")
@RequiresPermissions("business:orders:exportExcel")
public void exportExcel (@RequestBody PageWrap<Orders> pageWrap, HttpServletResponse response) {
- ExcelExporter.build(Orders.class).export(ordersService.findPage(pageWrap).getRecords(), "璁㈠崟淇℃伅璁板綍", response);
+ List<Orders> ordersList = ordersService.findPage(pageWrap).getRecords();
+ ExcelExporter.build(Orders.class).export(ordersList, "璁㈠崟淇℃伅璁板綍", response);
}
- @ApiOperation("鏍规嵁ID鏌ヨ")
+ @ApiOperation("鏍规嵁ID鏌ヨ ")
@GetMapping("/{id}")
@RequiresPermissions("business:orders:query")
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