From cadeca36ff86f74371c77a05dc8422abc1e48855 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Thu, 19 Dec 2024 16:28:40 +0800
Subject: [PATCH] feat(table): 添加合计行功能 - 在 mallMemberList.html 中添加了 totalRow 属性，用于显示碳币和碳积分的合计 - 在 moneyFlowList.html 中移除了 description 字段的 totalRow属性 - 在 sellVipList.html 中将 amount 和 amountFee 字段的 totalRow 属性改为 true
---
src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java | 153 +++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 148 insertions(+), 5 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java
index dbc7a6a..d65136d 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java
@@ -1,22 +1,23 @@
package cc.mrbird.febs.mall.service.impl;
-import cc.mrbird.febs.common.enumerates.AgentLevelEnum;
-import cc.mrbird.febs.common.enumerates.DataDictionaryEnum;
-import cc.mrbird.febs.common.enumerates.FlowTypeEnum;
-import cc.mrbird.febs.common.enumerates.MoneyFlowTypeEnum;
+import cc.mrbird.febs.common.enumerates.*;
import cc.mrbird.febs.common.utils.AppContants;
import cc.mrbird.febs.mall.entity.*;
import cc.mrbird.febs.mall.mapper.*;
+import cc.mrbird.febs.mall.service.AsyncService;
import cc.mrbird.febs.mall.service.IApiMallMemberWalletService;
-import cc.mrbird.febs.mall.service.IMallAchieveService;
import cc.mrbird.febs.mall.service.IMallMoneyFlowService;
import cc.mrbird.febs.mall.service.IMemberProfitService;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateField;
+import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.RandomUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.RequiredArgsConstructor;
@@ -27,6 +28,7 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.*;
+import java.util.stream.Collectors;
/**
* @author wzy
@@ -46,6 +48,11 @@
private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
private final MallMoneyFlowMapper mallMoneyFlowMapper;
private final MallAchieveRecordMapper mallAchieveRecordMapper;
+ private final MallMemberCouponMapper mallMemberCouponMapper;
+ private final RunVipMapper runVipMapper;
+ private final MallMemberWalletMapper mallMemberWalletMapper;
+
+ private final AsyncService asyncService;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -281,6 +288,9 @@
}
BigDecimal income = profit.multiply(profitProp).divide(BigDecimal.valueOf(agentMemberList.size()), 2, RoundingMode.HALF_UP);
+ if (income.compareTo(BigDecimal.ZERO) < 1) {
+ continue;
+ }
for (MallMember agentMember : agentMemberList) {
// int reduce = walletService.reduce(income, agentMember.getId(), "score");
@@ -474,4 +484,137 @@
}
log.info("#####==店补/董事==end==######");
}
+
+ @Override
+ public void getOrderCoupon(Long orderId) {
+ List<MallOrderItem> mallOrderItemList = mallOrderItemMapper.selectListByOrderId(orderId);
+ if(CollUtil.isNotEmpty(mallOrderItemList)){
+ List<Long> memberCouponIds = mallOrderItemList.stream().map(MallOrderItem::getMemberCouponId).collect(Collectors.toList());
+ if(CollUtil.isNotEmpty(memberCouponIds)){
+ for(Long memberCouponId : memberCouponIds){
+ MallMemberCoupon mallMemberCoupon = mallMemberCouponMapper.selectById(memberCouponId);
+ mallMemberCoupon.setState(2);
+ mallMemberCouponMapper.updateById(mallMemberCoupon);
+ }
+ }
+ }
+ }
+
+ @Override
+ public void updateMemberLevel() {
+ mallMemberWalletMapper.updateScore();
+ List<RunVip> runVips = runVipMapper.selectList(new LambdaQueryWrapper<RunVip>().orderByAsc(RunVip :: getOrderNumber));
+ RunVip runVip = runVips.get(0);
+
+ //获取过期时间小于等于当前时间，并且会员等级不是最小等级游客的所有用户
+ LambdaQueryWrapper<MallMember> mallMemberLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ mallMemberLambdaQueryWrapper.le(MallMember :: getVipLevelTime,DateUtil.date());
+ mallMemberLambdaQueryWrapper.ne(MallMember :: getLevel,runVip.getVipCode());
+ List<MallMember> mallMembers = mallMemberMapper.selectList(mallMemberLambdaQueryWrapper);
+ if(CollUtil.isNotEmpty(mallMembers)){
+ mallMembers.forEach(
+ item -> {
+ mallMemberMapper.updateVipLevelTimeAndLevel(item.getId(),item.getVipLevelTime(),item.getLevel());
+ }
+ );
+ }
+ }
+
+ public static void main(String[] args) {
+
+ //计算当前时间是否是最后一次
+ String lastDateTimeStr = DateUtil.formatDate(DateUtil.date())+" 20:00:00";
+ DateTime lastDateTime = DateUtil.parseDateTime(lastDateTimeStr);
+ System.out.println(DateUtil.compare(DateUtil.date(),lastDateTime) > 0);
+ System.out.println(DateUtil.parseTime(DateUtil.date().toTimeStr()));
+ }
+
+
+
+ /**
+ * 获取全部会员
+ * 根据会员等级的最大每日获得去给用户新增碳积分
+ * 更新钱包数据
+ * 生成对应的流水数据
+ * 释放规则
+ * 当前时间的小时 H1 / 2,整除时
+ * 每个会员等级每日总释放量 T1 / 总时间间隔 C1 = 每次释放量上限 V1
+ * 每次释放量上线 V1 / 2 = 每次释放量下限 V2
+ * 每次释放量 V3 = 随机 [V2,V1）
+ * 当前时间的小时 H1 / 2,不整除时
+ * 每个会员等级每日总释放量 T1 / 总时间间隔 C1 = 每次释放量上限 V1
+ * 每次释放量 V3 = 每次释放量上限 V1 + （每次释放量上限 V1 - 上一次释放的数量 U1）
+ * 如果上一次没有释放，则 V3 = 每次释放量上限 [V1,V1*2)
+ */
+ @Override
+ public void updateRunScore() {
+ DateTime nowTimeStr = DateUtil.date();
+ String startTimeStr = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ RunVipDataDictionaryEnum.RUN_START_TIME.getType(),
+ RunVipDataDictionaryEnum.RUN_START_TIME.getCode()
+ ).getValue();
+ String endTimeStr = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ RunVipDataDictionaryEnum.RUN_END_TIME.getType(),
+ RunVipDataDictionaryEnum.RUN_END_TIME.getCode()
+ ).getValue();
+
+ DateTime nowTime = DateUtil.parseTime(nowTimeStr.toTimeStr());
+ DateTime startTime = DateUtil.parseTime(startTimeStr);
+ DateTime endTime = DateUtil.parseTime(endTimeStr);
+ //判断时间是否在时间范围内
+ if(DateUtil.compare(nowTime,startTime) < 0 || DateUtil.compare(nowTime,endTime) > 0){
+ return;
+ }
+ int hour = DateUtil.hour(nowTime,true);
+ boolean flag = isDivisibleByTwo(hour);
+
+ int C1 = Integer.parseInt(String.valueOf(DateUtil.between(startTime, endTime, DateUnit.HOUR)));
+
+ List<RunVip> runVips = runVipMapper.selectList(null);
+ Map<String, RunVip> runVipMap = runVips.stream()
+ .collect(Collectors.toMap(RunVip::getVipCode, runVip -> runVip));
+ List<MallMember> mallMembers = mallMemberMapper.selectList(null);
+ if(CollUtil.isNotEmpty(mallMembers)){
+ for (MallMember item : mallMembers) {
+ RunVip runVip = runVipMap.get(item.getLevel());
+ if(ObjectUtil.isEmpty(runVip)){
+ //未匹配到，直接跳过
+ continue;
+ }
+ BigDecimal T1 = new BigDecimal(runVip.getGrowthCnt());
+ BigDecimal V3 = BigDecimal.ZERO;
+ BigDecimal V1 = T1.divide(new BigDecimal(C1), 2, BigDecimal.ROUND_DOWN);
+ if (flag) {
+ BigDecimal V2 = V1.divide(new BigDecimal("2"), 2, BigDecimal.ROUND_DOWN);
+ V3 = RandomUtil.randomBigDecimal(V2,V1);
+ }else{
+ List<MallMoneyFlow> mallMoneyFlows = mallMoneyFlowMapper.selectList(
+ new LambdaQueryWrapper<MallMoneyFlow>()
+ .eq(MallMoneyFlow::getMemberId, item.getId())
+ .eq(MallMoneyFlow::getFlowType, FlowTypeEnum.SCORE.getValue())
+ .eq(MallMoneyFlow::getType, RunVipMoneyFlowTypeEnum.GET_SCORE.getValue())
+ .ge(MallMoneyFlow::getCreatedTime, DateUtil.beginOfDay(nowTimeStr))
+ .orderByDesc(MallMoneyFlow::getCreatedTime)
+ .last("LIMIT 1")
+ );
+ if(CollUtil.isNotEmpty(mallMoneyFlows)){
+ V3 = V1.add(V1.subtract(mallMoneyFlows.get(0).getAmount()));
+ }else{
+ V3 = RandomUtil.randomBigDecimal(V1,V1.multiply(new BigDecimal("2")));
+ }
+ }
+ V3 = V3.setScale(0,BigDecimal.ROUND_DOWN);
+ //更新钱包数据
+ if(V3.intValue() <= 0){
+ continue;
+ }
+ //异步线程池去释放积分操作
+ asyncService.releaseScore(V3,item.getId());
+ }
+ }
+ }
+
+ public boolean isDivisibleByTwo(int number) {
+ return number % 2 == 0;
+ }
}
--
Gitblit v1.9.1