From e41bc3b47be9aa51990ca3b117e0bf32d083546a Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Thu, 27 Jun 2019 10:26:48 +0800
Subject: [PATCH] =?UTF-8?q?*=20=E4=BF=AE=E5=A4=8DSendAlarmVendorSnapshot?=
 =?UTF-8?q?=E4=B8=ADprevSnapshot=E4=B8=BAnil=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/store.go      | 21 +++++++++++++--------
 business/jxstore/cms/store_test.go | 11 +++++++++++
 business/jxutils/jxutils.go        |  2 +-
 3 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go
index 64f75a7ad..d41403b09 100644
--- a/business/jxstore/cms/store.go
+++ b/business/jxstore/cms/store.go
@@ -1299,16 +1299,21 @@ func SendAlarmVendorSnapshot(ctx *jxcontext.Context, parentTask tasksch.ITask, p
 								model.VendorChineseNames[vendorID]+"之前状态", model.VendorChineseNames[vendorID]+"当前状态",
 								model.VendorChineseNames[vendorID]+"之前营业时间", model.VendorChineseNames[vendorID]+"当前营业时间")
 						}
+						data[model.VendorChineseNames[vendorID]+"当前状态"] = ""
+						data[model.VendorChineseNames[vendorID]+"当前营业时间"] = ""
 						prevSnapshot := prevSnapshotMap[vendorID]
-						data[model.VendorChineseNames[vendorID]+"ID"] = prevSnapshot.VendorStoreID
-						data[model.VendorChineseNames[vendorID]+"之前状态"] = model.StoreStatusName[prevSnapshot.Status]
-						data[model.VendorChineseNames[vendorID]+"当前状态"] = jxutils.OperationTimeStr4VendorStore(prevSnapshot)
-						if snapshot := curSnapshotMap[prevSnapshot.GenMapKey()]; snapshot != nil {
-							data[model.VendorChineseNames[vendorID]+"当前状态"] = model.StoreStatusName[snapshot.Status]
-							data[model.VendorChineseNames[vendorID]+"当前营业时间"] = jxutils.OperationTimeStr4VendorStore(snapshot)
+						if prevSnapshot != nil {
+							data[model.VendorChineseNames[vendorID]+"ID"] = prevSnapshot.VendorStoreID
+							data[model.VendorChineseNames[vendorID]+"之前状态"] = model.StoreStatusName[prevSnapshot.Status]
+							data[model.VendorChineseNames[vendorID]+"之前营业时间"] = jxutils.OperationTimeStr4VendorStore(prevSnapshot)
+							if snapshot := curSnapshotMap[prevSnapshot.GenMapKey()]; snapshot != nil {
+								data[model.VendorChineseNames[vendorID]+"当前状态"] = model.StoreStatusName[snapshot.Status]
+								data[model.VendorChineseNames[vendorID]+"当前营业时间"] = jxutils.OperationTimeStr4VendorStore(snapshot)
+							}
 						} else {
-							data[model.VendorChineseNames[vendorID]+"当前状态"] = ""
-							data[model.VendorChineseNames[vendorID]+"当前营业时间"] = ""
+							data[model.VendorChineseNames[vendorID]+"ID"] = ""
+							data[model.VendorChineseNames[vendorID]+"之前状态"] = ""
+							data[model.VendorChineseNames[vendorID]+"之前营业时间"] = ""
 						}
 					}
 					dataList = append(dataList, data)
diff --git a/business/jxstore/cms/store_test.go b/business/jxstore/cms/store_test.go
index 31b8a5230..c119418a8 100644
--- a/business/jxstore/cms/store_test.go
+++ b/business/jxstore/cms/store_test.go
@@ -6,6 +6,7 @@ import (
 	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
 	"git.rosy.net.cn/jx-callback/business/model"
+	"git.rosy.net.cn/jx-callback/business/model/dao"
 )
 
 func TestGetStoresVendorSnapshot(t *testing.T) {
@@ -16,3 +17,13 @@ func TestGetStoresVendorSnapshot(t *testing.T) {
 	t.Log(utils.Format4Output(result, false))
 	t.Log(len(result))
 }
+
+func TestSendAlarmVendorSnapshot(t *testing.T) {
+	db := dao.GetDB()
+	prevSnapshotList, _ := dao.GetVendorStoreSnapshot(db, utils.Str2Time("2019-06-27 10:00:00"))
+	curSnapshotList, _ := dao.GetVendorStoreSnapshot(db, utils.Str2Time("2018-06-27 10:00:00"))
+	err := SendAlarmVendorSnapshot(jxcontext.AdminCtx, nil, prevSnapshotList, curSnapshotList)
+	if err != nil {
+		t.Fatal(err)
+	}
+}
diff --git a/business/jxutils/jxutils.go b/business/jxutils/jxutils.go
index 82a3d6407..47d88e8ce 100644
--- a/business/jxutils/jxutils.go
+++ b/business/jxutils/jxutils.go
@@ -623,7 +623,7 @@ func OperationTime2Str2(openTime, closeTime int16) (str string) {
 func OperationTimeStr4VendorStore(v *model.VendorStoreSnapshot) (str string) {
 	str = fmt.Sprintf("%s", OperationTime2Str2(v.OpenTime1, v.CloseTime1))
 	if v.OpenTime2 > 0 && v.CloseTime2 > 0 {
-		str += fmt.Sprintf("|%s", OperationTime2Str2(v.OpenTime2, v.CloseTime2))
+		str += fmt.Sprintf(",%s", OperationTime2Str2(v.OpenTime2, v.CloseTime2))
 	}
 	return str
 }