From d867207d4bf46378718927444c7cef404b4a6a03 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 24 Sep 2021 15:19:50 +0800
Subject: [PATCH] 20210924
---
src/main/java/cc/mrbird/febs/mall/controller/ViewMallOrderController.java | 45 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 44 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 479ea22..76722b5 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallOrderController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallOrderController.java
@@ -4,8 +4,10 @@
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 lombok.RequiredArgsConstructor;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.stereotype.Controller;
@@ -20,6 +22,10 @@
public class ViewMallOrderController extends BaseController {
private final IAdminMallOrderService adminMallOrderService;
+
+ public static long idFromMember;
+
+ public static long idFromRefund;
/**
* 订单列表
@@ -41,8 +47,45 @@
@RequiresPermissions("deliverGoods:update")
public String deliverGoods(@PathVariable long id, Model model) {
AdminMallOrderVo data = adminMallOrderService.getMallOrderInfoById(id);
- model.addAttribute("orderInfo", data);
+ model.addAttribute("deliverInfo", data);
return FebsUtil.view("modules/order/deliverGoods");
}
+ /**
+ * 订单-详情
+ * @param id
+ * @param model
+ * @return
+ */
+ @GetMapping("orderDetail/{id}")
+ @RequiresPermissions("orderDetail:view")
+ public String orderDetail(@PathVariable long id, Model model) {
+ idFromMember = id;
+ AdminOrderDetailVo data = adminMallOrderService.getMallOrderDetailById(id);
+ model.addAttribute("orderDetail", data);
+ return FebsUtil.view("modules/order/orderDetail");
+ }
+
+ /**
+ * 订单退款
+ * @return
+ */
+ @GetMapping("refundList")
+ @RequiresPermissions("refundList:view")
+ public String refundList() {
+ 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");
+ }
+
}
--
Gitblit v1.9.1