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

jdim测试

Browse Source
This commit is contained in:
邹宗楠
2025-12-16 15:53:03 +08:00
parent a2025b5e6c
commit 2fc5eeaa19
2 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
business/partner/im/im.go
View File

@@ -311,10 +311,16 @@ func ReadMsgFromVendor(vendorID int, elmAppID string, msg []byte) error {
} }
vendorStoreID = ElmData.PlatformShopID vendorStoreID = ElmData.PlatformShopID
case model.VendorIDJD: case model.VendorIDJD:
var risMsg *jdapi.ChatRisMsgCallback var risMsg *jdapi.JdParamJsonObj
if err = utils.UnmarshalUseNumber(msg, &risMsg); err != nil { if err = utils.UnmarshalUseNumber(msg, &risMsg); err != nil {
return err return err
} }
globals.SugarLogger.Debugf("-----rismsg := %s", utils.Format4Output(risMsg, false))
storeDetail, err := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), risMsg.StoreId, model.VendorIDJD, "")
if err != nil {
return err
}
risMsg.BillId = storeDetail.VendorOrgCode
jxMsg = &JXMsg{ jxMsg = &JXMsg{
SendType: SendTypeJd, SendType: SendTypeJd,
MsgContent: &risMsg, MsgContent: &risMsg,
@@ -339,7 +345,9 @@ func ReadMsgFromVendor(vendorID int, elmAppID string, msg []byte) error {
userList.UserID = readMsg.From.Pin userList.UserID = readMsg.From.Pin
userList.LatestTime = int(userMsg.Timestamp) userList.LatestTime = int(userMsg.Timestamp)
} }
vendorStoreID = risMsg.StationId vendorStoreID = risMsg.StoreId
return fmt.Errorf("咱暂不存储")
} }
//1 存储详细聊天记录list //1 存储详细聊天记录list
@@ -462,7 +470,6 @@ func GetNewAndTrim(key string, flag string) (cnt int, err error) {
// GenMsgDetailID 生成查询详细聊天记录ID // GenMsgDetailID 生成查询详细聊天记录ID
func GenMsgDetailID(jxMsg *JXMsg, vendorID int, elmAppID string) (msgID string) { func GenMsgDetailID(jxMsg *JXMsg, vendorID int, elmAppID string) (msgID string) {
//globals.SugarLogger.Debugf("GenMsgDetailID test0124 jxMsg=%s", utils.Format4Output(jxMsg, false))
if jxMsg == nil { if jxMsg == nil {
return "" return ""
} }
@@ -480,8 +487,8 @@ func GenMsgDetailID(jxMsg *JXMsg, vendorID int, elmAppID string) (msgID string)
//msgID = elmAppID + ":" + d2.PlatformShopID + ":3:" + d2.PayLoad.GroupID //msgID = elmAppID + ":" + d2.PlatformShopID + ":3:" + d2.PayLoad.GroupID
msgID = elmAppID + ":" + ElmData.PlatformShopID + ":3:" + ElmData.PayLoad.GroupID msgID = elmAppID + ":" + ElmData.PlatformShopID + ":3:" + ElmData.PayLoad.GroupID
case model.VendorIDJD: case model.VendorIDJD:
var data = jxMsg.MsgContent.(*jdapi.ChatRisMsgCallback) var data = jxMsg.MsgContent.(*jdapi.JdParamJsonObj)
msgID = data.VenderId + ":" + data.StationId + ":0:" msgID = data.BillId + ":" + data.StoreId + ":0:"
systemMsg, userMsg, readMsg, _ := jdapi.ImMsgChange(data, elmAppID) systemMsg, userMsg, readMsg, _ := jdapi.ImMsgChange(data, elmAppID)
switch elmAppID { switch elmAppID {
case jdapi.ImCallbackRisMsg: case jdapi.ImCallbackRisMsg:
@@ -510,8 +517,8 @@ func GenMsgListID(jxMsg *JXMsg, vendorID int, elmAppID string) (msgID string) {
json.Unmarshal(tempMsgContent, &ElmData) json.Unmarshal(tempMsgContent, &ElmData)
msgID = elmAppID + ":" + ElmData.PlatformShopID + ":3" msgID = elmAppID + ":" + ElmData.PlatformShopID + ":3"
case model.VendorIDJD: case model.VendorIDJD:
var data = jxMsg.MsgContent.(*jdapi.ChatRisMsgCallback) var data = jxMsg.MsgContent.(*jdapi.JdParamJsonObj)
msgID = data.VenderId + ":" + data.StationId + ":0" msgID = data.BillId + ":" + data.StoreId + ":0"
} }
return msgID return msgID

12
controllers/jd_callback.go
View File

@@ -249,15 +249,17 @@ func (c *DjswController) OrderInvoice() {
func (c *DjswController) imMsg() { func (c *DjswController) imMsg() {
if c.Ctx.Input.Method() == http.MethodPost { if c.Ctx.Input.Method() == http.MethodPost {
var callbackResponse *jdapi.CallbackResponse var callbackResponse *jdapi.CallbackResponse
msg, url, err := jdapi.ImChatRiskMsg(getUsefulRequest(c.Ctx)) msg, url, err := jdapi.ImChatRiskMsg(getUsefulRequest(c.Ctx))
if err != nil { if err != nil {
callbackResponse = jdapi.Err2CallbackResponse(err, "") callbackResponse = jdapi.Err2CallbackResponse(err, "")
} else { } else {
globals.SugarLogger.Debugf("-----url := %s", url) var base *jdapi.BaseInfo
globals.SugarLogger.Debugf("-----msg := %s", string(msg)) if utils.Map2StructByJson(msg, &base, false); err == nil {
callbackResponse = jdapi.Err2CallbackResponse(im.ReadMsgFromVendor(model.VendorIDJD, url, msg), "") globals.SugarLogger.Debugf("-----url := %s", url)
callbackResponse = jdapi.Err2CallbackResponse(nil, "") globals.SugarLogger.Debugf("-----msg := %s", utils.Format4Output(msg, false))
callbackResponse = jdapi.Err2CallbackResponse(im.ReadMsgFromVendor(model.VendorIDJD, url, []byte(base.JdParamJson)), "")
callbackResponse = jdapi.Err2CallbackResponse(nil, "")
}
} }
c.Data["json"] = c.transferResponse("orderStatus", callbackResponse) c.Data["json"] = c.transferResponse("orderStatus", callbackResponse)
c.ServeJSON() c.ServeJSON()