From 79b78c9cd17799093af1846aed30f721dca84f89 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Thu, 24 Apr 2025 09:45:34 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E5=88=A0=E9=99=A4=E5=8E=86=E5=8F=B2?= =?UTF-8?q?=E7=BB=93=E7=AE=97=E8=A1=A8=E5=8D=95=E7=8B=AC=E5=A4=84=E7=90=86?= =?UTF-8?q?=EF=BC=8C=E5=A6=82=E6=9E=9C=E5=BC=82=E5=B8=B8=E4=B8=8D=E5=BD=B1?= =?UTF-8?q?=E5=93=8D=E4=B8=BB=E6=B5=81=E7=A8=8B=EF=BC=9B=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=97=A5=E5=BF=97=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/CuMemberTreeServiceImpl.java | 33 +++++++++++-------- .../com/hzs/third/job/BonusSettleJob.java | 18 +++++----- 2 files changed, 28 insertions(+), 23 deletions(-) diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberTreeServiceImpl.java b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberTreeServiceImpl.java index cfad84a5..4800a9c5 100644 --- a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberTreeServiceImpl.java +++ b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberTreeServiceImpl.java @@ -124,21 +124,26 @@ public class CuMemberTreeServiceImpl extends ServiceImpl 0) { - baseMapper.dropCuMemberSettleTable(beforeSettleTableName); + try { + // 上个月最后一天 + 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)); + log.info("afterDate: {}", afterDate); + if (!afterDate.endsWith("01")) { + String beforeSettleTableName = TableNameConstants.CU_MEMBER_SETTLE + beforePeriod; + number = baseMapper.queryExistOracleTable(beforeSettleTableName); + if (number != null && number > 0) { + baseMapper.dropCuMemberSettleTable(beforeSettleTableName); + } } - } - String beforeSecondTableName = TableNameConstants.CU_MEMBER_SECOND + beforePeriod; - number = baseMapper.queryExistOracleTable(beforeSecondTableName); - if (number != null && number > 0) { - baseMapper.dropCuMemberSettleTable(beforeSecondTableName); + String beforeSecondTableName = TableNameConstants.CU_MEMBER_SECOND + beforePeriod; + number = baseMapper.queryExistOracleTable(beforeSecondTableName); + if (number != null && number > 0) { + baseMapper.dropCuMemberSettleTable(beforeSecondTableName); + } + } catch (Exception e) { + log.error("删除历史结算表失败, beforeDate: {}", beforeDate, e); } // 4-N 增加碰次需求 diff --git a/hzs-third/src/main/java/com/hzs/third/job/BonusSettleJob.java b/hzs-third/src/main/java/com/hzs/third/job/BonusSettleJob.java index 91664d9e..a056102e 100644 --- a/hzs-third/src/main/java/com/hzs/third/job/BonusSettleJob.java +++ b/hzs-third/src/main/java/com/hzs/third/job/BonusSettleJob.java @@ -23,11 +23,11 @@ public class BonusSettleJob { IMemberSettleBonusApi memberBonusSettleApi; /** - * 奖金每天自动结算,计算前一天奖金 + * 备份昨日网体 */ @XxlJob("backSettleBonus") public void backupsSettleBonusEveryday() { - log.info("开始进行奖金结算"); + log.info("开始备份网体"); memberBonusSettleApi.backupsSettleBonusEveryday(); } @@ -37,7 +37,7 @@ public class BonusSettleJob { @XxlJob("autoSettleBonus") public void autoSettleBonusEveryday() { Date startDate = DateUtils.beforeDate(7, ChronoUnit.DAYS, DateUtils.currentDate()); - log.info("开始进行奖金结算"); + log.info("开始进行奖金结算: {}", startDate); memberBonusSettleApi.autoCalculateBonus(startDate); } @@ -47,7 +47,7 @@ public class BonusSettleJob { @XxlJob("autoSettleBonus1") public void autoSettleBonusEveryday1() { Date startDate = DateUtils.beforeDate(6, ChronoUnit.DAYS, DateUtils.currentDate()); - log.info("开始进行奖金结算"); + log.info("开始进行奖金结算: {}", startDate); memberBonusSettleApi.autoCalculateBonus(startDate); } @@ -57,7 +57,7 @@ public class BonusSettleJob { @XxlJob("autoSettleBonus2") public void autoSettleBonusEveryday2() { Date startDate = DateUtils.beforeDate(5, ChronoUnit.DAYS, DateUtils.currentDate()); - log.info("开始进行奖金结算"); + log.info("开始进行奖金结算: {}", startDate); memberBonusSettleApi.autoCalculateBonus(startDate); } @@ -67,7 +67,7 @@ public class BonusSettleJob { @XxlJob("autoSettleBonus3") public void autoSettleBonusEveryday3() { Date startDate = DateUtils.beforeDate(4, ChronoUnit.DAYS, DateUtils.currentDate()); - log.info("开始进行奖金结算"); + log.info("开始进行奖金结算: {}", startDate); memberBonusSettleApi.autoCalculateBonus(startDate); } @@ -77,7 +77,7 @@ public class BonusSettleJob { @XxlJob("autoSettleBonus4") public void autoSettleBonusEveryday4() { Date startDate = DateUtils.beforeDate(3, ChronoUnit.DAYS, DateUtils.currentDate()); - log.info("开始进行奖金结算"); + log.info("开始进行奖金结算: {}", startDate); memberBonusSettleApi.autoCalculateBonus(startDate); } @@ -87,7 +87,7 @@ public class BonusSettleJob { @XxlJob("autoSettleBonus5") public void autoSettleBonusEveryday5() { Date startDate = DateUtils.beforeDate(2, ChronoUnit.DAYS, DateUtils.currentDate()); - log.info("开始进行奖金结算"); + log.info("开始进行奖金结算: {}", startDate); memberBonusSettleApi.autoCalculateBonus(startDate); } @@ -97,7 +97,7 @@ public class BonusSettleJob { @XxlJob("autoSettleBonus6") public void autoSettleBonusEveryday6() { Date startDate = DateUtils.beforeDate(1, ChronoUnit.DAYS, DateUtils.currentDate()); - log.info("开始进行奖金结算"); + log.info("开始进行奖金结算: {}", startDate); memberBonusSettleApi.autoCalculateBonus(startDate); }