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 | 65 +++++++++++++++++++++++++++++++- 1 files changed, 63 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..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,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; @@ -19,6 +21,8 @@ public class ViewMallOrderController extends BaseController { private final IAdminMallOrderService adminMallOrderService; + + private final MallOrderRefundMapper mallOrderRefundMapper; public static long idFromMember; @@ -79,10 +83,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 +139,60 @@ 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