From c619972c50577bb699be6ee099b5e2741882fabb Mon Sep 17 00:00:00 2001 From: KKSU <15274802129@163.com> Date: Wed, 27 Dec 2023 16:15:59 +0800 Subject: [PATCH] 直推奖励,冻结的用户,则直推奖励销毁,用户未冻结才能领取成功 --- src/main/java/cc/mrbird/febs/mall/controller/ViewMallOrderController.java | 180 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 176 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..cac16e5 100644 --- a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallOrderController.java +++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallOrderController.java @@ -2,12 +2,14 @@ import cc.mrbird.febs.common.controller.BaseController; import cc.mrbird.febs.common.entity.FebsConstant; +import cc.mrbird.febs.common.enumerates.DataDictionaryEnum; import cc.mrbird.febs.common.utils.FebsUtil; +import cc.mrbird.febs.mall.entity.DataDictionaryCustom; +import cc.mrbird.febs.mall.entity.MallOrderRefund; +import cc.mrbird.febs.mall.mapper.DataDictionaryCustomMapper; +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 +25,22 @@ private final IAdminMallOrderService adminMallOrderService; + private final MallOrderRefundMapper mallOrderRefundMapper; + private final DataDictionaryCustomMapper dataDictionaryCustomMapper; + public static long idFromMember; + + public static long idFromRefund; + + /** + * 订单列表 + * @return + */ + @GetMapping("orderRefundList") + @RequiresPermissions("orderRefundList:view") + public String orderRefundList() { + return FebsUtil.view("modules/order/orderRefundList"); + } /** * 订单列表 @@ -33,6 +50,16 @@ @RequiresPermissions("orderList:view") public String orderList() { return FebsUtil.view("modules/order/orderList"); + } + + /** + * 评论列表 + * @return + */ + @GetMapping("commentList") + @RequiresPermissions("commentList:view") + public String commentList() { + return FebsUtil.view("modules/order/commentList"); } /** @@ -64,4 +91,149 @@ 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"); + } + + /** + * 订单列表-统计商品份数 + * @return + */ +// public static String orderIdsStr; + @GetMapping("/goodsStatistics/{statistics}") + @RequiresPermissions("goodsStatistics:update") + public String goodsStatistics(@PathVariable String statistics, Model model) { + dataDictionaryCustomMapper.updateDicValueByTypeAndCode( + DataDictionaryEnum.IDS_GOODS_STATISTICS.getType(), + DataDictionaryEnum.IDS_GOODS_STATISTICS.getCode(), + statistics + ); +// orderIdsStr = statistics; + return FebsUtil.view("modules/order/goodsStatistics"); + } + } -- Gitblit v1.9.1