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

- 门店报警信息按城市排序

Browse Source
This commit is contained in:
gazebo
2019-09-16 15:33:29 +08:00
parent 0a0c051d50
commit ea58ab6f79
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
business/jxstore/cms/store.go
View File

@@ -1789,6 +1789,7 @@ func SaveAndSendAlarmVendorSnapshot(ctx *jxcontext.Context, vendorIDs, storeIDs
err = SaveStoresVendorSnapshot(db, curSnapshotAt, curSnapshotList) err = SaveStoresVendorSnapshot(db, curSnapshotAt, curSnapshotList)
case 2: case 2:
prevSnapshotList, err = dao.GetVendorStoreSnapshot(db, prevSnapshotAt) prevSnapshotList, err = dao.GetVendorStoreSnapshot(db, prevSnapshotAt)
curSnapshotList, err = dao.GetVendorStoreSnapshot(db, curSnapshotAt) // 因为排序的原因，重新取一下
case 3: case 3:
err = SendAlarmVendorSnapshot(ctx, task, prevSnapshotList, curSnapshotList) err = SendAlarmVendorSnapshot(ctx, task, prevSnapshotList, curSnapshotList)
} }

6
business/model/dao/store.go
View File

@@ -301,9 +301,11 @@ func FormalizeStoreStatus(db *DaoDB, storeID, storeStatus int) (err error) {
func GetVendorStoreSnapshot(db *DaoDB, snapshotAt time.Time) (snapshotList []*model.VendorStoreSnapshot, err error) { func GetVendorStoreSnapshot(db *DaoDB, snapshotAt time.Time) (snapshotList []*model.VendorStoreSnapshot, err error) {
sql := ` sql := `
SELECT * SELECT t1.*
FROM vendor_store_snapshot t1 FROM vendor_store_snapshot t1
WHERE t1.snapshot_at = ?` LEFT JOIN store t2 ON t2.id = t1.store_id
WHERE t1.snapshot_at = ?
ORDER BY t2.city_code, t1.store_id, t1.vendor_id`
err = GetRows(db, &snapshotList, sql, snapshotAt) err = GetRows(db, &snapshotList, sql, snapshotAt)
return snapshotList, err return snapshotList, err
} }