Merge branch 'master' of e.coding.net:rosydev/baseapi

platformapi/tiktok_shop/tiktok_api/order.go

@@ -608,8 +608,8 @@ func (a *API) GetCallbackOrderId(msgId string, data interface{}) (string, int64,
 		if err := utils.Map2StructByJson(data, &create, false); err != nil {
 			return "", 0, CallbackResponseErr(false)
 		}
-		//返回   骑手运单号      抖音店铺ID
-		return create.TrackNo, create.ShopID, Err2CallbackResponse(nil, "")
+		//返回   呼叫运力的订单号      抖音店铺ID
+		return utils.Int64ToStr(create.ShopOrderID), create.ShopID, Err2CallbackResponse(nil, "")
 	default:
 		return "", 0, CallbackResponseErr(false)
 	}