From 665109c87954b34e9dec260c623c995863896675 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sat, 25 Sep 2021 18:48:55 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/mall/controller/ViewMallOrderController.java | 43 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 42 insertions(+), 1 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 0f061c5..b3274cb 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallOrderController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallOrderController.java
@@ -79,7 +79,8 @@
* @param model
* @return
*/
- @GetMapping("seeRefund/{id}")
+ @GetMapping("refunding/{id}")
+ @RequiresPermissions("refunding:view")
public String seeReceiveInfo(@PathVariable long id, Model model) {
idFromRefund = id;
return FebsUtil.view("modules/order/Refunding");
@@ -120,4 +121,44 @@
return FebsUtil.view("modules/order/updateAddress");
}
+ /**
+ * 订单退款-同意并选择地址
+ * @param id
+ * @param model
+ * @return
+ */
+ @GetMapping("withAddress/{id}")
+ @RequiresPermissions("withAddress:update")
+ public String withAddress(@PathVariable long id, Model model) {
+ AdminMallOrderRefundVo data = adminMallOrderService.getMallOrderRefundInfoById(id);
+ model.addAttribute("withAddress", data);
+ return FebsUtil.view("modules/order/withAddress");
+ }
+
+ /**
+ * 商家支付方式-列表
+ * @return
+ */
+ @GetMapping("payMethodList")
+ @RequiresPermissions("payMethodList:view")
+ public String payMethodList() {
+ return FebsUtil.view("modules/order/payMethodList");
+ }
+
+
+
+ /**
+ * 商家支付方式-详情
+ * @param id
+ * @param model
+ * @return
+ */
+ @GetMapping("payMethodEdit/{id}")
+ @RequiresPermissions("payMethodEdit:update")
+ public String payMethodEdit(@PathVariable long id, Model model) {
+ AdminMallPayMethodEditVo data = adminMallOrderService.getMallPayMethodEditInfoById(id);
+ model.addAttribute("payMethodEdit", data);
+ return FebsUtil.view("modules/order/payMethodEdit");
+ }
+
}
--
Gitblit v1.9.1