From 9f0d686c76af97ab2ce2102783d0bc02fa56cb41 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 24 Sep 2021 16:47:17 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/xc-mall
---
src/main/java/cc/mrbird/febs/mall/controller/ViewMallOrderController.java | 40 ++++++++++++++++++++++++++++++++++++----
1 files changed, 36 insertions(+), 4 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 76722b5..0f061c5 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallOrderController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallOrderController.java
@@ -4,10 +4,7 @@
import cc.mrbird.febs.common.entity.FebsConstant;
import cc.mrbird.febs.common.utils.FebsUtil;
import cc.mrbird.febs.mall.service.IAdminMallOrderService;
-import cc.mrbird.febs.mall.vo.AdminMailGoodsDetailVo;
-import cc.mrbird.febs.mall.vo.AdminMallGoodsCategoryVo;
-import cc.mrbird.febs.mall.vo.AdminMallOrderVo;
-import cc.mrbird.febs.mall.vo.AdminOrderDetailVo;
+import cc.mrbird.febs.mall.vo.*;
import lombok.RequiredArgsConstructor;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.stereotype.Controller;
@@ -88,4 +85,39 @@
return FebsUtil.view("modules/order/Refunding");
}
+ /**
+ * 退款地址列表
+ * @return
+ */
+ @GetMapping("refundAddress")
+ @RequiresPermissions("refundAddress:view")
+ public String refundAddress() {
+ return FebsUtil.view("modules/order/refundAddress");
+ }
+
+
+ /**
+ * 退款地址-新增
+ * @return
+ */
+ @GetMapping("addAddress")
+ @RequiresPermissions("addAddress:add")
+ public String addAddress() {
+ return FebsUtil.view("modules/order/addAddress");
+ }
+
+ /**
+ * 退款地址-详情
+ * @param id
+ * @param model
+ * @return
+ */
+ @GetMapping("updateAddress/{id}")
+ @RequiresPermissions("updateAddress:update")
+ public String updateAddress(@PathVariable long id, Model model) {
+ AdminMallOrderRefundAddressVo data = adminMallOrderService.getMallOrderRefundAddressInfoById(id);
+ model.addAttribute("addressInfo", data);
+ return FebsUtil.view("modules/order/updateAddress");
+ }
+
}
--
Gitblit v1.9.1