From 7ee466ebc953bb5640bcf42f2b8e2a87aa471c21 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 15 四月 2026 20:12:21 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxinglijicun
---
server/admin/src/main/java/com/doumee/api/business/OrdersController.java | 89 +++++++++++++++++++++++++++-----------------
1 files changed, 55 insertions(+), 34 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 983a2e0..5a7f66b 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
@@ -2,17 +2,18 @@
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.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.Orders;
+import com.doumee.dao.dto.ConfirmArriveDTO;
+import com.doumee.dao.dto.DispatchDTO;
+import com.doumee.dao.vo.OrderDetailVO;
+import com.doumee.dao.vo.OrderDispatchVO;
+import com.doumee.dao.vo.OrderSummaryVO;
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.*;
@@ -22,24 +23,17 @@
import java.util.List;
/**
- * @author 姹熻箘韫�
- * @date 2025/07/09 12:00
+ * 瀵勫瓨璁㈠崟绠＄悊
+ * @author rk
+ * @date 2026/04/10
*/
-@Api(tags = "璁㈠崟淇℃伅璁板綍")
+@Api(tags = "瀵勫瓨璁㈠崟")
@RestController
@RequestMapping("/business/orders")
public class OrdersController extends BaseController {
@Autowired
private OrdersService ordersService;
-
- @PreventRepeat
- @ApiOperation("鏂板缓")
- @PostMapping("/create")
- @RequiresPermissions("business:orders:create")
- public ApiResponse create(@RequestBody Orders orders) {
- return ApiResponse.success(ordersService.create(orders));
- }
@ApiOperation("鏍规嵁ID鍒犻櫎")
@GetMapping("/delete/{id}")
@@ -53,7 +47,7 @@
@GetMapping("/delete/batch")
@RequiresPermissions("business:orders:delete")
public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
- String [] idArray = ids.split(",");
+ String[] idArray = ids.split(",");
List<Integer> idList = new ArrayList<>();
for (String id : idArray) {
idList.add(Integer.valueOf(id));
@@ -62,43 +56,70 @@
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")
@RequiresPermissions("business:orders:query")
- public ApiResponse<PageData<Orders>> findPage (@RequestBody PageWrap<Orders> pageWrap) {
+ public ApiResponse<PageData<Orders>> findPage(@RequestBody PageWrap<Orders> pageWrap) {
return ApiResponse.success(ordersService.findPage(pageWrap));
+ }
+
+ @ApiOperation("璁㈠崟姹囨�荤粺璁�")
+ @PostMapping("/summary")
+ @RequiresPermissions("business:orders:query")
+ public ApiResponse<OrderSummaryVO> findSummary(@RequestBody PageWrap<Orders> pageWrap) {
+ return ApiResponse.success(ordersService.findSummary(pageWrap));
}
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
@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);
+ public void exportExcel(@RequestBody PageWrap<Orders> pageWrap, HttpServletResponse response) {
+ ExcelExporter.build(Orders.class).export(ordersService.findPage(pageWrap).getRecords(), "瀵勫瓨璁㈠崟", 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")
+ @ApiOperation("璁㈠崟璇︽儏")
+ @GetMapping("/detail/{id}")
+ @RequiresPermissions("business:orders:query")
+ public ApiResponse<OrderDetailVO> findDetail(@PathVariable Integer id) {
+ return ApiResponse.success(ordersService.findDetail(id));
+ }
+
+ @ApiOperation("鎵嬪姩娲惧崟淇℃伅")
+ @GetMapping("/dispatch/{id}")
+ @RequiresPermissions("business:orders:query")
+ public ApiResponse<OrderDispatchVO> findDispatchInfo(@PathVariable Integer id) {
+ return ApiResponse.success(ordersService.findDispatchInfo(id));
+ }
+
+ @ApiOperation("璁㈠崟娲惧崟")
+ @PostMapping("/dispatch")
@RequiresPermissions("business:orders:update")
- public ApiResponse cancel(@RequestParam Integer id) {
- LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
- ordersService.platformCancel(id,loginUserInfo);
- return ApiResponse.success("鎿嶄綔鎴愬姛");
+ public ApiResponse dispatch(@RequestBody DispatchDTO dto) {
+ ordersService.dispatch(dto);
+ return ApiResponse.success(null);
+ }
+
+ @ApiOperation("纭椤惧鍒板簵")
+ @PostMapping("/confirmArrived")
+ @RequiresPermissions("business:orders:update")
+ public ApiResponse confirmArrived(@RequestBody ConfirmArriveDTO dto) {
+ ordersService.confirmCustomerArrived(dto.getOrderId(), dto.getShopId());
+ return ApiResponse.success(null);
}
}
--
Gitblit v1.9.3