From 2951c68cea68f6c0eab405fa5fec7b1d18665ac9 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 24 Sep 2021 19:06:53 +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 |   95 ++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 92 insertions(+), 3 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..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,8 +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.AdminMallGoodsCategoryVo;
-import cc.mrbird.febs.mall.vo.AdminMallOrderVo;
+import cc.mrbird.febs.mall.vo.*;
 import lombok.RequiredArgsConstructor;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.stereotype.Controller;
@@ -20,6 +19,10 @@
 public class ViewMallOrderController extends BaseController {
 
     private final IAdminMallOrderService adminMallOrderService;
+
+    public static long idFromMember;
+
+    public static long idFromRefund;
 
     /**
      * 订单列表
@@ -41,8 +44,94 @@
     @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");
+    }
+
+    /**
+     * 退款地址列表
+     * @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