From ea58ab6f794724adb3644c2101dd28558ed6bc5c Mon Sep 17 00:00:00 2001 From: gazebo Date: Mon, 16 Sep 2019 15:33:29 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E9=97=A8=E5=BA=97=E6=8A=A5=E8=AD=A6?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=8C=89=E5=9F=8E=E5=B8=82=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/cms/store.go | 1 + business/model/dao/store.go | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 5088a5e8c..f9d3ea169 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -1789,6 +1789,7 @@ func SaveAndSendAlarmVendorSnapshot(ctx *jxcontext.Context, vendorIDs, storeIDs err = SaveStoresVendorSnapshot(db, curSnapshotAt, curSnapshotList) case 2: prevSnapshotList, err = dao.GetVendorStoreSnapshot(db, prevSnapshotAt) + curSnapshotList, err = dao.GetVendorStoreSnapshot(db, curSnapshotAt) // 因为排序的原因，重新取一下 case 3: err = SendAlarmVendorSnapshot(ctx, task, prevSnapshotList, curSnapshotList) } diff --git a/business/model/dao/store.go b/business/model/dao/store.go index 3f6d92bd6..88e0a53e9 100644 --- a/business/model/dao/store.go +++ b/business/model/dao/store.go @@ -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) { sql := ` - SELECT * + SELECT 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) return snapshotList, err }