diff --git a/business/jxstore/cms/cms.go b/business/jxstore/cms/cms.go index f5e3f0d3b..0f1e7ec57 100644 --- a/business/jxstore/cms/cms.go +++ b/business/jxstore/cms/cms.go @@ -3,8 +3,6 @@ package cms import ( "encoding/json" "fmt" - "git.rosy.net.cn/baseapi/platformapi/autonavi" - "git.rosy.net.cn/baseapi/platformapi/baidunavi" "math" "reflect" "regexp" @@ -12,6 +10,9 @@ import ( "strings" "time" + "git.rosy.net.cn/baseapi/platformapi/autonavi" + "git.rosy.net.cn/baseapi/platformapi/baidunavi" + "git.rosy.net.cn/jx-callback/business/partner/purchase/ebai" "git.rosy.net.cn/baseapi/utils/errlist" @@ -603,7 +604,7 @@ func GetSToURidingDistance(sLng, sLat, uLng, uLat float64, orderId string) (step }) if coords, err = api.BaiDuNaviAPI.BatchCoordinateConvert(coords, baidunavi.CoordSysGCJ02, baidunavi.CoordSysBaiDu); err == nil { if len(coords) > 0 { - if stepInfo, err = api.BaiDuNaviAPI.DirectionLiteRide(coords); err == nil && stepInfo.(string) != "" { + if stepInfo, err = api.BaiDuNaviAPI.DirectionLiteRide(coords); err == nil { return stepInfo, nil } } diff --git a/business/partner/im/im.go b/business/partner/im/im.go index a4848a93b..46e691bab 100644 --- a/business/partner/im/im.go +++ b/business/partner/im/im.go @@ -39,7 +39,7 @@ func SendVendorV2(data SendData, vendorOrgCode string) (err error) { globals.SugarLogger.Debugf("SendVendorV2 ebaiparam=%s", utils.Format4Output(param, false)) err = partner.CurAPIManager.GetAPI(model.VendorIDEBAI, vendorOrgCode).(*ebaiapi.API).BusinessSendMsg(param) } - err = ReadMsgFromClient(data.VendorID, "", data.Data) + err = ReadMsgFromClient(data.VendorID, vendorOrgCode, data.Data) if err != nil { globals.SugarLogger.Debugf("SendVendorV2:%v", err) } @@ -225,6 +225,8 @@ func ReadMsgFromVendor(vendorID int, elmAppID string, msg []byte) error { LatestMsg: ElmData.PayLoad.Content, LatestTime: int(ElmData.PayLoad.CreateTime), } + globals.SugarLogger.Debugf("elm userList=%s", utils.Format4Output(userList, false)) + } //1 存储详细聊天记录list diff --git a/business/partner/purchase/ebai/callback.go b/business/partner/purchase/ebai/callback.go index e3840a276..075131ff1 100644 --- a/business/partner/purchase/ebai/callback.go +++ b/business/partner/purchase/ebai/callback.go @@ -33,7 +33,7 @@ func OnCallbackMsg(msg *ebaiapi.CallbackMsg) (response *ebaiapi.CallbackResponse storeDetail, err := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), vendorStoreID, model.VendorIDEBAI, "") _, err = netprinter.PrintStoreStatus(jxcontext.AdminCtx, storeDetail, model.VendorIDMTWM, -9) response = api.EbaiAPI.Err2CallbackResponse(msg.Cmd, err, msg.Cmd) - } else if msg.Cmd == ebaiapi.CmdImMessageSendEvent || msg.Cmd == ebaiapi.CmdImMessageReadEvent { + } else if msg.Cmd == ebaiapi.CmdImMessageSendEvent /*|| msg.Cmd == ebaiapi.CmdImMessageReadEvent*/ { response = CurPurchaseHandler.OnImMessage(msg) } } diff --git a/controllers/im.go b/controllers/im.go index 3e80c6d35..67ee1a5a5 100644 --- a/controllers/im.go +++ b/controllers/im.go @@ -67,7 +67,7 @@ func (c *IMController) SetImMsgRead() { // @Title 向平台商发送信息(https方式) // @Description 向平台商发送信息(https方式) // @Param token header string true "认证token" -// @Param vendorOrgCode formData string true "美团appid" +// @Param vendorOrgCode formData string true "平台ppid" // @Param sendData formData string true "平台商消息结构体" // @Success 200 {object} controllers.CallResult // @Failure 200 {object} controllers.CallResult