From 09d498d50765b58b048bdf0a81e4ff1765439bef Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 22 Aug 2023 16:43:30 +0800
Subject: [PATCH] 后台修改
---
src/main/resources/templates/febs/views/index.html | 49 +++++++++++++++++++++++-
src/main/java/cc/mrbird/febs/system/controller/LoginController.java | 16 +++++---
src/main/java/cc/mrbird/febs/dapp/mapper/DappWalletMineDao.java | 2 +
src/main/resources/mapper/dapp/DappWalletMineDao.xml | 5 ++
4 files changed, 64 insertions(+), 8 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/mapper/DappWalletMineDao.java b/src/main/java/cc/mrbird/febs/dapp/mapper/DappWalletMineDao.java
index ee468e2..a040731 100644
--- a/src/main/java/cc/mrbird/febs/dapp/mapper/DappWalletMineDao.java
+++ b/src/main/java/cc/mrbird/febs/dapp/mapper/DappWalletMineDao.java
@@ -23,4 +23,6 @@
List<DappWalletMineEntity> selectAmountThanZero();
void addTotalAndaddAvailableById(@Param("amount") BigDecimal availableAmount, @Param("memberId") Long memberId);
+
+ BigDecimal selectTotal();
}
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 669941e..e9d6360 100644
--- a/src/main/java/cc/mrbird/febs/system/controller/LoginController.java
+++ b/src/main/java/cc/mrbird/febs/system/controller/LoginController.java
@@ -6,10 +6,7 @@
import cc.mrbird.febs.common.exception.FebsException;
import cc.mrbird.febs.common.service.ValidateCodeService;
import cc.mrbird.febs.common.utils.Md5Util;
-import cc.mrbird.febs.dapp.mapper.DappFundFlowDao;
-import cc.mrbird.febs.dapp.mapper.DappMemberDao;
-import cc.mrbird.febs.dapp.mapper.DappWalletCoinDao;
-import cc.mrbird.febs.dapp.mapper.MallOrderInfoMapper;
+import cc.mrbird.febs.dapp.mapper.*;
import cc.mrbird.febs.monitor.entity.LoginLog;
import cc.mrbird.febs.monitor.service.ILoginLogService;
import cc.mrbird.febs.system.entity.User;
@@ -48,6 +45,8 @@
private final DappMemberDao dappMemberDao;
private final DappWalletCoinDao dappWalletCoinDao;
private final DappFundFlowDao dappFundFlowDao;
+ private final DappWalletMineDao dappWalletMineDao;
+ private final MallAchieveRecordMapper mallAchieveRecordMapper;
@PostMapping("login")
@Limit(key = "login", period = 60, count = 10, name = "登录接口", prefix = "limit")
@@ -102,6 +101,11 @@
List<Map<String, Object>> lastSevenUserVisitCount = this.loginLogService.findLastSevenDaysVisitCount(param);
data.put("lastSevenUserVisitCount", lastSevenUserVisitCount);
+ data.put("totalAmount", dappWalletCoinDao.selectTotal());
+ data.put("totalScore", dappWalletMineDao.selectTotal());
+ data.put("totalPackage", dappMemberDao.selectAllBalance(null));
+ data.put("totalAchieve", mallAchieveRecordMapper.selectAchieveTotal(null,null));
+
data.put("orderAmountTotal", dappMemberDao.selectOrderAmountByTime(null, null));
data.put("orderAmountMonth", dappMemberDao.selectOrderAmountByTime("M", new Date()));
data.put("orderAmountToday", dappMemberDao.selectOrderAmountByTime("D", new Date()));
@@ -130,8 +134,8 @@
data.put("releasePackageTotal", dappFundFlowDao.selectSumAmountByType(29));
data.put("releasePackageToday", dappFundFlowDao.selectSumAmountByTypeAndDate(29, DateUtil.date()));
- data.put("releasePackageTotal", dappFundFlowDao.selectSumAmountByType(42));
- data.put("releasePackageToday", dappFundFlowDao.selectSumAmountByTypeAndDate(42, DateUtil.date()));
+ data.put("sendPackageTotal", dappFundFlowDao.selectSumAmountByType(42));
+ data.put("sendPackageToday", dappFundFlowDao.selectSumAmountByTypeAndDate(42, DateUtil.date()));
return new FebsResponse().success().data(data);
diff --git a/src/main/resources/mapper/dapp/DappWalletMineDao.xml b/src/main/resources/mapper/dapp/DappWalletMineDao.xml
index 878489e..3341917 100644
--- a/src/main/resources/mapper/dapp/DappWalletMineDao.xml
+++ b/src/main/resources/mapper/dapp/DappWalletMineDao.xml
@@ -46,4 +46,9 @@
available_amount = available_amount + #{amount}
where member_id=#{memberId}
</update>
+
+ <select id="selectTotal" resultType="java.math.BigDecimal">
+ select IFNULL(sum(IFNULL(total_amount,0)),0)
+ from dapp_wallet_mine
+ </select>
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/templates/febs/views/index.html b/src/main/resources/templates/febs/views/index.html
index fc8a632..776e14f 100644
--- a/src/main/resources/templates/febs/views/index.html
+++ b/src/main/resources/templates/febs/views/index.html
@@ -135,6 +135,46 @@
<div class="layui-card-body layui-anim layui-anim-fadein">
<div class="layui-row">
+ <div class="m-title">用户系统总览</div>
+ <div class="layui-row layui-col-space15">
+ <div class="layui-col-md3">
+ <div class="layui-panel">
+ <div class="box">
+ <p class="name">总余额</p>
+ <p class="num"><span id="totalAmount"></span></p>
+ </div>
+ </div>
+ </div>
+ <div class="layui-col-md3">
+ <div class="layui-panel">
+ <div class="box">
+ <p class="name">总赠送积分</p>
+ <p class="num"><span id="totalScore"></span></p>
+ </div>
+ </div>
+ </div>
+ <div class="layui-col-md3">
+ <div class="layui-panel">
+ <div class="box">
+ <p class="name">总资产包</p>
+ <p class="num"><span id="totalPackage"></span></p>
+ </div>
+ </div>
+ </div>
+ <div class="layui-col-md3">
+ <div class="layui-panel">
+ <div class="box">
+ <p class="name">总剩余业绩</p>
+ <p class="num"><span id="totalAchieve"></span></p>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="layui-card-body layui-anim layui-anim-fadein">
+ <div class="layui-row">
<div class="m-title">商城订单流水</div>
<div class="layui-row layui-col-space15">
<div class="layui-col-md3">
@@ -390,6 +430,11 @@
var welcomeMessage = time + '，<a id="febs-index-user">' + currentUser.username + '</a>，' + welcomeArr[index];
$view.find('#today-ip').text(data.todayIp).end()
+ .find('#totalAmount').text(data.totalAmount).end()
+ .find('#totalScore').text(data.totalScore).end()
+ .find('#totalPackage').text(data.totalPackage).end()
+ .find('#totalAchieve').text(data.totalAchieve).end()
+
.find('#orderAmountTotal').text(data.orderAmountTotal).end()
.find('#orderAmountMonth').text(data.orderAmountTotal).end()
.find('#orderAmountToday').text(data.orderAmountToday).end()
@@ -415,8 +460,8 @@
.find('#releasePackageTotal').text(data.releasePackageTotal).end()
.find('#releasePackageToday').text(data.releasePackageToday).end()
- .find('#sendPackageTotal').text(data.releasePackageTotal).end()
- .find('#sendPackageToday').text(data.releasePackageToday).end()
+ .find('#sendPackageTotal').text(data.sendPackageTotal).end()
+ .find('#sendPackageToday').text(data.sendPackageToday).end()
.find('#today-visit-count').text(data.todayVisitCount).end()
.find('#total-visit-count').text(data.totalVisitCount).end()
--
Gitblit v1.9.1