From d8f20196fb659300b0a8eb3e7c5d7ab1ad7fcb7e Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 06 Jan 2023 15:21:29 +0800
Subject: [PATCH] 20221227 充值归集
---
src/main/java/cc/mrbird/febs/mall/controller/ViewSystemController.java | 34 ++++++++++++++++++++++++++++++----
1 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/ViewSystemController.java b/src/main/java/cc/mrbird/febs/mall/controller/ViewSystemController.java
index 1d17ea7..ca9a8be 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ViewSystemController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewSystemController.java
@@ -12,13 +12,11 @@
import cc.mrbird.febs.mall.dto.ScoreSettingDto;
import cc.mrbird.febs.mall.entity.DataDictionaryCustom;
import cc.mrbird.febs.mall.entity.MallMember;
-import cc.mrbird.febs.mall.mapper.DataDictionaryCustomMapper;
-import cc.mrbird.febs.mall.mapper.MallAchieveRecordMapper;
-import cc.mrbird.febs.mall.mapper.MallMemberMapper;
-import cc.mrbird.febs.mall.mapper.MallOrderInfoMapper;
+import cc.mrbird.febs.mall.mapper.*;
import cc.mrbird.febs.monitor.service.ILoginLogService;
import cc.mrbird.febs.system.service.IUserService;
import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import lombok.RequiredArgsConstructor;
@@ -28,6 +26,7 @@
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
+import java.math.BigDecimal;
import java.util.*;
@@ -41,11 +40,21 @@
private final MallMemberMapper mallMemberMapper;
private final MallOrderInfoMapper mallOrderInfoMapper;
private final MallAchieveRecordMapper mallAchieveRecordMapper;
+ private final MallMemberWalletMapper mallMemberWalletMapper;
private final RedisUtils redisUtils;
@GetMapping("profitSetting")
public String profitSetting() {
return FebsUtil.view("modules/system/profitSetting");
+ }
+
+ /**
+ * 会员等级设置
+ * @return
+ */
+ @GetMapping("agentLevelSetting")
+ public String agentLevelSetting() {
+ return FebsUtil.view("modules/system/agentLevelSetting");
}
@GetMapping("cashOutSetting")
@@ -66,6 +75,18 @@
model.addAttribute("scorePoor", JSONObject.parseObject(dic.getValue(), ScorePoorDto.class));
}
return FebsUtil.view("modules/system/scorePoorSetting");
+ }
+
+ @GetMapping("systemSetting")
+ @RequiresPermissions("systemSetting:update")
+ public String systemSetting(Model model) {
+ DataDictionaryCustom returnPercentDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.RETURN_PERCENT.getType(),
+ DataDictionaryEnum.RETURN_PERCENT.getCode());
+ if (ObjectUtil.isNotEmpty(returnPercentDic)) {
+ model.addAttribute("returnPercent", returnPercentDic.getValue());
+ }
+ return FebsUtil.view("modules/system/systemSetting");
}
@GetMapping("indexData")
@@ -91,6 +112,11 @@
data.put("lastMonth", mallAchieveRecordMapper.selectAchieveTotal("M", DateUtil.offsetMonth(new Date(), -1)));
data.put("thisMonth", mallAchieveRecordMapper.selectAchieveTotal("M", new Date()));
+ data.put("totalBalance",mallMemberWalletMapper.selectSumBalance().setScale(2, BigDecimal.ROUND_DOWN));
+ data.put("totalScore",mallMemberWalletMapper.selectSumScore().setScale(2, BigDecimal.ROUND_DOWN));
+ data.put("totalPrizeScore",mallMemberWalletMapper.selectSumPrizeScore().setScale(2, BigDecimal.ROUND_DOWN));
+ data.put("totalCommission",mallMemberWalletMapper.selectSumCommission().setScale(2, BigDecimal.ROUND_DOWN));
+
//会员数据
data.put("totalMember",mallMemberMapper.selectCount(new QueryWrapper<>()) );
QueryWrapper<MallMember> formalMember = new QueryWrapper<>();
--
Gitblit v1.9.1