From c8df15c5d52874b0cb1b53e27091ce1cc4cd6634 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sat, 25 Sep 2021 10:51:32 +0800
Subject: [PATCH] add overtime job
---
src/main/java/cc/mrbird/febs/mall/controller/ViewMallOrderController.java | 68 ++++++++++++++++++++++++++++++++--
1 files changed, 64 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 edfabe5..ab7d5a5 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;
@@ -24,6 +21,8 @@
private final IAdminMallOrderService adminMallOrderService;
public static long idFromMember;
+
+ public static long idFromRefund;
/**
* 订单列表
@@ -74,4 +73,65 @@
return FebsUtil.view("modules/order/refundList");
}
+ /**
+ * 退款详情
+ * @param id
+ * @param model
+ * @return
+ */
+ @GetMapping("seeRefund/{id}")
+ public String seeReceiveInfo(@PathVariable long id, Model model) {
+ idFromRefund = id;
+ 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");
+ }
+
+ /**
+ * 订单退款-同意并选择地址
+ * @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");
+ }
+
}
--
Gitblit v1.9.1