fixbug

crontask/compute_historical_credit.go

@@ -8,9 +8,6 @@ import (
 	"wechat-api/ent"
 	"wechat-api/ent/creditusage"
 	"wechat-api/ent/usagedetail"
-	"wechat-api/ent/usagestatisticday"
-	"wechat-api/ent/usagestatistichour"
-	"wechat-api/ent/wx"
 )
 
 func (l *CronTask) computeHistoricalCredit() {
@@ -64,7 +61,7 @@ func (l *CronTask) computeHistoricalCredit() {
 
 		// 获取本小时的第一分钟
 		currentHour := time.Date(now.Year(), now.Month(), now.Day(), now.Hour(), 0, 0, 0, now.Location())
-		currentHourInt, _ := strconv.Atoi(currentHour.Format("2006010215"))
+		//currentHourInt, _ := strconv.Atoi(currentHour.Format("2006010215"))
 
 		// 上一个小时的起始时间
 		lastHour := currentHour.Add(-time.Hour * 1)

crontask/compute_historical_statistic.go

@@ -57,7 +57,7 @@ func (l *CronTask) computeHistoricalStatistic() {
 
 	// 获取当前时间
 	//now := time.Now()
-	start := time.Date(2024, 12, 25, 0, 0, 0, 0, time.Local)
+	start := time.Date(2025, 4, 1, 0, 0, 0, 0, time.Local)
 	end := time.Date(2025, 4, 24, 23, 0, 0, 0, time.Local)
 	//start := time.Date(2025, 3, 18, 0, 0, 0, 0, time.Local)
 	//end := time.Date(2025, 3, 19, 23, 0, 0, 0, time.Local)
@@ -103,7 +103,7 @@ func (l *CronTask) computeHistoricalStatistic() {
 			}
 
 			_, err = l.svcCtx.DB.UsageStatisticHour.Update().
-				Where(usagestatistichour.AddtimeEQ(uint64(lastHourInt)), usagestatistichour.OrganizationIDEQ(orgID)).
+				Where(usagestatistichour.AddtimeEQ(uint64(lastHourInt)), usagestatistichour.OrganizationIDEQ(orgID), usagestatistichour.BotIDEQ("")).
 				SetConsumeCoin(orgHourConsumeCoinFloat).
 				Save(l.ctx)
 			l.Errorf("save hour data error:%v \n", err)
@@ -111,7 +111,7 @@ func (l *CronTask) computeHistoricalStatistic() {
 
 		// 先判断该租户是否已经统计了小时数据，如果已经统计了，就不需要再统计了
 		_, err = l.svcCtx.DB.UsageStatisticHour.Update().
-			Where(usagestatistichour.AddtimeEQ(uint64(lastHourInt)), usagestatistichour.OrganizationIDEQ(0)).
+			Where(usagestatistichour.AddtimeEQ(uint64(lastHourInt)), usagestatistichour.OrganizationIDEQ(0), usagestatistichour.BotIDEQ("")).
 			SetConsumeCoin(allHourConsumeCoinFloat).
 			Save(l.ctx)
 		l.Errorf("save hour data error:%v \n", err)
@@ -174,7 +174,7 @@ func (l *CronTask) computeHistoricalStatistic() {
 			// 如果添加过了就略过
 			if yesterdayLastHourInt <= currentHourInt {
 				_, err := l.svcCtx.DB.UsageStatisticDay.Update().
-					Where(usagestatisticday.AddtimeEQ(uint64(yesterdayInt)), usagestatisticday.OrganizationIDEQ(orgID)).
+					Where(usagestatisticday.AddtimeEQ(uint64(yesterdayInt)), usagestatisticday.OrganizationIDEQ(orgID), usagestatisticday.BotIDEQ("")).
 					SetConsumeCoin(orgDayConsumeCoinFloat).
 					Save(l.ctx)
 				if err != nil {
@@ -187,7 +187,7 @@ func (l *CronTask) computeHistoricalStatistic() {
 		// 如果添加过了就略过
 		if yesterdayLastHourInt <= currentHourInt {
 			_, err = l.svcCtx.DB.UsageStatisticDay.Update().
-				Where(usagestatisticday.AddtimeEQ(uint64(yesterdayInt)), usagestatisticday.OrganizationIDEQ(0)).
+				Where(usagestatisticday.AddtimeEQ(uint64(yesterdayInt)), usagestatisticday.OrganizationIDEQ(0), usagestatisticday.BotIDEQ("")).
 				SetConsumeCoin(allDayConsumeCoinFloat).
 				Save(l.ctx)
 			if err != nil {