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

1

Browse Source
This commit is contained in:
richboo111
2023-07-12 17:53:14 +08:00
parent c2be67e175
commit de40be335c
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
business/jxutils/unipush/push.go
View File

@@ -116,7 +116,7 @@ func NotifyOrderCanceled(order *model.GoodsOrder) (err error) {
}
// NotifyImNewMessage IM 新消息通知
func NotifyImNewMessage(vendorStoreID string, vendorID int) error {
func NotifyImNewMessage(vendorStoreID string, vendorID int, offMsg string) error {
if len(vendorStoreID) == 0 {
return nil
}
@@ -137,9 +137,9 @@ func NotifyImNewMessage(vendorStoreID string, vendorID int) error {
msg.VendorName = model.VendorChineseNames[vendorID]
msg.StoreTitle = store.Name
msg.Context = "老板,你有新的用户消息,请及时查看!"
context, _ := json.Marshal(msg)
//context, _ := json.Marshal(msg)
body := fmt.Sprintf(msg.Context+"(%s)", model.VendorChineseNames[vendorID])
pushMsgByUniApp(store.ID, store.Name, cid, string(context), body, SoundsFileNewImMsg, FlagIm)
pushMsgByUniApp(store.ID, store.Name, cid, offMsg, body, SoundsFileNewImMsg, FlagIm)
return err
}

8
business/partner/purchase/im/im.go
View File

@@ -106,7 +106,7 @@ func ReadMsgFromVendor(vendorID int, elmAppID string, msg []byte) error {
errList errlist.ErrList
userList = &UserMessageList{}
)
if string(msg) == "" {
if len(string(msg)) == 0 {
errList.AddErr(fmt.Errorf("读取平台数据为空，请检查"))
}
if vendorID == VendorIDMT {
@@ -151,7 +151,7 @@ func ReadMsgFromVendor(vendorID int, elmAppID string, msg []byte) error {
errList.AddErr(fmt.Errorf("存储STU聊天记录错误：%v", err))
}
//3 cid推送新消息
if err = PushMsgByCid(vendorStoreID, vendorID); err != nil {
if err = PushMsgByCid(vendorStoreID, vendorID, string(msg)); err != nil {
errList.AddErr(fmt.Errorf("向商家cid推送新消息错误：%v", err))
}
@@ -162,8 +162,8 @@ func ReadMsgFromVendor(vendorID int, elmAppID string, msg []byte) error {
}
// PushMsgByCid 通过cid push用户
func PushMsgByCid(vendorStoreID string, vendorID int) error {
if err := push.NotifyImNewMessage(vendorStoreID, vendorID); err != nil {
func PushMsgByCid(vendorStoreID string, vendorID int, msg string) error {
if err := push.NotifyImNewMessage(vendorStoreID, vendorID, msg); err != nil {
return err
}
return nil