天猫物流

upstream/tm/tm_deliver.go → upstream/tm/tm_logistics.go

@@ -2,37 +2,37 @@ package tm
 
 import (
 	"context"
-	"encoding/json"
+	"github.com/gogf/gf/encoding/gjson"
 )
 
-type deliverTm struct {
+type logisticsTm struct {
 }
 
-var Deliver = deliverTm{}
+var Logistics = logisticsTm{}
 
-type DeliverInfoRes struct {
+type LogisticsTraceRes struct {
 	Code      string `json:"Code"`
 	Message   string `json:"Message"`
 	RequestId string `json:"RequestId"`
 	Data      struct {
 		Data []struct {
 			DataProvider         string `json:"DataProvider"`
+			LogisticsCompanyName string `json:"LogisticsCompanyName"` //物流公司名称
+			MailNo               string `json:"MailNo"`               //运单号
+			LogisticsCompanyCode string `json:"LogisticsCompanyCode"` //物流公司Code
 			LogisticsDetailList  struct {
 				LogisticsDetailList []struct {
-					StanderdDesc string `json:"StanderdDesc"` //物流信息
-					OcurrTimeStr string `json:"OcurrTimeStr"` //发生时间
+					StanderdDesc string `json:"StanderdDesc"`
+					OcurrTimeStr string `json:"OcurrTimeStr"`
 				} `json:"LogisticsDetailList"`
 			} `json:"LogisticsDetailList"`
-			LogisticsCompanyName string `json:"LogisticsCompanyName"` //本单物流公司名称
-			LogisticsCompanyCode string `json:"logisticsCompanyCode"` //本单物流公司Code
-			MailNo               string `json:"MailNo"`               //运单号
-			DataProviderTitle    string `json:"DataProviderTitle"`    //数据来源说明，如:本数据由菜鸟裹裹提供
+			DataProviderTitle string `json:"DataProviderTitle"`
 		} `json:"Data"`
 	} `json:"Data"`
 }
 
-//Info 物流查询接口
-func (s *deliverTm) Info(ctx context.Context, UserId, LmOrderId string) (res *DeliverInfoRes, err error) {
+//Trace 物流查询接口
+func (s *logisticsTm) Trace(ctx context.Context, UserId, LmOrderId string) (res *LogisticsTraceRes, err error) {
 
 	method := "queryLogistics"
 
@@ -44,6 +44,6 @@ func (s *deliverTm) Info(ctx context.Context, UserId, LmOrderId string) (res *De
 	}
 
 	result, err := post(ctx, method, request)
-	_ = json.Unmarshal([]byte(result), &res)
+	err = gjson.New(result).Scan(&res)
 	return
 }