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 | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 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 903ce69..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,8 +2,11 @@ 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.*; @@ -23,10 +26,21 @@ 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"); + } /** * 订单列表 @@ -205,4 +219,21 @@ 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