Merge remote-tracking branch 'origin/master'

upstream/tmNew/tm_category.go

@@ -2,6 +2,7 @@ package tm
 
 import (
 	"context"
+	"encoding/json"
 	link "github.com/alibabacloud-go/linkedmall-20220531/v2/client"
 	"github.com/alibabacloud-go/tea/tea"
 	"github.com/gogf/gf/encoding/gjson"
@@ -47,9 +48,10 @@ func (s *category) QueryMallCategoryList(ctx context.Context,item int64) (res *Q
 	}
 	log(ctx,gjson.New(item).MustToJsonString(),result.Body,err)
 
-	_ = gjson.NewWithOptions(result.Body, gjson.Options{
-		StrNumber: true,
-	}).Scan(&res)
+	a,_ :=json.Marshal(result.Body)
+	if err = json.Unmarshal([]byte(a), &res); err != nil {
+		return
+	}
 	return
 }
 type CategoryListRes struct {

upstream/tmNew/tm_goods.go

@@ -2,6 +2,7 @@ package tm
 
 import (
 	"context"
+	"encoding/json"
 	link "github.com/alibabacloud-go/linkedmall-20220531/v2/client"
 	"github.com/alibabacloud-go/tea/tea"
 	"github.com/gogf/gf/encoding/gjson"
@@ -185,10 +186,13 @@ func (s *goodsTmNew) QueryItemDetailWithDivision(ctx context.Context,addr string
 	}
 
 	log(ctx,gjson.New(item).MustToJsonString(),result.Body,err)
-
-	_ = gjson.NewWithOptions(result.Body, gjson.Options{
-		StrNumber: true,
-	}).Scan(&res)
+	if *result.Body.Success ==false{
+		return
+	}
+	a,_ :=json.Marshal(result.Body)
+	if err = json.Unmarshal([]byte(a), &res); err != nil {
+		return
+	}
 
 	return
 }
@@ -215,9 +219,10 @@ func (s *goodsTmNew) ListDistributionItem(ctx context.Context,item *ListDistribu
 	}
 	log(ctx,gjson.New(item).MustToJsonString(),result.Body,err)
 
-	_ = gjson.NewWithOptions(result.Body, gjson.Options{
-		StrNumber: true,
-	}).Scan(&res)
+	a,_ :=json.Marshal(result.Body)
+	if err = json.Unmarshal([]byte(a), &res); err != nil {
+		return
+	}
 
 	return
 }

upstream/tmNew/tm_order.go

@@ -368,7 +368,10 @@ func (s *orderTm) Create(ctx context.Context,item *OrderCreateReq) (res *OrderCr
 	}
 	log(ctx,gjson.New(item).MustToJsonString(),result.Body,err)
 
-	err =gjson.New(result.Body).Scan(&res)
+	a,_ :=json.Marshal(result.Body)
+	if err = json.Unmarshal([]byte(a), &res); err != nil {
+		return
+	}
 
 	return
 }

upstream/upstream.go

@@ -122,7 +122,7 @@ func GetUpstreamName(source int) string {
 	case Hdh:
 		return "会订货"
 	case TmNew:
-		return "新版天猫"
+		return "天猫精选"
 	default:
 		return "未知来源"
 	}