From c3f2f93821ac8d351fe7c9d1f0f28c39b36cfef1 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 01 Mar 2023 18:01:06 +0800
Subject: [PATCH] 增加活动公告
---
src/main/resources/templates/febs/views/index.html | 8 ++++----
src/main/java/cc/mrbird/febs/mall/controller/AdminSystemController.java | 7 +++++--
src/main/resources/templates/febs/views/modules/system/agentAmountSet.html | 6 +++++-
src/main/java/cc/mrbird/febs/system/controller/LoginController.java | 16 ++++++++--------
4 files changed, 22 insertions(+), 15 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 9ca3b6f..b4d8cd2 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminSystemController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminSystemController.java
@@ -1,5 +1,6 @@
package cc.mrbird.febs.mall.controller;
+import cc.mrbird.febs.common.annotation.ControllerEndpoint;
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.enumerates.DataDictionaryEnum;
import cc.mrbird.febs.mall.dto.AdminAgentAmountDto;
@@ -80,8 +81,10 @@
if(ObjectUtil.isEmpty(adminAgentAmountDto.getActivityBulletin())){
return new FebsResponse().fail().message("活动公告不能为空");
}
- if(ObjectUtil.isEmpty(adminAgentAmountDto.getActivityBulletin())
- || BigDecimal.ZERO.compareTo(new BigDecimal(adminAgentAmountDto.getActivityBulletin())) > 0){
+ if(ObjectUtil.isEmpty(adminAgentAmountDto.getGiveAmount())){
+ return new FebsResponse().fail().message("请输入正确的赠送金额");
+ }
+ if(BigDecimal.ZERO.compareTo(new BigDecimal(adminAgentAmountDto.getGiveAmount())) > 0){
return new FebsResponse().fail().message("请输入正确的赠送金额");
}
}
diff --git a/src/main/java/cc/mrbird/febs/system/controller/LoginController.java b/src/main/java/cc/mrbird/febs/system/controller/LoginController.java
index 81f7b7f..3f65232 100644
--- a/src/main/java/cc/mrbird/febs/system/controller/LoginController.java
+++ b/src/main/java/cc/mrbird/febs/system/controller/LoginController.java
@@ -100,8 +100,8 @@
//支付统计
data.put("wechatPay",mallOrderInfoMapper.selectSumAmountByPayMethodAndStatue(OrderPayMethodEnum.WECHAT.getName(), OrderStatusEnum.FINISH.getValue()));
- data.put("alipayPay",mallOrderInfoMapper.selectSumAmountByPayMethodAndStatue(OrderPayMethodEnum.ALIPAY.getName(), OrderStatusEnum.FINISH.getValue()));
- data.put("scorePay",mallOrderInfoMapper.selectSumAmountByPayMethodAndStatue(OrderPayMethodEnum.SCORE.getName(), OrderStatusEnum.FINISH.getValue()));
+// data.put("alipayPay",mallOrderInfoMapper.selectSumAmountByPayMethodAndStatue(OrderPayMethodEnum.ALIPAY.getName(), OrderStatusEnum.FINISH.getValue()));
+// data.put("scorePay",mallOrderInfoMapper.selectSumAmountByPayMethodAndStatue(OrderPayMethodEnum.SCORE.getName(), OrderStatusEnum.FINISH.getValue()));
data.put("balancePay",mallOrderInfoMapper.selectSumAmountByPayMethodAndStatue(OrderPayMethodEnum.BALANCE.getName(), OrderStatusEnum.FINISH.getValue()));
@@ -112,13 +112,13 @@
//会员数据
data.put("totalMember",mallMemberMapper.selectCount(new QueryWrapper<>()) );
- QueryWrapper<MallMember> formalMember = new QueryWrapper<>();
- formalMember.ne("level", AgentLevelEnum.ZERO_LEVEL.name());
- data.put("formalMember",mallMemberMapper.selectCount(formalMember));
+// QueryWrapper<MallMember> formalMember = new QueryWrapper<>();
+// formalMember.ne("level", AgentLevelEnum.ZERO_LEVEL.name());
+// data.put("formalMember",mallMemberMapper.selectCount(formalMember));
- QueryWrapper<MallMember> informalMember = new QueryWrapper<>();
- informalMember.eq("level", AgentLevelEnum.ZERO_LEVEL.name());
- data.put("informalMember",mallMemberMapper.selectCount(informalMember));
+// QueryWrapper<MallMember> informalMember = new QueryWrapper<>();
+// informalMember.eq("level", AgentLevelEnum.ZERO_LEVEL.name());
+// data.put("informalMember",mallMemberMapper.selectCount(informalMember));
QueryWrapper<MallMember> todayMember = new QueryWrapper<>();
todayMember.like("CREATED_TIME", DateUtil.today());
diff --git a/src/main/resources/templates/febs/views/index.html b/src/main/resources/templates/febs/views/index.html
index 9968cfa..f89ff7e 100644
--- a/src/main/resources/templates/febs/views/index.html
+++ b/src/main/resources/templates/febs/views/index.html
@@ -241,15 +241,15 @@
.find('#lastMonth').text(data.lastMonth).end()
//会员信息
.find('#totalMember').text(data.totalMember).end()
- .find('#formalMember').text(data.formalMember).end()
- .find('#informalMember').text(data.informalMember).end()
+ // .find('#formalMember').text(data.formalMember).end()
+ // .find('#informalMember').text(data.informalMember).end()
.find('#todayMember').text(data.todayMember).end()
.find('#thisMonthMember').text(data.thisMonthMember).end()
.find('#lastMonthMember').text(data.lastMonthMember).end()
.find('#wechatPay').text(data.wechatPay).end()
- .find('#alipayPay').text(data.alipayPay).end()
- .find('#scorePay').text(data.scorePay).end()
+ // .find('#alipayPay').text(data.alipayPay).end()
+ // .find('#scorePay').text(data.scorePay).end()
.find('#balancePay').text(data.balancePay).end()
.find('#user-dept').text(currentUser.deptName ? currentUser.deptName : '暂无所属部门').end()
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 deea23d..ff21c8c 100644
--- a/src/main/resources/templates/febs/views/modules/system/agentAmountSet.html
+++ b/src/main/resources/templates/febs/views/modules/system/agentAmountSet.html
@@ -104,7 +104,11 @@
form.on('submit(agent-amount-set-form-submit)', function (data) {
console.log(data);
febs.post(ctx + 'admin/system/agentAmountSetSetting', data.field, function (res) {
- febs.alert.success('设置成功');
+ if (res.code == 200) {
+ febs.alert.success(res.message);
+ } else {
+ febs.alert.warn(res.message);
+ }
});
window.location.reload();
return false;
--
Gitblit v1.9.1