From 387515b2c1e8894fe92328fc329771aab1700f07 Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Fri, 07 Apr 2023 18:36:26 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 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 1e11453..3a8ff18 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
@@ -775,7 +775,11 @@
if(CollUtil.isEmpty(mallMqRecords)){
return;
}
+ DateTime dateTime = DateUtil.offsetMinute(new Date(), -5);
for(MallMqRecord mallMqRecord : mallMqRecords){
+ if(DateUtil.compare(dateTime,mallMqRecord.getCreateTime()) <= 0){
+ continue;
+ }
Integer retryTimes = mallMqRecord.getRetryTimes();
if(retryTimes <= 0){
continue;
@@ -866,8 +870,17 @@
/**
* 获取每日最大产生的凭证数量
+ * 改成每日产出固定值
*/
- BigDecimal achieveDailyRelease = getAchieveDailyRelease();
+// BigDecimal achieveDailyRelease = getAchieveDailyRelease();
+ DataDictionaryCustom achieveReleaseDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ GreenScoreEnum.ACHIEVE_RELEASE.getType(),
+ GreenScoreEnum.ACHIEVE_RELEASE.getCode()
+ );
+ BigDecimal achieveDailyRelease = new BigDecimal(achieveReleaseDic.getValue() == null ? "0" : achieveReleaseDic.getValue());
+ if(achieveDailyRelease.compareTo(BigDecimal.ZERO) <= 0){
+ return;
+ }
if(achieveTotal.compareTo(achieveMax) < 0){
BigDecimal divide = achieveTotal.divide(achieveMax, 2, BigDecimal.ROUND_DOWN);
@@ -1008,7 +1021,7 @@
mallScoreAchieveRelease.setReleaseNo(scoreNo);
mallScoreAchieveRelease.setVoucherExpect(achieveDailyRelease);
mallScoreAchieveRelease.setVoucherReal(achieveDailyReleaseReal);
- mallScoreAchieveReleaseMapper.updateById(mallScoreAchieveRelease);
+ mallScoreAchieveReleaseMapper.insert(mallScoreAchieveRelease);
}
--
Gitblit v1.9.1