angelo
/
java-base-app
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

## 删除历史结算表单独处理，如果异常不影响主流程；修改打印日志；

This commit is contained in:
cabbage 2025-04-24 09:45:34 +08:00
parent 9ae3ed62a8
commit 79b78c9cd1
2 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberTreeServiceImpl.java
View File

@ -124,21 +124,26 @@ public class CuMemberTreeServiceImpl extends ServiceImpl<CuMemberTreeMapper, CuM
// 删除60天前的结算日表，结算秒表 // 删除60天前的结算日表，结算秒表
Date beforeDate = DateUtils.beforeDate(60, ChronoUnit.DAYS, DateUtils.parseStringToDate(date)); Date beforeDate = DateUtils.beforeDate(60, ChronoUnit.DAYS, DateUtils.parseStringToDate(date));
// 上个月最后一天 try {
int beforePeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, beforeDate)).getPkId(); // 上个月最后一天
// 不删除每月最后一天数据 int beforePeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, beforeDate)).getPkId();
String afterDate = DateUtils.parseDateTimeToStr(DateUtils.YYYY_MM_DD, DateUtils.afterDate(1, ChronoUnit.DAYS, beforeDate)); // 不删除每月最后一天数据
if (!afterDate.endsWith("01")) { String afterDate = DateUtils.parseDateTimeToStr(DateUtils.YYYY_MM_DD, DateUtils.afterDate(1, ChronoUnit.DAYS, beforeDate));
String beforeSettleTableName = TableNameConstants.CU_MEMBER_SETTLE + beforePeriod; log.info("afterDate: {}", afterDate);
number = baseMapper.queryExistOracleTable(beforeSettleTableName); if (!afterDate.endsWith("01")) {
if (number != null && number > 0) { String beforeSettleTableName = TableNameConstants.CU_MEMBER_SETTLE + beforePeriod;
baseMapper.dropCuMemberSettleTable(beforeSettleTableName); number = baseMapper.queryExistOracleTable(beforeSettleTableName);
if (number != null && number > 0) {
baseMapper.dropCuMemberSettleTable(beforeSettleTableName);
}
} }
} String beforeSecondTableName = TableNameConstants.CU_MEMBER_SECOND + beforePeriod;
String beforeSecondTableName = TableNameConstants.CU_MEMBER_SECOND + beforePeriod; number = baseMapper.queryExistOracleTable(beforeSecondTableName);
number = baseMapper.queryExistOracleTable(beforeSecondTableName); if (number != null && number > 0) {
if (number != null && number > 0) { baseMapper.dropCuMemberSettleTable(beforeSecondTableName);
baseMapper.dropCuMemberSettleTable(beforeSecondTableName); }
} catch (Exception e) {
log.error("删除历史结算表失败, beforeDate: {}", beforeDate, e);
} }
// 4-N 增加碰次需求 // 4-N 增加碰次需求

18
hzs-third/src/main/java/com/hzs/third/job/BonusSettleJob.java
View File

