From 27f8fa9cba4bcf96c82dba9a48d6dc2855d0ea9c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 16 Jun 2022 18:24:07 +0800
Subject: [PATCH] fix

---
 src/main/java/cc/mrbird/febs/mall/controller/ViewMallOrderController.java |  139 +++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 135 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 f149920..635b5e5 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallOrderController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallOrderController.java
@@ -3,11 +3,10 @@
 import cc.mrbird.febs.common.controller.BaseController;
 import cc.mrbird.febs.common.entity.FebsConstant;
 import cc.mrbird.febs.common.utils.FebsUtil;
+import cc.mrbird.febs.mall.entity.MallOrderRefund;
+import cc.mrbird.febs.mall.mapper.MallOrderRefundMapper;
 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;
@@ -23,7 +22,11 @@
 
     private final IAdminMallOrderService adminMallOrderService;
 
+    private final MallOrderRefundMapper mallOrderRefundMapper;
+
     public static long idFromMember;
+
+    public static long idFromRefund;
 
     /**
      * 订单列表
@@ -64,4 +67,132 @@
         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("refunding/{id}")
+    @RequiresPermissions("refunding:view")
+    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");
+    }
+
+    /**
+     * 商家支付方式-列表
+     * @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");
+    }
+
+    /**
+     * 退款记录-订单详情
+     * @param id
+     * @param model
+     * @return
+     */
+    @GetMapping("refundOrderDetail/{id}")
+    @RequiresPermissions("refundOrderDetail:view")
+    public String refundOrderDetail(@PathVariable long id, Model model) {
+        MallOrderRefund mallOrderRefund = mallOrderRefundMapper.selectById(id);
+        Long orderId = mallOrderRefund.getOrderId();
+        AdminOrderDetailVo data = adminMallOrderService.getMallOrderDetailById(orderId);
+        model.addAttribute("refundOrderDetail", data);
+        return FebsUtil.view("modules/order/refundOrderDetail");
+    }
+
+    /**
+     * 退款记录-收款方式
+     * @param id
+     * @param model
+     * @return
+     */
+    @GetMapping("refundPayInfo/{id}")
+    @RequiresPermissions("refundPayInfo:update")
+    public String refundPayInfo(@PathVariable long id, Model model) {
+        AdminMallMemberPaymentVo data = adminMallOrderService.getMallMemberRefundPayInfoByFlowId(id);
+        model.addAttribute("refundPayInfo", data);
+        return FebsUtil.view("modules/order/refundPayInfo");
+    }
+
 }

--
Gitblit v1.9.1