wishpal_ironfan
/
service
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

conflict #153

Merged
chenhao merged 11 commits from conflict into test 2024-02-29 10:57:49 +08:00
Conversation 0 Commits 11 Files Changed 109 +4
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ebfb44a78b - Show all commits

4
app/mix/service/xxljob_tasks.go
View File

@ -112,6 +112,10 @@ func (s *CronService) CreateDailyStatement(ctx context.Context, param *xxl.RunRe
CtLowerBound: goproto.Int64(startTimeStamp), CtLowerBound: goproto.Int64(startTimeStamp),
CtUpperBound: goproto.Int64(endTimeStamp), CtUpperBound: goproto.Int64(endTimeStamp),
}) })
if err != nil {
logger.Error("_DefaultAccount OpCountLastHourNewUserSource fail : %v", err)
return fmt.Sprintf("_DefaultAccount OpCountLastHourNewUserSource fail : %v", err)
}
finishedOrderCount := int32(0) finishedOrderCount := int32(0)
allOrderCount := int32(0) allOrderCount := int32(0)