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-10-27 14:19:47 +08:00
parent 3df472f708
commit e203d19073
4 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
business/jxstore/cms/cms.go
View File

@@ -3,8 +3,6 @@ package cms
import ( import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"git.rosy.net.cn/baseapi/platformapi/autonavi"
"git.rosy.net.cn/baseapi/platformapi/baidunavi"
"math" "math"
"reflect" "reflect"
"regexp" "regexp"
@@ -12,6 +10,9 @@ import (
"strings" "strings"
"time" "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/jx-callback/business/partner/purchase/ebai"
"git.rosy.net.cn/baseapi/utils/errlist" "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 coords, err = api.BaiDuNaviAPI.BatchCoordinateConvert(coords, baidunavi.CoordSysGCJ02, baidunavi.CoordSysBaiDu); err == nil {
if len(coords) > 0 { 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 return stepInfo, nil
} }
} }

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

@@ -39,7 +39,7 @@ func SendVendorV2(data SendData, vendorOrgCode string) (err error) {
globals.SugarLogger.Debugf("SendVendorV2 ebaiparam=%s", utils.Format4Output(param, false)) globals.SugarLogger.Debugf("SendVendorV2 ebaiparam=%s", utils.Format4Output(param, false))
err = partner.CurAPIManager.GetAPI(model.VendorIDEBAI, vendorOrgCode).(*ebaiapi.API).BusinessSendMsg(param) 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 { if err != nil {
globals.SugarLogger.Debugf("SendVendorV2:%v", err) globals.SugarLogger.Debugf("SendVendorV2:%v", err)
} }
@@ -225,6 +225,8 @@ func ReadMsgFromVendor(vendorID int, elmAppID string, msg []byte) error {
LatestMsg: ElmData.PayLoad.Content, LatestMsg: ElmData.PayLoad.Content,
LatestTime: int(ElmData.PayLoad.CreateTime), LatestTime: int(ElmData.PayLoad.CreateTime),
} }
globals.SugarLogger.Debugf("elm userList=%s", utils.Format4Output(userList, false))
} }
//1 存储详细聊天记录list //1 存储详细聊天记录list

2
business/partner/purchase/ebai/callback.go
View File

@@ -33,7 +33,7 @@ func OnCallbackMsg(msg *ebaiapi.CallbackMsg) (response *ebaiapi.CallbackResponse
storeDetail, err := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), vendorStoreID, model.VendorIDEBAI, "") storeDetail, err := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), vendorStoreID, model.VendorIDEBAI, "")
_, err = netprinter.PrintStoreStatus(jxcontext.AdminCtx, storeDetail, model.VendorIDMTWM, -9) _, err = netprinter.PrintStoreStatus(jxcontext.AdminCtx, storeDetail, model.VendorIDMTWM, -9)
response = api.EbaiAPI.Err2CallbackResponse(msg.Cmd, err, msg.Cmd) 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) response = CurPurchaseHandler.OnImMessage(msg)
} }
} }

2
controllers/im.go
View File

@@ -67,7 +67,7 @@ func (c *IMController) SetImMsgRead() {
// @Title 向平台商发送信息(https方式) // @Title 向平台商发送信息(https方式)
// @Description 向平台商发送信息(https方式) // @Description 向平台商发送信息(https方式)
// @Param token header string true "认证token" // @Param token header string true "认证token"
// @Param vendorOrgCode formData string true "美团appid" // @Param vendorOrgCode formData string true "平台ppid"
// @Param sendData formData string true "平台商消息结构体" // @Param sendData formData string true "平台商消息结构体"
// @Success 200 {object} controllers.CallResult // @Success 200 {object} controllers.CallResult
// @Failure 200 {object} controllers.CallResult // @Failure 200 {object} controllers.CallResult