From bad4cadc4c4bc735e97247918a0555bfc1278798 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 24 Oct 2023 17:19:08 +0800
Subject: [PATCH] 版本管理
---
src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java
index 8b66b10..75d3686 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java
@@ -85,6 +85,18 @@
}
/**
+ * 订单列表-自提订单
+ *
+ * @param id
+ * @return
+ */
+ @GetMapping("takeGoods/{id}")
+ @ControllerEndpoint(operation = "订单列表-自提订单", exceptionMessage = "操作失败")
+ public FebsResponse takeGoods(@NotNull(message = "{required}") @PathVariable Long id) {
+ return adminMallOrderService.takeGoods(id);
+ }
+
+ /**
* 订单列表-删除订单
*
* @param id
@@ -416,5 +428,17 @@
public FebsResponse showStateSwitchOff(@NotNull(message = "{required}") @PathVariable Long id) {
return adminMallOrderService.showStateSwitchOff(id);
}
+ /**
+ * 订单列表-资金流水
+ */
+ @GetMapping("/orderMoneyFlow")
+ public FebsResponse orderMoneyFlow(QueryRequest request, MallOrderInfo mallOrderInfo, Integer parentId) {
+ if (parentId == null) {
+ ViewMallOrderController.idOrderMoneyFlow = 0;
+ }
+ mallOrderInfo.setId(ViewMallOrderController.idOrderMoneyFlow);
+ Map<String, Object> dataTable = getDataTable(adminMallOrderService.orderMoneyFlow(request, mallOrderInfo));
+ return new FebsResponse().success().data(dataTable);
+ }
}
--
Gitblit v1.9.1