From ab13cdcfe8c9852be7a606c272a42bb0fa7d2cf1 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 22 Dec 2022 15:51:47 +0800
Subject: [PATCH] 20221221
---
src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java | 25 +++++++++++++++++++++++++
1 files changed, 25 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..3a6f67e 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
@@ -417,4 +429,17 @@
return adminMallOrderService.showStateSwitchOff(id);
}
+ /**
+ * 订单列表-资金流水
+ */
+ @GetMapping("/moneyFlow")
+ public FebsResponse moneyFlow(QueryRequest request, MallOrderInfo mallOrderInfo, Integer parentId) {
+ if (parentId == null) {
+ ViewMallOrderController.seeOrderFlowByOrderId = 0;
+ }
+ mallOrderInfo.setId(ViewMallOrderController.seeOrderFlowByOrderId);
+ Map<String, Object> dataTable = getDataTable(adminMallOrderService.moneyFlow(request, mallOrderInfo));
+ return new FebsResponse().success().data(dataTable);
+ }
+
}
--
Gitblit v1.9.1