- ebai the format of order_id of some different msgs are different.

business/partner/purchase/ebai/callback.go

@@ -2,12 +2,18 @@ package ebai
 
 import (
 	"git.rosy.net.cn/baseapi/platformapi/ebaiapi"
+	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-callback/business/jxutils"
 	"git.rosy.net.cn/jx-callback/business/model"
 )
 
 func OnCallbackMsg(msg *ebaiapi.CallbackMsg) (response *ebaiapi.CallbackResponse) {
-	orderID := msg.Body["order_id"].(string)
+	orderID := ""
+	if response.Cmd == ebaiapi.CmdOrderCreate {
+		orderID = msg.Body["order_id"].(string)
+	} else {
+		orderID = utils.Int64ToStr(utils.MustInterface2Int64(msg.Body["order_id"]))
+	}
 	jxutils.CallMsgHandler(func() {
 		switch msg.Cmd {
 		case ebaiapi.CmdOrderCreate, ebaiapi.CmdOrderStatus:

business/partner/purchase/ebai/order.go

@@ -169,11 +169,12 @@ func (c *PurchaseHandler) onOrderNew(msg *ebaiapi.CallbackMsg) (response *ebaiap
 func (c *PurchaseHandler) callbackMsg2Status(msg *ebaiapi.CallbackMsg) *model.OrderStatus {
 	body := msg.Body
 	vendorStatus := utils.Int64ToStr(utils.MustInterface2Int64(body["status"]))
+	orderID := utils.Int64ToStr(utils.MustInterface2Int64(msg.Body["order_id"]))
 	orderStatus := &model.OrderStatus{
-		VendorOrderID:    body["order_id"].(string),
+		VendorOrderID:    orderID,
 		VendorID:         model.VendorIDEBAI,
 		OrderType:        model.OrderTypeOrder,
-		RefVendorOrderID: body["order_id"].(string),
+		RefVendorOrderID: orderID,
 		RefVendorID:      model.VendorIDEBAI,
 		VendorStatus:     vendorStatus,
 		Status:           c.GetStatusFromVendorStatus(vendorStatus),

business/partner/purchase/ebai/waybill.go

@@ -46,10 +46,11 @@ func (c *PurchaseHandler) onWaybillMsg(msg *ebaiapi.CallbackMsg) (retVal *ebaiap
 func (c *PurchaseHandler) callbackMsg2Waybill(msg *ebaiapi.CallbackMsg) (retVal *model.Waybill) {
 	body := msg.Body
 	vendorStatus := utils.Int64ToStr(utils.MustInterface2Int64(body["status"]))
+	orderID := utils.Int64ToStr(utils.MustInterface2Int64(msg.Body["order_id"]))
 	retVal = &model.Waybill{
-		VendorOrderID:   body["order_id"].(string),
+		VendorOrderID:   orderID,
 		OrderVendorID:   model.VendorIDEBAI,
-		VendorWaybillID: body["order_id"].(string),
+		VendorWaybillID: orderID,
 		WaybillVendorID: model.VendorIDEBAI,
 		Status:          c.GetWaybillStatusFromVendorStatus(vendorStatus),
 		CourierName:     "", // 饿百取不到骑手的名字