From 4e01b27642aa6195e4c8a5f49a64e76dd7dea06d Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 07 Apr 2023 15:46:20 +0800
Subject: [PATCH] Merge branch 'hongloumeng' of http://120.27.238.55:7000/r/xc-mall into hongloumeng
---
src/main/java/cc/mrbird/febs/mall/controller/ViewMallOrderController.java | 27 +++++++++++++++++++++++++++
1 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallOrderController.java b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallOrderController.java
index 635b5e5..1d95c61 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallOrderController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallOrderController.java
@@ -39,6 +39,16 @@
}
/**
+ * 评论列表
+ * @return
+ */
+ @GetMapping("commentList")
+ @RequiresPermissions("commentList:view")
+ public String commentList() {
+ return FebsUtil.view("modules/order/commentList");
+ }
+
+ /**
* 订单-发货
* @param id
* @param model
@@ -67,6 +77,23 @@
return FebsUtil.view("modules/order/orderDetail");
}
+
+ /**
+ * 订单-资金流水
+ * @param id
+ * @param model
+ * @return
+ */
+
+
+ public static long idOrderMoneyFlow;
+ @GetMapping("orderMoneyFlow/{id}")
+ @RequiresPermissions("orderMoneyFlow:update")
+ public String orderMoneyFlow(@PathVariable long id, Model model) {
+ idOrderMoneyFlow = id;
+ return FebsUtil.view("modules/order/orderMoneyFlow");
+ }
+
/**
* 订单退款
* @return
--
Gitblit v1.9.1