From 8241434e919ac5b89c89e9514548954001d6ff77 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Wed, 24 Jan 2024 09:41:19 +0800 Subject: [PATCH 01/13] 1 --- business/partner/im/im.go | 34 +++++++++++++--------- business/partner/purchase/mtwm/callback.go | 3 +- 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/business/partner/im/im.go b/business/partner/im/im.go index 0844629d1..e2f5536c1 100644 --- a/business/partner/im/im.go +++ b/business/partner/im/im.go @@ -472,7 +472,7 @@ func CheckAndReply(req *JXMsg, elmAppID string) (err error) { flag = false vendorID int errList errlist.ErrList - apply AutoReply + apply *AutoReply jxMsg = &JXMsg{} userList = &UserMessageList{} ) @@ -484,7 +484,7 @@ func CheckAndReply(req *JXMsg, elmAppID string) (err error) { flag = GetIfReply(key) //判断flag状态 if !flag { - apply = AutoReply{ + apply = &AutoReply{ UserID: mt.AppID, MsgID: mt.MsgID, IsApply: true, @@ -533,7 +533,7 @@ func CheckAndReply(req *JXMsg, elmAppID string) (err error) { //1 检测是否已自动回复 flag = GetIfReply(key) if !flag { - apply = AutoReply{ + apply = &AutoReply{ UserID: utils.Str2Int(elm.PayLoad.SenderID), MsgID: utils.Str2Int(elm.PayLoad.MsgID), IsApply: true, @@ -579,18 +579,24 @@ func CheckAndReply(req *JXMsg, elmAppID string) (err error) { } } - //1 存储详细聊天记录list - if err = SetMessageDetail(jxMsg, vendorID, elmAppID); err != nil { - errList.AddErr(fmt.Errorf("自动回复：存储详细聊天记录错误：%v", err)) + if jxMsg != nil { + //1 存储详细聊天记录list + if err = SetMessageDetail(jxMsg, vendorID, elmAppID); err != nil { + errList.AddErr(fmt.Errorf("自动回复：存储详细聊天记录错误：%v", err)) + } + //2 存储展示列表时单条数据 + if err = SetUserList(jxMsg, userList, vendorID, elmAppID); err != nil { + errList.AddErr(fmt.Errorf("自动回复：存储STU聊天记录错误：%v", err)) + } } - //2 存储展示列表时单条数据 - if err = SetUserList(jxMsg, userList, vendorID, elmAppID); err != nil { - errList.AddErr(fmt.Errorf("自动回复：存储STU聊天记录错误：%v", err)) - } - //3 记录自动回复状态 - if err = RecordAutoStatus(key, apply); err != nil { - errList.AddErr(fmt.Errorf("自动回复：记录自动回复状态错误：%v", err)) + + if apply != nil { + //3 记录自动回复状态 + if err = RecordAutoStatus(key, apply); err != nil { + errList.AddErr(fmt.Errorf("自动回复：记录自动回复状态错误：%v", err)) + } } + if errList.GetErrListAsOne() != nil { return fmt.Errorf("CheckAndReply err=%v", errList.GetErrListAsOne()) } @@ -613,7 +619,7 @@ func GetIfReply(key string) (flag bool) { } // RecordAutoStatus 记录是否已自动回复状态 -func RecordAutoStatus(key string, apply AutoReply) error { +func RecordAutoStatus(key string, apply *AutoReply) error { data, _ := json.Marshal(apply) err := rdb.RPush(key, string(data)) ok, err := rdb.ExpireResult(key, ExpireTimeDay) diff --git a/business/partner/purchase/mtwm/callback.go b/business/partner/purchase/mtwm/callback.go index 22872f8f4..a6c12bd53 100644 --- a/business/partner/purchase/mtwm/callback.go +++ b/business/partner/purchase/mtwm/callback.go @@ -2,6 +2,7 @@ package mtwm import ( "encoding/json" + "git.rosy.net.cn/baseapi/utils" "net/http" "strings" @@ -122,7 +123,7 @@ func GetMsgCallBackUrl(msgType, appId string) string { // OnImMsg im消息回调 func OnImMsg(msg *mtwmapi.ImCallbackMsg) (response *mtwmapi.CallbackResponse) { - + globals.SugarLogger.Debugf("OnImMsg test0124 msg:=%s", utils.Format4Output(msg, false)) if str, err := json.Marshal(msg.PushContent); err == nil { err = im.ReadMsgFromVendor(model.VendorIDMTWM, "", str) if err != nil { From 389abeeb174168344b5b0e9204a854014d011b3b Mon Sep 17 00:00:00 2001 From: richboo111 Date: Wed, 24 Jan 2024 11:13:15 +0800 Subject: [PATCH 02/13] 1 --- business/partner/im/im.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/business/partner/im/im.go b/business/partner/im/im.go index e2f5536c1..f7923f3be 100644 --- a/business/partner/im/im.go +++ b/business/partner/im/im.go @@ -10,6 +10,8 @@ import ( "strings" "time" + "github.com/astaxie/beego/client/orm" + "git.rosy.net.cn/jx-callback/business/model/dao" "git.rosy.net.cn/jx-callback/business/partner" @@ -666,8 +668,8 @@ func GetDefaultTemplate(appID, vendorStoreID string, vendorID int) (string, erro phoneNum = " " t string ) - store, err := dao.GetStoreDetail2(dao.GetDB(), 0, vendorStoreID, vendorID) - if err != nil { + store, err := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), vendorStoreID, vendorID, "") + if err != nil && err != orm.ErrNoRows { return "", err } if len(store.Tel1) > 0 { From cfb2932334ba3212eeb11bf879d325363d0be30a Mon Sep 17 00:00:00 2001 From: richboo111 Date: Wed, 24 Jan 2024 11:28:09 +0800 Subject: [PATCH 03/13] 1 --- business/partner/im/im.go | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/business/partner/im/im.go b/business/partner/im/im.go index f7923f3be..ec1a02990 100644 --- a/business/partner/im/im.go +++ b/business/partner/im/im.go @@ -284,6 +284,7 @@ func SetMessageDetail(req *JXMsg, vendorID int, elmAppID string) error { } //生成京西消息ID detail msgID := GenMsgDetailID(req, vendorID, elmAppID) + data, _ := json.Marshal(req) globals.SugarLogger.Debugf("SetMessageDetail data=%s", string(data)) err := rdb.RPush(msgID, string(data)) @@ -402,6 +403,30 @@ func FilterUserList(val string) bool { return true } +// FilterChatDetail 去重 +func FilterChatDetail(req *JXMsg, vendorID int) { + //if vendorID == VendorIDMT { + // mt := req.MsgContent.(mtwmapi.PushContentReq) + // temp, _ := GetImChatDetail([]UserRelInfo{{ + // VendorStoreID: mt.AppPoiCode, + // VendorID: "1", + // AppID: utils.Int2Str(mt.AppID), + // UserID: utils.Int2Str(mt.OpenUserID), + // }}) + // + //} + // + //if vendorID == VendorIDELM { + // elm := req.MsgContent.(ebaiapi.ImMessageSend) + // temp, _ := GetImChatDetail([]UserRelInfo{{ + // VendorStoreID: elm.PlatformShopID, + // VendorID: "3", + // AppID: "34665", + // UserID: elm.PayLoad.SenderID, + // }}) + //} +} + // GetImChatDetail 获取门店用户聊天详情 func GetImChatDetail(req []UserRelInfo) (map[string][]interface{}, error) { retVal := make(map[string][]interface{}, 0) From fcebcaada8910ac1e0b3eb0e24a88daa19cf6537 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Wed, 24 Jan 2024 11:33:22 +0800 Subject: [PATCH 04/13] 1 --- business/partner/im/im.go | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/business/partner/im/im.go b/business/partner/im/im.go index ec1a02990..b3dd40852 100644 --- a/business/partner/im/im.go +++ b/business/partner/im/im.go @@ -284,6 +284,9 @@ func SetMessageDetail(req *JXMsg, vendorID int, elmAppID string) error { } //生成京西消息ID detail msgID := GenMsgDetailID(req, vendorID, elmAppID) + if len(msgID) == 0 { + return nil + } data, _ := json.Marshal(req) globals.SugarLogger.Debugf("SetMessageDetail data=%s", string(data)) @@ -300,6 +303,9 @@ func SetMessageDetail(req *JXMsg, vendorID int, elmAppID string) error { func SetUserList(jxMsg *JXMsg, userList *UserMessageList, vendorID int, elmAppID string) error { //生成msgID msgID := GenMsgListID(jxMsg, vendorID, elmAppID) + if len(msgID) == 0 { + return nil + } //获取未读消息条数并删除旧数据 cnt, err := GetNewAndTrim(msgID, userList.UserID) @@ -347,6 +353,10 @@ func GetNewAndTrim(key string, flag string) (cnt int, err error) { // GenMsgDetailID 生成查询详细聊天记录ID func GenMsgDetailID(jxMsg *JXMsg, vendorID int, elmAppID string) (msgID string) { + globals.SugarLogger.Debugf("GenMsgDetailID test0124 jxMsg=%s", utils.Format4Output(jxMsg, false)) + if jxMsg == nil { + return "" + } if vendorID == VendorIDMT { var d1 = jxMsg.MsgContent.(mtwmapi.PushContentReq) msgID = utils.Int2Str(d1.AppID) + ":" + d1.AppPoiCode + ":1:" + utils.Int2Str(d1.OpenUserID) @@ -360,6 +370,11 @@ func GenMsgDetailID(jxMsg *JXMsg, vendorID int, elmAppID string) (msgID string) // GenMsgListID 生成展示列表时单条数据ID（部分） func GenMsgListID(jxMsg *JXMsg, vendorID int, elmAppID string) (msgID string) { + + globals.SugarLogger.Debugf("GenMsgListID test0124 jxMsg=%s,vendorID=%d", utils.Format4Output(jxMsg, false), vendorID) + if jxMsg == nil { + return "" + } if vendorID == VendorIDMT { var d1 = jxMsg.MsgContent.(mtwmapi.PushContentReq) msgID = utils.Int2Str(d1.AppID) + ":" + d1.AppPoiCode + ":1" From 3bd5106b14c75ac461a0704436dde28a72c9a298 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Wed, 24 Jan 2024 11:45:53 +0800 Subject: [PATCH 05/13] 1 --- business/partner/im/im.go | 59 ++++++++++++++++++++++++++++----------- 1 file changed, 42 insertions(+), 17 deletions(-) diff --git a/business/partner/im/im.go b/business/partner/im/im.go index b3dd40852..20d190fdd 100644 --- a/business/partner/im/im.go +++ b/business/partner/im/im.go @@ -563,6 +563,19 @@ func CheckAndReply(req *JXMsg, elmAppID string) (err error) { LatestTime: mt.Cts, OrderID: "", } + + //1 存储详细聊天记录list + if err = SetMessageDetail(jxMsg, vendorID, elmAppID); err != nil { + errList.AddErr(fmt.Errorf("自动回复：存储详细聊天记录错误：%v", err)) + } + //2 存储展示列表时单条数据 + if err = SetUserList(jxMsg, userList, vendorID, elmAppID); err != nil { + errList.AddErr(fmt.Errorf("自动回复：存储STU聊天记录错误：%v", err)) + } + } + //3 记录自动回复状态 + if err = RecordAutoStatus(key, apply); err != nil { + errList.AddErr(fmt.Errorf("自动回复：记录自动回复状态错误：%v", err)) } } } @@ -617,27 +630,39 @@ func CheckAndReply(req *JXMsg, elmAppID string) (err error) { LatestTime: elm.PayLoad.CreateTime, OrderID: "", } + //1 存储详细聊天记录list + if err = SetMessageDetail(jxMsg, vendorID, elmAppID); err != nil { + errList.AddErr(fmt.Errorf("自动回复：存储详细聊天记录错误：%v", err)) + } + //2 存储展示列表时单条数据 + if err = SetUserList(jxMsg, userList, vendorID, elmAppID); err != nil { + errList.AddErr(fmt.Errorf("自动回复：存储STU聊天记录错误：%v", err)) + } + } + //3 记录自动回复状态 + if err = RecordAutoStatus(key, apply); err != nil { + errList.AddErr(fmt.Errorf("自动回复：记录自动回复状态错误：%v", err)) } } } - if jxMsg != nil { - //1 存储详细聊天记录list - if err = SetMessageDetail(jxMsg, vendorID, elmAppID); err != nil { - errList.AddErr(fmt.Errorf("自动回复：存储详细聊天记录错误：%v", err)) - } - //2 存储展示列表时单条数据 - if err = SetUserList(jxMsg, userList, vendorID, elmAppID); err != nil { - errList.AddErr(fmt.Errorf("自动回复：存储STU聊天记录错误：%v", err)) - } - } - - if apply != nil { - //3 记录自动回复状态 - if err = RecordAutoStatus(key, apply); err != nil { - errList.AddErr(fmt.Errorf("自动回复：记录自动回复状态错误：%v", err)) - } - } + //if jxMsg != nil { + // //1 存储详细聊天记录list + // if err = SetMessageDetail(jxMsg, vendorID, elmAppID); err != nil { + // errList.AddErr(fmt.Errorf("自动回复：存储详细聊天记录错误：%v", err)) + // } + // //2 存储展示列表时单条数据 + // if err = SetUserList(jxMsg, userList, vendorID, elmAppID); err != nil { + // errList.AddErr(fmt.Errorf("自动回复：存储STU聊天记录错误：%v", err)) + // } + //} + // + //if apply != nil { + // //3 记录自动回复状态 + // if err = RecordAutoStatus(key, apply); err != nil { + // errList.AddErr(fmt.Errorf("自动回复：记录自动回复状态错误：%v", err)) + // } + //} if errList.GetErrListAsOne() != nil { return fmt.Errorf("CheckAndReply err=%v", errList.GetErrListAsOne()) From ca65ccf637ce17e796e689635455b1568d973333 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Wed, 24 Jan 2024 14:13:48 +0800 Subject: [PATCH 06/13] 1 --- business/partner/im/im.go | 25 +++++++++++++--------- business/partner/purchase/mtwm/callback.go | 3 +-- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/business/partner/im/im.go b/business/partner/im/im.go index 20d190fdd..074e0d2d1 100644 --- a/business/partner/im/im.go +++ b/business/partner/im/im.go @@ -353,7 +353,7 @@ func GetNewAndTrim(key string, flag string) (cnt int, err error) { // GenMsgDetailID 生成查询详细聊天记录ID func GenMsgDetailID(jxMsg *JXMsg, vendorID int, elmAppID string) (msgID string) { - globals.SugarLogger.Debugf("GenMsgDetailID test0124 jxMsg=%s", utils.Format4Output(jxMsg, false)) + //globals.SugarLogger.Debugf("GenMsgDetailID test0124 jxMsg=%s", utils.Format4Output(jxMsg, false)) if jxMsg == nil { return "" } @@ -371,7 +371,7 @@ func GenMsgDetailID(jxMsg *JXMsg, vendorID int, elmAppID string) (msgID string) // GenMsgListID 生成展示列表时单条数据ID（部分） func GenMsgListID(jxMsg *JXMsg, vendorID int, elmAppID string) (msgID string) { - globals.SugarLogger.Debugf("GenMsgListID test0124 jxMsg=%s,vendorID=%d", utils.Format4Output(jxMsg, false), vendorID) + //globals.SugarLogger.Debugf("GenMsgListID test0124 jxMsg=%s,vendorID=%d", utils.Format4Output(jxMsg, false), vendorID) if jxMsg == nil { return "" } @@ -595,7 +595,7 @@ func CheckAndReply(req *JXMsg, elmAppID string) (err error) { Timestamp: elm.PayLoad.CreateTime, } - temp := &ebaiapi.BusinessSendMsgReq{ + param := &ebaiapi.BusinessSendMsgReq{ PlatformShopId: elm.PlatformShopID, BizType: ebaiapi.IMType, SubBizType: ebaiapi.IMTypeSendMsg, @@ -606,16 +606,20 @@ func CheckAndReply(req *JXMsg, elmAppID string) (err error) { ContentType: utils.Int2Str(ebaiapi.ContentTypeNormal), }, } + + temp := "" if template := GetCustomTemplate(elmAppID, elm.PlatformShopID); len(template) > 0 { - temp.Payload.Content = template + temp = template } else { - temp.Payload.Content, err = GetDefaultTemplate(elmAppID, elm.PlatformShopID, VendorIDELM) + temp, err = GetDefaultTemplate(elmAppID, elm.PlatformShopID, VendorIDELM) if err != nil { - temp.Payload.Content = LastTemplate + temp = LastTemplate } } + tempStr, _ := json.Marshal(temp) + param.Payload.Content = string(tempStr) - if err = partner.CurAPIManager.GetAPI(model.VendorIDEBAI, elmAppID).(*ebaiapi.API).BusinessSendMsg(temp); err != nil { + if err = partner.CurAPIManager.GetAPI(model.VendorIDEBAI, elmAppID).(*ebaiapi.API).BusinessSendMsg(param); err != nil { apply.IsApply = false globals.SugarLogger.Debugf("CheckAndReply mtSend err:%v", err) } else { @@ -737,12 +741,13 @@ func GetDefaultTemplate(appID, vendorStoreID string, vendorID int) (string, erro if err != nil && err != orm.ErrNoRows { return "", err } + if err == orm.ErrNoRows || (len(store.Tel1) == 0 && len(store.Tel2) == 0) { + t = BasePhoneNum + } if len(store.Tel1) > 0 { t = store.Tel1 } - if len(store.Tel1) == 0 && len(store.Tel2) == 0 { - t = BasePhoneNum - } + phoneNum = t[:3] + "-" + t[3:7] + "-" + t[7:] temp := BaseTemplate + phoneNum diff --git a/business/partner/purchase/mtwm/callback.go b/business/partner/purchase/mtwm/callback.go index a6c12bd53..955b64c5a 100644 --- a/business/partner/purchase/mtwm/callback.go +++ b/business/partner/purchase/mtwm/callback.go @@ -2,7 +2,6 @@ package mtwm import ( "encoding/json" - "git.rosy.net.cn/baseapi/utils" "net/http" "strings" @@ -123,7 +122,7 @@ func GetMsgCallBackUrl(msgType, appId string) string { // OnImMsg im消息回调 func OnImMsg(msg *mtwmapi.ImCallbackMsg) (response *mtwmapi.CallbackResponse) { - globals.SugarLogger.Debugf("OnImMsg test0124 msg:=%s", utils.Format4Output(msg, false)) + //globals.SugarLogger.Debugf("OnImMsg test0124 msg:=%s", utils.Format4Output(msg, false)) if str, err := json.Marshal(msg.PushContent); err == nil { err = im.ReadMsgFromVendor(model.VendorIDMTWM, "", str) if err != nil { From 14a801fb4610c48e953b130d068f1dc113315c84 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Wed, 24 Jan 2024 15:50:27 +0800 Subject: [PATCH 07/13] 1 --- business/partner/im/im.go | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/business/partner/im/im.go b/business/partner/im/im.go index 074e0d2d1..4ccc250d0 100644 --- a/business/partner/im/im.go +++ b/business/partner/im/im.go @@ -362,8 +362,14 @@ func GenMsgDetailID(jxMsg *JXMsg, vendorID int, elmAppID string) (msgID string) msgID = utils.Int2Str(d1.AppID) + ":" + d1.AppPoiCode + ":1:" + utils.Int2Str(d1.OpenUserID) } if vendorID == VendorIDELM { - var d2 = jxMsg.MsgContent.(ebaiapi.ImMessageSend) - msgID = elmAppID + ":" + d2.PlatformShopID + ":3:" + d2.PayLoad.GroupID + var ElmData = ebaiapi.ImMessageSend{} + tempMsgContent, _ := json.Marshal(jxMsg.MsgContent) + if err := json.Unmarshal(tempMsgContent, &ElmData); err != nil { + return "" + } + //var d2 = jxMsg.MsgContent.(ebaiapi.ImMessageSend) + //msgID = elmAppID + ":" + d2.PlatformShopID + ":3:" + d2.PayLoad.GroupID + msgID = elmAppID + ":" + ElmData.PlatformShopID + ":3:" + ElmData.PayLoad.GroupID } return msgID } @@ -380,8 +386,14 @@ func GenMsgListID(jxMsg *JXMsg, vendorID int, elmAppID string) (msgID string) { msgID = utils.Int2Str(d1.AppID) + ":" + d1.AppPoiCode + ":1" } if vendorID == VendorIDELM { - var d2 = jxMsg.MsgContent.(ebaiapi.ImMessageSend) - msgID = elmAppID + ":" + d2.PlatformShopID + ":3" + var ElmData = ebaiapi.ImMessageSend{} + tempMsgContent, _ := json.Marshal(jxMsg.MsgContent) + err := json.Unmarshal(tempMsgContent, &ElmData) + fmt.Println(err) + //var d2 = jxMsg.MsgContent.(ebaiapi.ImMessageSend) + //msgID = elmAppID + ":" + d2.PlatformShopID + ":3" + msgID = elmAppID + ":" + ElmData.PlatformShopID + ":3:" + ElmData.PayLoad.GroupID + } return msgID } @@ -617,7 +629,11 @@ func CheckAndReply(req *JXMsg, elmAppID string) (err error) { } } tempStr, _ := json.Marshal(temp) - param.Payload.Content = string(tempStr) + tempContent := ebaiapi.Content{ + Text: string(tempStr), + } + tempContentStr, _ := json.Marshal(tempContent) + param.Payload.Content = string(tempContentStr) if err = partner.CurAPIManager.GetAPI(model.VendorIDEBAI, elmAppID).(*ebaiapi.API).BusinessSendMsg(param); err != nil { apply.IsApply = false @@ -625,7 +641,7 @@ func CheckAndReply(req *JXMsg, elmAppID string) (err error) { } else { jxMsg = &JXMsg{ SendType: SendTypeJx, - MsgContent: temp, + MsgContent: param, } userList = &UserMessageList{ VendorID: VendorIDELM, From 0803f6ad12a7bc1cb4f138374bf5ce3f72446ba0 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Wed, 24 Jan 2024 16:25:10 +0800 Subject: [PATCH 08/13] 1 --- business/partner/im/im.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/partner/im/im.go b/business/partner/im/im.go index 4ccc250d0..f42f21546 100644 --- a/business/partner/im/im.go +++ b/business/partner/im/im.go @@ -392,7 +392,7 @@ func GenMsgListID(jxMsg *JXMsg, vendorID int, elmAppID string) (msgID string) { fmt.Println(err) //var d2 = jxMsg.MsgContent.(ebaiapi.ImMessageSend) //msgID = elmAppID + ":" + d2.PlatformShopID + ":3" - msgID = elmAppID + ":" + ElmData.PlatformShopID + ":3:" + ElmData.PayLoad.GroupID + msgID = elmAppID + ":" + ElmData.PlatformShopID + ":3" } return msgID From a5e151cab60d34848574a708acaf7fffa6f90e53 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Wed, 24 Jan 2024 17:07:01 +0800 Subject: [PATCH 09/13] 1 --- business/partner/im/im.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/business/partner/im/im.go b/business/partner/im/im.go index f42f21546..c0eb0ef5c 100644 --- a/business/partner/im/im.go +++ b/business/partner/im/im.go @@ -628,9 +628,10 @@ func CheckAndReply(req *JXMsg, elmAppID string) (err error) { temp = LastTemplate } } - tempStr, _ := json.Marshal(temp) + //tempStr, _ := json.Marshal(temp) tempContent := ebaiapi.Content{ - Text: string(tempStr), + //Text: string(tempStr), + Text: temp, } tempContentStr, _ := json.Marshal(tempContent) param.Payload.Content = string(tempContentStr) From f14757133dbad55f54e43200103da737ae3003da Mon Sep 17 00:00:00 2001 From: richboo111 Date: Wed, 24 Jan 2024 17:13:41 +0800 Subject: [PATCH 10/13] 1 --- business/partner/im/im.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/business/partner/im/im.go b/business/partner/im/im.go index c0eb0ef5c..bdebf966f 100644 --- a/business/partner/im/im.go +++ b/business/partner/im/im.go @@ -628,10 +628,10 @@ func CheckAndReply(req *JXMsg, elmAppID string) (err error) { temp = LastTemplate } } - //tempStr, _ := json.Marshal(temp) + tempStr, _ := json.Marshal(temp) tempContent := ebaiapi.Content{ - //Text: string(tempStr), - Text: temp, + Text: string(tempStr), + //Text: temp, } tempContentStr, _ := json.Marshal(tempContent) param.Payload.Content = string(tempContentStr) From e09c99394dd4bfc58062dbab73ec87a7a3f21b94 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Wed, 24 Jan 2024 17:37:02 +0800 Subject: [PATCH 11/13] 1 --- business/partner/im/im.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/business/partner/im/im.go b/business/partner/im/im.go index bdebf966f..83a11a36f 100644 --- a/business/partner/im/im.go +++ b/business/partner/im/im.go @@ -611,7 +611,7 @@ func CheckAndReply(req *JXMsg, elmAppID string) (err error) { PlatformShopId: elm.PlatformShopID, BizType: ebaiapi.IMType, SubBizType: ebaiapi.IMTypeSendMsg, - Payload: ebaiapi.BusinessMsgPayload{ + PayLoad: ebaiapi.BusinessMsgPayload{ GroupId: elm.PayLoad.GroupID, MsgId: utils.Int2Str(RandTimeNumber()), ReceiverIds: elm.PayLoad.ReceiverIDs, @@ -640,6 +640,8 @@ func CheckAndReply(req *JXMsg, elmAppID string) (err error) { apply.IsApply = false globals.SugarLogger.Debugf("CheckAndReply mtSend err:%v", err) } else { + //t1 := json.Unmarshal(param.Payload.Content) + jxMsg = &JXMsg{ SendType: SendTypeJx, MsgContent: param, From ff551904e0f8ff4cda21e8d54ea85f734c8d8049 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Wed, 24 Jan 2024 17:39:42 +0800 Subject: [PATCH 12/13] 1 --- business/partner/im/im.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/partner/im/im.go b/business/partner/im/im.go index 83a11a36f..bbe6e5948 100644 --- a/business/partner/im/im.go +++ b/business/partner/im/im.go @@ -634,7 +634,7 @@ func CheckAndReply(req *JXMsg, elmAppID string) (err error) { //Text: temp, } tempContentStr, _ := json.Marshal(tempContent) - param.Payload.Content = string(tempContentStr) + param.PayLoad.Content = string(tempContentStr) if err = partner.CurAPIManager.GetAPI(model.VendorIDEBAI, elmAppID).(*ebaiapi.API).BusinessSendMsg(param); err != nil { apply.IsApply = false From 15462347cfd072c89edf190d76d51370fde7ea1c Mon Sep 17 00:00:00 2001 From: richboo111 Date: Wed, 24 Jan 2024 18:07:37 +0800 Subject: [PATCH 13/13] 1 --- business/partner/im/im.go | 62 ++++++++++++++------------------------- 1 file changed, 22 insertions(+), 40 deletions(-) diff --git a/business/partner/im/im.go b/business/partner/im/im.go index bbe6e5948..46ba65928 100644 --- a/business/partner/im/im.go +++ b/business/partner/im/im.go @@ -528,7 +528,7 @@ func CheckAndReply(req *JXMsg, elmAppID string) (err error) { errList errlist.ErrList apply *AutoReply jxMsg = &JXMsg{} - userList = &UserMessageList{} + //userList = &UserMessageList{} ) if req.SendType == SendTypeMt { vendorID = VendorIDMT @@ -568,22 +568,22 @@ func CheckAndReply(req *JXMsg, elmAppID string) (err error) { SendType: SendTypeJx, MsgContent: temp, } - userList = &UserMessageList{ - VendorID: VendorIDMT, - UserID: utils.Int2Str(mt.OpenUserID), - LatestMsg: mt.MsgContent, - LatestTime: mt.Cts, - OrderID: "", - } + //userList = &UserMessageList{ + // VendorID: VendorIDMT, + // UserID: utils.Int2Str(mt.OpenUserID), + // LatestMsg: mt.MsgContent, + // LatestTime: mt.Cts, + // OrderID: "", + //} - //1 存储详细聊天记录list + //1 存储详细聊天记录 if err = SetMessageDetail(jxMsg, vendorID, elmAppID); err != nil { errList.AddErr(fmt.Errorf("自动回复：存储详细聊天记录错误：%v", err)) } //2 存储展示列表时单条数据 - if err = SetUserList(jxMsg, userList, vendorID, elmAppID); err != nil { - errList.AddErr(fmt.Errorf("自动回复：存储STU聊天记录错误：%v", err)) - } + //if err = SetUserList(jxMsg, userList, vendorID, elmAppID); err != nil { + // errList.AddErr(fmt.Errorf("自动回复：存储STU聊天记录错误：%v", err)) + //} } //3 记录自动回复状态 if err = RecordAutoStatus(key, apply); err != nil { @@ -646,21 +646,21 @@ func CheckAndReply(req *JXMsg, elmAppID string) (err error) { SendType: SendTypeJx, MsgContent: param, } - userList = &UserMessageList{ - VendorID: VendorIDELM, - UserID: elm.PayLoad.SenderID, - LatestMsg: elm.PayLoad.Content, - LatestTime: elm.PayLoad.CreateTime, - OrderID: "", - } + //userList = &UserMessageList{ + // VendorID: VendorIDELM, + // UserID: elm.PayLoad.SenderID, + // LatestMsg: elm.PayLoad.Content, + // LatestTime: elm.PayLoad.CreateTime, + // OrderID: "", + //} //1 存储详细聊天记录list if err = SetMessageDetail(jxMsg, vendorID, elmAppID); err != nil { errList.AddErr(fmt.Errorf("自动回复：存储详细聊天记录错误：%v", err)) } //2 存储展示列表时单条数据 - if err = SetUserList(jxMsg, userList, vendorID, elmAppID); err != nil { - errList.AddErr(fmt.Errorf("自动回复：存储STU聊天记录错误：%v", err)) - } + //if err = SetUserList(jxMsg, userList, vendorID, elmAppID); err != nil { + // errList.AddErr(fmt.Errorf("自动回复：存储STU聊天记录错误：%v", err)) + //} } //3 记录自动回复状态 if err = RecordAutoStatus(key, apply); err != nil { @@ -669,24 +669,6 @@ func CheckAndReply(req *JXMsg, elmAppID string) (err error) { } } - //if jxMsg != nil { - // //1 存储详细聊天记录list - // if err = SetMessageDetail(jxMsg, vendorID, elmAppID); err != nil { - // errList.AddErr(fmt.Errorf("自动回复：存储详细聊天记录错误：%v", err)) - // } - // //2 存储展示列表时单条数据 - // if err = SetUserList(jxMsg, userList, vendorID, elmAppID); err != nil { - // errList.AddErr(fmt.Errorf("自动回复：存储STU聊天记录错误：%v", err)) - // } - //} - // - //if apply != nil { - // //3 记录自动回复状态 - // if err = RecordAutoStatus(key, apply); err != nil { - // errList.AddErr(fmt.Errorf("自动回复：记录自动回复状态错误：%v", err)) - // } - //} - if errList.GetErrListAsOne() != nil { return fmt.Errorf("CheckAndReply err=%v", errList.GetErrListAsOne()) }