liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加StoreScoreEx结构来获取门店名字,去掉表中的字段StoreName

Browse Source
This commit is contained in:
Rosy-zhudan
2019-09-10 15:42:26 +08:00
parent 69c57c6520
commit 40586e19a6
4 changed files with 70 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
business/model/dao/store_score.go
View File

@@ -12,17 +12,12 @@ func InsertStoreScore(storeScore *model.StoreScore) error {
return CreateEntity(nil, storeScore)
}
func GetLatestWeeklyStoreScoreList(db *DaoDB, storeID, weekNum int) (storeScoreList []*model.StoreScore, err error) {
// sql := `
// SET @dayInWeek = IF(DAYOFWEEK(CURDATE()) - 1 = 0, 7, DAYOFWEEK(CURDATE()) - 1);
// SET @endDate = DATE_SUB(CURDATE(), INTERVAL @dayInWeek DAY);
// SET @beginData = DATE_SUB(@endDate, INTERVAL ? DAY);
// SELECT * FROM store_score
// WHERE store_id = ? AND DATE(created_at) >= @beginData AND DATE(created_at) <= @endDate ORDER BY created_at DESC
// `
func GetLatestWeeklyStoreScoreList(db *DaoDB, storeID, weekNum int) (storeScoreList []*model.StoreScoreEx, err error) {
sql := `
SELECT * FROM store_score WHERE store_id = ?
AND DATE(created_at) >= DATE_SUB(
SELECT t2.name store_name, t1.* FROM store_score t1
JOIN store t2 ON t1.store_id = t2.id
WHERE store_id = ?
AND DATE(t1.created_at) >= DATE_SUB(
DATE_SUB(
CURDATE(),
INTERVAL
@@ -34,7 +29,7 @@ func GetLatestWeeklyStoreScoreList(db *DaoDB, storeID, weekNum int) (storeScoreL
),
INTERVAL ? DAY
)
AND DATE(created_at) <= DATE_SUB(
AND DATE(t1.created_at) <= DATE_SUB(
CURDATE(),
INTERVAL
IF (