From 85ccb0e999127b26bc6de7ea74552f216eaf0024 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Sat, 25 Sep 2021 18:15:03 +0800
Subject: [PATCH] 20210925

---
 src/main/java/cc/mrbird/febs/mall/controller/ViewMallOrderController.java |   40 ++++++++++++++++++++++++++++++++++++++++
 1 files changed, 40 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 0f061c5..9030282 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallOrderController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallOrderController.java
@@ -120,4 +120,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