diff --git a/business/jxstore/cms/storeman.go b/business/jxstore/cms/storeman.go index 659f6b943..b95807ea5 100644 --- a/business/jxstore/cms/storeman.go +++ b/business/jxstore/cms/storeman.go @@ -1,9 +1,7 @@ package cms import ( - "git.rosy.net.cn/baseapi/platformapi/dingdingapi" "git.rosy.net.cn/baseapi/utils" - "git.rosy.net.cn/jx-callback/business/jxutils/ddmsg" "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" "git.rosy.net.cn/jx-callback/business/jxutils/netprinter" "git.rosy.net.cn/jx-callback/business/model" @@ -37,10 +35,10 @@ func (s *StoreManager) OnStoreStatusChanged(vendorStoreID string, vendorID int, storeKV = map[string]interface{}{ "Status": model.StoreStatusOpened, } - content := "您的门店 [" + storeDetail.Name + "],ID:[" + utils.Int2Str(storeDetail.ID) + "],在[" + model.VendorChineseNames[vendorID] + "] 平台上营业状态和京西不一致!平台状态:【营业】,京西状态:【非营业】" - if user, err := dao.GetUserByID(db, "mobile", storeDetail.MarketManPhone); err == nil { - ddmsg.SendUserMessage(dingdingapi.MsgTyeText, user.UserID, "平台门店状态变化", content) - } + //content := "您的门店 [" + storeDetail.Name + "],ID:[" + utils.Int2Str(storeDetail.ID) + "],在[" + model.VendorChineseNames[vendorID] + "] 平台上营业状态和京西不一致!平台状态:【营业】,京西状态:【非营业】" + //if user, err := dao.GetUserByID(db, "mobile", storeDetail.MarketManPhone); err == nil { + // ddmsg.SendUserMessage(dingdingapi.MsgTyeText, user.UserID, "平台门店状态变化", content) + //} } if storeDetail.VendorStatus != model.StoreStatusOpened { storeMapKV = map[string]interface{}{ @@ -54,10 +52,10 @@ func (s *StoreManager) OnStoreStatusChanged(vendorStoreID string, vendorID int, "Status": storeStatus, } } - content := "您的门店 [" + storeDetail.Name + "],ID:[" + utils.Int2Str(storeDetail.ID) + "],在[" + model.VendorChineseNames[vendorID] + "] 平台上营业状态和京西不一致!平台状态:【非营业】,京西状态:【营业】" - if user, err := dao.GetUserByID(db, "mobile", storeDetail.MarketManPhone); err == nil { - ddmsg.SendUserMessage(dingdingapi.MsgTyeText, user.UserID, "平台门店状态变化", content) - } + //content := "您的门店 [" + storeDetail.Name + "],ID:[" + utils.Int2Str(storeDetail.ID) + "],在[" + model.VendorChineseNames[vendorID] + "] 平台上营业状态和京西不一致!平台状态:【非营业】,京西状态:【营业】" + //if user, err := dao.GetUserByID(db, "mobile", storeDetail.MarketManPhone); err == nil { + // ddmsg.SendUserMessage(dingdingapi.MsgTyeText, user.UserID, "平台门店状态变化", content) + //} } else if storeDetail.Status <= storeStatus { if storeDetail.VendorStatus != model.StoreStatusOpened { storeMapKV = map[string]interface{}{ diff --git a/business/jxstore/report/report.go b/business/jxstore/report/report.go index d05d26f77..3ed5bb7ac 100644 --- a/business/jxstore/report/report.go +++ b/business/jxstore/report/report.go @@ -10,9 +10,6 @@ import ( "strings" "time" - "git.rosy.net.cn/jx-callback/business/jxutils/ddmsg" - - "git.rosy.net.cn/baseapi/platformapi/dingdingapi" "git.rosy.net.cn/baseapi/platformapi/mtwmapi" "git.rosy.net.cn/jx-callback/business/jxutils" @@ -495,25 +492,25 @@ func buildStoreManageState(ctx *jxcontext.Context, db *dao.DaoDB, storeMap *mode //营业状态 storeManage.VendorStatus = store.Status //不一致发消息 - if messageFlag { - vendorStatus, status := -1, -1 - if store.Status == model.StoreStatusOpened { - vendorStatus = 1 - } - if storeDetail.Status == model.StoreStatusOpened { - status = 1 - } - statusMap := map[int]string{ - 1: "营业", - -1: "休息", - } - if vendorStatus != status { - content := "您的门店 [" + storeDetail.Name + "],ID:[" + utils.Int2Str(storeDetail.ID) + "],在[" + model.VendorChineseNames[storeMap.VendorID] + "] 平台上营业状态和京西不一致!平台状态:【" + statusMap[vendorStatus] + "】,京西状态:【" + statusMap[status] + "】" - if user, err := dao.GetUserByID(db, "mobile", storeDetail.MarketManPhone); err == nil { - ddmsg.SendUserMessage(dingdingapi.MsgTyeText, user.UserID, "平台门店状态变化", content) - } - } - } + //if messageFlag { + // vendorStatus, status := -1, -1 + // if store.Status == model.StoreStatusOpened { + // vendorStatus = 1 + // } + // if storeDetail.Status == model.StoreStatusOpened { + // status = 1 + // } + // //statusMap := map[int]string{ + // // 1: "营业", + // // -1: "休息", + // //} + // //if vendorStatus != status { + // // content := "您的门店 [" + storeDetail.Name + "],ID:[" + utils.Int2Str(storeDetail.ID) + "],在[" + model.VendorChineseNames[storeMap.VendorID] + "] 平台上营业状态和京西不一致!平台状态:【" + statusMap[vendorStatus] + "】,京西状态:【" + statusMap[status] + "】" + // // if user, err := dao.GetUserByID(db, "mobile", storeDetail.MarketManPhone); err == nil { + // // ddmsg.SendUserMessage(dingdingapi.MsgTyeText, user.UserID, "平台门店状态变化", content) + // // } + // //} + //} //营业时长 optime := jxutils.JxOperationTime2TimeByDate(storeDetail.CloseTime1, time.Now()).Sub(jxutils.JxOperationTime2TimeByDate(storeDetail.OpenTime1, time.Now())).Hours() if storeDetail.CloseTime2 != 0 && storeDetail.OpenTime2 != 0 {