From 560d503b8bad015a1f313e21330c921e15d991d1 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 02 Mar 2023 16:28:32 +0800
Subject: [PATCH] 增加活动公告

---
 src/main/java/cc/mrbird/febs/mall/controller/ViewMallOrderController.java |   98 ++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 96 insertions(+), 2 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 ab7d5a5..e8a8763 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallOrderController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallOrderController.java
@@ -3,6 +3,8 @@
 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.*;
 import lombok.RequiredArgsConstructor;
@@ -20,9 +22,21 @@
 
     private final IAdminMallOrderService adminMallOrderService;
 
+    private final MallOrderRefundMapper mallOrderRefundMapper;
+
     public static long idFromMember;
 
     public static long idFromRefund;
+
+    /**
+     * 订单列表
+     * @return
+     */
+    @GetMapping("orderRefundList")
+    @RequiresPermissions("orderRefundList:view")
+    public String orderRefundList() {
+        return FebsUtil.view("modules/order/orderRefundList");
+    }
 
     /**
      * 订单列表
@@ -35,6 +49,16 @@
     }
 
     /**
+     * 评论列表
+     * @return
+     */
+    @GetMapping("commentList")
+    @RequiresPermissions("commentList:view")
+    public String commentList() {
+        return FebsUtil.view("modules/order/commentList");
+    }
+
+    /**
      * 订单-发货
      * @param id
      * @param model
@@ -44,6 +68,7 @@
     @RequiresPermissions("deliverGoods:update")
     public String deliverGoods(@PathVariable long id, Model model) {
         AdminMallOrderVo data = adminMallOrderService.getMallOrderInfoById(id);
+        data.setExpressCom("中通快递");
         model.addAttribute("deliverInfo", data);
         return FebsUtil.view("modules/order/deliverGoods");
     }
@@ -79,10 +104,11 @@
      * @param model
      * @return
      */
-    @GetMapping("seeRefund/{id}")
+    @GetMapping("refunding/{id}")
+    @RequiresPermissions("refunding:view")
     public String seeReceiveInfo(@PathVariable long id, Model model) {
         idFromRefund = id;
-        return FebsUtil.view("modules/order/Refunding");
+        return FebsUtil.view("modules/order/refunding");
     }
 
     /**
@@ -134,4 +160,72 @@
         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");
+    }
+
+    /**
+     * 订单列表-统计商品份数
+     * @return
+     */
+    public static String orderIdsStr;
+    @GetMapping("/goodsStatistics/{statistics}")
+    @RequiresPermissions("goodsStatistics:update")
+    public String goodsStatistics(@PathVariable String statistics, Model model) {
+        orderIdsStr = statistics;
+        return FebsUtil.view("modules/order/goodsStatistics");
+    }
+
 }

--
Gitblit v1.9.1