From 61c52330fddba45549862edf28b2480a24b795eb Mon Sep 17 00:00:00 2001 From: zhudan Date: Tue, 17 Sep 2019 17:03:10 +0800 Subject: [PATCH] =?UTF-8?q?Accept=20Merge=20Request=20#4:=20(don=20->=20ma?= =?UTF-8?q?rk)=20Merge=20Request:=20=E9=97=A8=E5=BA=97=E8=AF=84=E5=88=86-?= =?UTF-8?q?=E4=BF=AE=E6=94=B9BUG=20Created=20By:=20@zhudan=20Accepted=20By?= =?UTF-8?q?:=20@zhudan=20URL:=20https://rosydev.coding.net/p/jx-callback/d?= =?UTF-8?q?/jx-callback/git/merge/4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/misc/store_score.go | 44 ++++++++++++++++++++-------- business/model/dao/dao_order.go | 2 +- 2 files changed, 32 insertions(+), 14 deletions(-) diff --git a/business/jxstore/misc/store_score.go b/business/jxstore/misc/store_score.go index e4949b1aa..e52e0c4e9 100644 --- a/business/jxstore/misc/store_score.go +++ b/business/jxstore/misc/store_score.go @@ -591,17 +591,35 @@ func ScoreStore(ctx *jxcontext.Context, storeIDList []int) (retVal interface{}, GetAllStoreSkus(ctx, task, storeList) baseapi.SugarLogger.Debugf("ScoreStore step1 end") case 2: - db := dao.GetDB() - storeCountList, _ := dao.GetDailyBadCommentOrderCount(db, scoreDate) - storeScoreDataWrapper.SetDailyBadCommentOrderCount(storeCountList) - storeCountList, _ = dao.GetDailyUnFinishOrderCount(db, scoreDate) - storeScoreDataWrapper.SetDailyUnFinishOrderCount(storeCountList) - storeCountList, _ = dao.GetDailyFinishOrderCount(db, scoreDate) - storeScoreDataWrapper.SetDailyFinishOrderCount(storeCountList) - storeCountList, _ = dao.GetDailyAbsentGoodsOrderCount(db, scoreDate) - storeScoreDataWrapper.SetDailyAbsentGoodsOrderCount(storeCountList) - case 3: baseapi.SugarLogger.Debugf("ScoreStore step2 begin") + db := dao.GetDB() + storeCountList, err := dao.GetDailyBadCommentOrderCount(db, scoreDate) + if err == nil { + storeScoreDataWrapper.SetDailyBadCommentOrderCount(storeCountList) + } else { + baseapi.SugarLogger.Debugf("ScoreStore GetDailyBadCommentOrderCount %v", err) + } + storeCountList, err = dao.GetDailyUnFinishOrderCount(db, scoreDate) + if err == nil { + storeScoreDataWrapper.SetDailyUnFinishOrderCount(storeCountList) + } else { + baseapi.SugarLogger.Debugf("ScoreStore GetDailyUnFinishOrderCount %v", err) + } + storeCountList, err = dao.GetDailyFinishOrderCount(db, scoreDate) + if err == nil { + storeScoreDataWrapper.SetDailyFinishOrderCount(storeCountList) + } else { + baseapi.SugarLogger.Debugf("ScoreStore GetDailyFinishOrderCount %v", err) + } + storeCountList, err = dao.GetDailyAbsentGoodsOrderCount(db, scoreDate) + if err == nil { + storeScoreDataWrapper.SetDailyAbsentGoodsOrderCount(storeCountList) + } else { + baseapi.SugarLogger.Debugf("ScoreStore GetDailyAbsentGoodsOrderCount %v", err) + } + baseapi.SugarLogger.Debugf("ScoreStore step2 end") + case 3: + baseapi.SugarLogger.Debugf("ScoreStore step3 begin") taskFunc := func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { storeInfo := batchItemList[0].(*cms.StoreExt) storeID := storeInfo.ID @@ -626,13 +644,13 @@ func ScoreStore(ctx *jxcontext.Context, storeIDList []int) (retVal interface{}, if err != nil { baseapi.SugarLogger.Debugf("ScoreStore taskParallel error:%v", err) } - baseapi.SugarLogger.Debugf("ScoreStore step2 end") + baseapi.SugarLogger.Debugf("ScoreStore step3 end") case 4: - baseapi.SugarLogger.Debugf("ScoreStore step3 begin") + baseapi.SugarLogger.Debugf("ScoreStore step4 begin") storeScoreDataWrapper.InsertStoreScore() storeScoreDataWrapper.ClearData() allStoreSkusWrapper.ClearData() - baseapi.SugarLogger.Debugf("ScoreStore step3 end") + baseapi.SugarLogger.Debugf("ScoreStore step4 end") isScoring = false } return result, err diff --git a/business/model/dao/dao_order.go b/business/model/dao/dao_order.go index a365377ed..bbb20e382 100644 --- a/business/model/dao/dao_order.go +++ b/business/model/dao/dao_order.go @@ -354,7 +354,7 @@ func GetDailyEndOrderCount(db *DaoDB, statusList []int, isAbsentOrder bool, date } sql += ` GROUP BY jx_store_id` - err = GetRow(db, &storeCountList, sql, sqlParams) + err = GetRows(db, &storeCountList, sql, sqlParams) return storeCountList, err }