@ -23,11 +23,11 @@ public class BonusSettleJob {
IMemberSettleBonusApi memberBonusSettleApi; IMemberSettleBonusApi memberBonusSettleApi;
/** /**
* 奖金每天自动结算,计算前一天奖金 * 备份昨日网体
*/ */
@XxlJob("backSettleBonus") @XxlJob("backSettleBonus")
public void backupsSettleBonusEveryday() { public void backupsSettleBonusEveryday() {
log.info("开始进行奖金结算"); log.info("开始备份网体");
memberBonusSettleApi.backupsSettleBonusEveryday(); memberBonusSettleApi.backupsSettleBonusEveryday();
} }
@ -37,7 +37,7 @@ public class BonusSettleJob {
@XxlJob("autoSettleBonus") @XxlJob("autoSettleBonus")
public void autoSettleBonusEveryday() { public void autoSettleBonusEveryday() {
Date startDate = DateUtils.beforeDate(7, ChronoUnit.DAYS, DateUtils.currentDate()); Date startDate = DateUtils.beforeDate(7, ChronoUnit.DAYS, DateUtils.currentDate());
log.info("开始进行奖金结算"); log.info("开始进行奖金结算: {}", startDate);
memberBonusSettleApi.autoCalculateBonus(startDate); memberBonusSettleApi.autoCalculateBonus(startDate);
} }
@ -47,7 +47,7 @@ public class BonusSettleJob {
@XxlJob("autoSettleBonus1") @XxlJob("autoSettleBonus1")
public void autoSettleBonusEveryday1() { public void autoSettleBonusEveryday1() {
Date startDate = DateUtils.beforeDate(6, ChronoUnit.DAYS, DateUtils.currentDate()); Date startDate = DateUtils.beforeDate(6, ChronoUnit.DAYS, DateUtils.currentDate());
log.info("开始进行奖金结算"); log.info("开始进行奖金结算: {}", startDate);
memberBonusSettleApi.autoCalculateBonus(startDate); memberBonusSettleApi.autoCalculateBonus(startDate);
} }
@ -57,7 +57,7 @@ public class BonusSettleJob {
@XxlJob("autoSettleBonus2") @XxlJob("autoSettleBonus2")
public void autoSettleBonusEveryday2() { public void autoSettleBonusEveryday2() {
Date startDate = DateUtils.beforeDate(5, ChronoUnit.DAYS, DateUtils.currentDate()); Date startDate = DateUtils.beforeDate(5, ChronoUnit.DAYS, DateUtils.currentDate());
log.info("开始进行奖金结算"); log.info("开始进行奖金结算: {}", startDate);
memberBonusSettleApi.autoCalculateBonus(startDate); memberBonusSettleApi.autoCalculateBonus(startDate);
} }
@ -67,7 +67,7 @@ public class BonusSettleJob {
@XxlJob("autoSettleBonus3") @XxlJob("autoSettleBonus3")
public void autoSettleBonusEveryday3() { public void autoSettleBonusEveryday3() {
Date startDate = DateUtils.beforeDate(4, ChronoUnit.DAYS, DateUtils.currentDate()); Date startDate = DateUtils.beforeDate(4, ChronoUnit.DAYS, DateUtils.currentDate());
log.info("开始进行奖金结算"); log.info("开始进行奖金结算: {}", startDate);
memberBonusSettleApi.autoCalculateBonus(startDate); memberBonusSettleApi.autoCalculateBonus(startDate);
} }
@ -77,7 +77,7 @@ public class BonusSettleJob {
@XxlJob("autoSettleBonus4") @XxlJob("autoSettleBonus4")
public void autoSettleBonusEveryday4() { public void autoSettleBonusEveryday4() {
Date startDate = DateUtils.beforeDate(3, ChronoUnit.DAYS, DateUtils.currentDate()); Date startDate = DateUtils.beforeDate(3, ChronoUnit.DAYS, DateUtils.currentDate());
log.info("开始进行奖金结算"); log.info("开始进行奖金结算: {}", startDate);
memberBonusSettleApi.autoCalculateBonus(startDate); memberBonusSettleApi.autoCalculateBonus(startDate);
} }
@ -87,7 +87,7 @@ public class BonusSettleJob {
@XxlJob("autoSettleBonus5") @XxlJob("autoSettleBonus5")
public void autoSettleBonusEveryday5() { public void autoSettleBonusEveryday5() {
Date startDate = DateUtils.beforeDate(2, ChronoUnit.DAYS, DateUtils.currentDate()); Date startDate = DateUtils.beforeDate(2, ChronoUnit.DAYS, DateUtils.currentDate());
log.info("开始进行奖金结算"); log.info("开始进行奖金结算: {}", startDate);
memberBonusSettleApi.autoCalculateBonus(startDate); memberBonusSettleApi.autoCalculateBonus(startDate);
} }
@ -97,7 +97,7 @@ public class BonusSettleJob {
@XxlJob("autoSettleBonus6") @XxlJob("autoSettleBonus6")
public void autoSettleBonusEveryday6() { public void autoSettleBonusEveryday6() {
Date startDate = DateUtils.beforeDate(1, ChronoUnit.DAYS, DateUtils.currentDate()); Date startDate = DateUtils.beforeDate(1, ChronoUnit.DAYS, DateUtils.currentDate());
log.info("开始进行奖金结算"); log.info("开始进行奖金结算: {}", startDate);
memberBonusSettleApi.autoCalculateBonus(startDate); memberBonusSettleApi.autoCalculateBonus(startDate);
} }