From 04d7b9c15d4da263b64deaf9e4e136baca33e2b6 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 20 Mar 2023 10:27:09 +0800
Subject: [PATCH] 后台修改
---
src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java | 6 ++++++
src/main/resources/templates/febs/views/modules/system/hlmScoreSet.html | 4 ++--
src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java | 10 ++++++++--
src/main/java/cc/mrbird/febs/mall/service/impl/ScoreServiceImpl.java | 19 +++++++++++++++----
src/main/resources/templates/febs/views/modules/order/orderList.html | 4 ++--
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 2 ++
6 files changed, 35 insertions(+), 10 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java
index 11214b8..45659b6 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java
@@ -281,8 +281,14 @@
Map<String, List<MallMember>> collect = mallMembers.stream().collect(Collectors.groupingBy(MallMember::getLevel));
Set<String> set = collect.keySet(); // 得到所有key的集合
for (String key : set) {
- List<MallMember> value = collect.get(key);
- mallMemberTeamPerk.add(value.get(0));
+ /**
+ * 团队补贴从二星开始
+ */
+ int compareLevel = MemberLevelEnum.SECOND_LEVEL.compareLevel(key, MemberLevelEnum.SECOND_LEVEL.getType());
+ if(compareLevel > 0){
+ List<MallMember> value = collect.get(key);
+ mallMemberTeamPerk.add(value.get(0));
+ }
}
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
index 323f71a..54eef92 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
@@ -250,6 +250,8 @@
mallMemberVo.setBalance(wallet.getBalance());
mallMemberVo.setScore(wallet.getScore());
mallMemberVo.setPrizeScore(wallet.getPrizeScore());
+ mallMemberVo.setTotalScore(wallet.getTotalScore());
+ mallMemberVo.setStar(wallet.getStar());
mallMemberVo.setTotalCost(mallOrderInfoMapper.selectTotalAmount(id));
return new FebsResponse().success().data(mallMemberVo);
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ScoreServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ScoreServiceImpl.java
index 7697f74..6f6bf9a 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ScoreServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ScoreServiceImpl.java
@@ -10,8 +10,10 @@
import cc.mrbird.febs.mall.dto.ScoreSettingDto;
import cc.mrbird.febs.mall.entity.*;
import cc.mrbird.febs.mall.mapper.DataDictionaryCustomMapper;
+import cc.mrbird.febs.mall.mapper.MallMemberMapper;
import cc.mrbird.febs.mall.mapper.MallMemberWalletMapper;
import cc.mrbird.febs.mall.mapper.MallScoreSignRecordMapper;
+import cc.mrbird.febs.mall.service.IApiMallMemberService;
import cc.mrbird.febs.mall.service.IApiMallMemberWalletService;
import cc.mrbird.febs.mall.service.IMallMoneyFlowService;
import cc.mrbird.febs.mall.service.IScoreService;
@@ -48,6 +50,7 @@
private final MallScoreSignRecordMapper mallScoreSignRecordMapper;
private final IMallMoneyFlowService mallMoneyFlowService;
private final IApiMallMemberWalletService walletService;
+ private final MallMemberMapper mallMemberMapper;
@Override
public ScoreSignVo scoreSign() {
@@ -112,15 +115,23 @@
throw new FebsException("今日已签到");
}
/**
- * 获取签到次数
- * 判断签到次数是否大于规定的时长signScoreDays，超出则获得的积分数为signScoreCnt
+ * 用户注册时间开始计算
+ * 判断签到时间是否大于规定的signScoreDays，超出则获得的积分数为signScoreCnt
*/
- Integer count = mallScoreSignRecordMapper.selectCountByMemberId(member.getId());
+// Integer count = mallScoreSignRecordMapper.selectCountByMemberId(member.getId());
DataDictionaryCustom signScoreDaysDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
DataDictionaryEnum.SIGN_SCORE_DAYS.getType(),
DataDictionaryEnum.SIGN_SCORE_DAYS.getCode());
Integer signScoreDays = Integer.parseInt(signScoreDaysDic.getValue());
- if(count >= signScoreDays){
+
+ MallMember mallMember = mallMemberMapper.selectById(member.getId());
+ Date createdTime = mallMember.getCreatedTime();
+
+ DateTime dateTime = DateUtil.offsetDay(createdTime, signScoreDays);
+ /**
+ * 签到时间不在系统设置的第一个阶段，则获取签到设置-签到积分后续获得积分数量
+ */
+ if(DateUtil.compare(dateTime, new Date()) < 0){
DataDictionaryCustom signScoreCntDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
DataDictionaryEnum.SIGN_SCORE_CNT.getType(),
DataDictionaryEnum.SIGN_SCORE_CNT.getCode());
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java b/src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java
index 1080ba8..8b55a06 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java
@@ -84,4 +84,10 @@
@ApiModelProperty(value = "是否店长 1-是 2-否")
private Integer storeMaster;
+ @ApiModelProperty(value = "补贴额度")
+ private BigDecimal totalScore;
+
+ @ApiModelProperty(value = "贡献点")
+ private Integer star;
+
}
diff --git a/src/main/resources/templates/febs/views/modules/order/orderList.html b/src/main/resources/templates/febs/views/modules/order/orderList.html
index bb91673..fb20f48 100644
--- a/src/main/resources/templates/febs/views/modules/order/orderList.html
+++ b/src/main/resources/templates/febs/views/modules/order/orderList.html
@@ -286,9 +286,9 @@
{field: 'status', title: '状态',
templet: function (d) {
if (d.status === 1) {
- return '<span style="color:red;">待支付</span>'
+ return '<span style="color:blue;">待支付</span>'
} else if (d.status === 2) {
- return '<span style="color:green;">待发货</span>'
+ return '<span style="color:red;">待发货</span>'
}else if (d.status === 3) {
return '<span style="color:green;">待收货</span>'
}else if (d.status === 4) {
diff --git a/src/main/resources/templates/febs/views/modules/system/hlmScoreSet.html b/src/main/resources/templates/febs/views/modules/system/hlmScoreSet.html
index a8d948e..84be52d 100644
--- a/src/main/resources/templates/febs/views/modules/system/hlmScoreSet.html
+++ b/src/main/resources/templates/febs/views/modules/system/hlmScoreSet.html
@@ -11,11 +11,11 @@
<div class="layui-input-inline">
<input type="text" name="signScore" lay-verify="required|integer" placeholder="请输入数字" autocomplete="off" class="layui-input" >
</div>
- <div class="layui-form-mid layui-word-aux">积分，从第</div>
+ <div class="layui-form-mid layui-word-aux">积分，注册</div>
<div class="layui-input-inline">
<input type="text" name="signScoreDays" lay-verify="required|integer" placeholder="请输入数字" autocomplete="off" class="layui-input" >
</div>
- <div class="layui-form-mid layui-word-aux">次后，每次获取</div>
+ <div class="layui-form-mid layui-word-aux">天后，签到获取</div>
<div class="layui-input-inline">
<input type="text" name="signScoreCnt" lay-verify="required|integer" placeholder="请输入数字" autocomplete="off" class="layui-input" >
</div>
--
Gitblit v1.9.1