From e1dde4d2bf754b4d643ba6ab662af90c944145c3 Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Thu, 02 Mar 2023 10:12:50 +0800 Subject: [PATCH] 增加活动公告 --- src/main/java/cc/mrbird/febs/mall/controller/AdminSystemController.java | 2 +- src/main/java/cc/mrbird/febs/pay/controller/XcxPayController.java | 4 +++- src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html | 3 +++ src/main/resources/templates/febs/views/modules/system/agentAmountSet.html | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/mall/controller/AdminSystemController.java b/src/main/java/cc/mrbird/febs/mall/controller/AdminSystemController.java index b4d8cd2..694e8eb 100644 --- a/src/main/java/cc/mrbird/febs/mall/controller/AdminSystemController.java +++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminSystemController.java @@ -101,7 +101,7 @@ giveAmountDic.setValue(adminAgentAmountDto.getGiveAmount()); dataDictionaryCustomMapper.updateById(giveAmountDic); - return new FebsResponse().success(); + return new FebsResponse().success().message("操作成功"); } @PostMapping(value = "/agentDetail") diff --git a/src/main/java/cc/mrbird/febs/pay/controller/XcxPayController.java b/src/main/java/cc/mrbird/febs/pay/controller/XcxPayController.java index 90adf43..75c548b 100644 --- a/src/main/java/cc/mrbird/febs/pay/controller/XcxPayController.java +++ b/src/main/java/cc/mrbird/febs/pay/controller/XcxPayController.java @@ -166,7 +166,9 @@ giveAmount, MoneyFlowTypeEnum.RECHARGE_SEND.getValue(), rechargeNo+"ZS", - FlowTypeEnum.BALANCE.getValue()); + FlowTypeEnum.BALANCE.getValue(), + "充值赠送金额", + 2); memberWalletService.addBalance(giveAmount,memberId); } diff --git a/src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html b/src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html index 65b1474..8bf178f 100644 --- a/src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html +++ b/src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html @@ -42,6 +42,7 @@ <!-- <option value="16">系统拨付</option>--> <!-- <option value="17">抽奖</option>--> <option value="18">充值</option> + <option value="20">赠送金额</option> <!-- <option value="19">收益</option>--> </select> </div> @@ -164,6 +165,8 @@ return '<span>充值</span>' }else if (d.type === 19) { return '<span>收益</span>' + }else if (d.type === 20) { + return '<span>赠送金额</span>' }else{ return '' } diff --git a/src/main/resources/templates/febs/views/modules/system/agentAmountSet.html b/src/main/resources/templates/febs/views/modules/system/agentAmountSet.html index ff21c8c..fcf7164 100644 --- a/src/main/resources/templates/febs/views/modules/system/agentAmountSet.html +++ b/src/main/resources/templates/febs/views/modules/system/agentAmountSet.html @@ -110,7 +110,7 @@ febs.alert.warn(res.message); } }); - window.location.reload(); + // window.location.reload(); return false; }); }); -- Gitblit v1.9.1