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

sfps callback

Browse Source
This commit is contained in:
richboo111
2023-06-01 17:22:38 +08:00
parent 69183b4802
commit 2e0dc42f72
4 changed files with 46 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
business/partner/delivery/sfps/waybill.go
View File

@@ -153,6 +153,21 @@ func (d DeliveryHandler) CreateWaybill(order *model.GoodsOrder, maxDeliveryFee i
ActualFee: utils.Float64TwoInt64(sfReallyPrice),
}
delivery.OnWaybillCreated(bill)
//todo 模拟新运单回调
OnWaybillMsg(sfps2.UrlIndexRiderStatus, &sfps2.RiderStatus{
ShopId: utils.Str2Float64(sfps2.SFShopStoreID),
SFOrderID: sfOrderID,
ShopOrderID: order.VendorOrderID,
UrlIndex: sfps2.UrlIndexRiderStatus,
OperatorName: "",
OperatorPhone: "",
RiderLng: 0,
RiderLat: 0,
OrderStatus: sfps2.OrderStatusNewOrder,
StatusDesc: sfps2.OrderStatusNewOrderDesc,
SFUCode: "",
PushTime: int(time.Now().Unix()),
})
return bill, err
}
@@ -278,16 +293,6 @@ func (d DeliveryHandler) GetRiderInfo(orderId string, deliveryId int64, mtPeison
// OnWaybillMsg 配送状态更改回调
func OnWaybillMsg(urlIndex string, msg interface{}) (resp *sfps2.CallbackResponse) {
order := GetWaybillByStatus(urlIndex, msg)
//order := &model.Waybill{
// VendorWaybillID: msg.SFOrderID,
// WaybillVendorID: model.VendorIDSFPS,
// VendorOrderID: msg.ShopOrderID,
// CourierName: msg.OperatorName,
// CourierMobile: msg.OperatorPhone,
// VendorStatus: utils.Int2Str(msg.OrderStatus),
// StatusTime: utils.Timestamp2Time(int64(msg.PushTime)),
// Remark: msg.StatusDesc,
//}
//获取实时订单信息
sfOrder, err := api.SfPsAPI.GetOrderStatus(order.VendorWaybillID)
@@ -398,7 +403,7 @@ func OnWaybillExceptSF(msg *sfps2.RiderException) (retVal *sfps2.CallbackRespons
CourierName: msg.OperatorName,
CourierMobile: "",
Status: model.WaybillStatusUnknown, // todo 这里要再确定一下是否只要收到订单异常消息就只简单当成一个消息
VendorStatus: utils.Int2Str(msg.OrderStatus),
VendorStatus: utils.Float64ToStr(msg.OrderStatus),
StatusTime: utils.Timestamp2Time(int64(msg.PushTime)),
}
order.VendorOrderID, order.OrderVendorID = jxutils.SplitUniversalOrderID(msg.ShopOrderID)
@@ -419,7 +424,7 @@ func GetWaybillByStatus(urlIndex string, msg interface{}) *model.Waybill {
VendorOrderID: retVal.ShopOrderID,
CourierName: retVal.OperatorName,
CourierMobile: retVal.OperatorPhone,
VendorStatus: utils.Int2Str(retVal.OrderStatus),
VendorStatus: utils.Float64ToStr(retVal.OrderStatus),
StatusTime: utils.Timestamp2Time(int64(retVal.PushTime)),
Remark: retVal.StatusDesc,
}
@@ -432,7 +437,7 @@ func GetWaybillByStatus(urlIndex string, msg interface{}) *model.Waybill {
VendorWaybillID: retVal.SFOrderID,
WaybillVendorID: model.VendorIDSFPS,
VendorOrderID: retVal.ShopOrderID,
VendorStatus: utils.Int2Str(retVal.OrderStatus),
VendorStatus: utils.Float64ToStr(retVal.OrderStatus),
StatusTime: utils.Timestamp2Time(int64(retVal.PushTime)),
Remark: retVal.StatusDesc,
}
@@ -446,7 +451,7 @@ func GetWaybillByStatus(urlIndex string, msg interface{}) *model.Waybill {
WaybillVendorID: model.VendorIDSFPS,
VendorOrderID: retVal.ShopOrderID,
CourierName: retVal.OperatorName,
VendorStatus: utils.Int2Str(retVal.OrderStatus),
VendorStatus: utils.Float64ToStr(retVal.OrderStatus),
StatusTime: utils.Timestamp2Time(int64(retVal.PushTime)),
Remark: retVal.StatusDesc,
}

7
business/partner/purchase/im/im_server.go
View File

@@ -79,10 +79,7 @@ func PingTimer() {
go func() {
ticker := time.NewTicker(heartbeatInterval)
defer ticker.Stop()
//测试用
//i := 0
for {
//i++
<-ticker.C
for clientId, conn := range Manager.AllClient() {
if conn.ClientType == ClientTypeJx {
@@ -93,12 +90,14 @@ func PingTimer() {
if err := ConnRender(conn.Socket, renderData{ClientId: clientId}); err != nil {
return
}
globals.SugarLogger.Debugf("PingTimer jx clientID ")
} else {
if err := conn.Socket.WriteMessage(websocket.TextMessage, []byte(HeartCheckMsg)); err != nil {
fmt.Printf("PingTimer mtHeartBeat err:%v", err)
//对美团重新建立连接
MtInit()
}
}
}
}
@@ -159,7 +158,7 @@ func (c *Client) Read() {
}
}
fmt.Printf("Client Read:receive: %s\n", string(msg))
SendToVendor(msg)
//SendToVendor(msg)
}
}()
}

25
controllers/im.go
View File

@@ -1,7 +1,9 @@
package controllers
import (
"bytes"
"encoding/json"
"fmt"
"git.rosy.net.cn/jx-callback/business/partner/purchase/im"
"github.com/astaxie/beego/server/web"
@@ -78,12 +80,17 @@ func (c *IMController) SetImMsgRead() {
// @Success 200 {object} controllers.CallResult
// @Failure 200 {object} controllers.CallResult
// @router /SendToVendor [post]
//func (c *IMController) SendToVendor() {
// c.callSendToVendor(func(params *tImSendToVendorParams) (retVal interface{}, errCode string, err error) {
// var sendData im.SendData
// if err = json.Unmarshal([]byte(params.SendData), &sendData); err == nil {
// im.SendToVendor(sendData)
// }
// return nil, "", err
// })
//}
func (c *IMController) SendToVendor() {
c.callSendToVendor(func(params *tImSendToVendorParams) (retVal interface{}, errCode string, err error) {
var sendData im.SendData
b := bytes.NewBufferString(params.SendData)
decoder := json.NewDecoder(b)
_ = decoder.Decode(&sendData)
fmt.Println(sendData)
if dataStr, err := json.Marshal(sendData); err == nil {
im.SendToVendor(dataStr)
}
return nil, "", err
})
}

8
routers/commentsRouter_controllers.go
View File

@@ -4384,6 +4384,14 @@ func init() {
MethodParams: param.Make(),
Filters: nil,
Params: nil})
web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:IMController"] = append(web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:IMController"],
web.ControllerComments{
Method: "SendToVendor",
Router: `/SendToVendor`,
AllowHTTPMethods: []string{"post"},
MethodParams: param.Make(),
Filters: nil,
Params: nil})
web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:IMController"] = append(web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:IMController"],
web.ControllerComments{
Method: "StartWebSocket",