Merge remote-tracking branch 'origin/master'

upstream/tm/tm_account.go

@@ -3,7 +3,6 @@ package tm
 import (
 	"context"
 	"encoding/json"
-	"github.com/gogf/gf/util/gconv"
 )
 
 type accountTm struct {
@@ -12,11 +11,11 @@ type accountTm struct {
 var Account = accountTm{}
 
 //Regist 注册单个淘宝账号接口（同步）
-func (s *accountTm) Regist(ctx context.Context, AppID interface{}) (res *CommonRes, err error) {
+func (s *accountTm) Regist(ctx context.Context, UserId string) (res *CommonRes, err error) {
 	method := "RegistAnonymousTbAccount"
 	result, err := post(ctx, method, map[string]string{
 		"BizUid":           server.BizUid,
-		"ThirdPartyUserId": gconv.String(AppID),
+		"ThirdPartyUserId": UserId,
 	})
 	_ = json.Unmarshal([]byte(result), &res)
 	return

upstream/tm/tm_deliver.go

@@ -3,7 +3,6 @@ package tm
 import (
 	"context"
 	"encoding/json"
-	"github.com/gogf/gf/util/gconv"
 )
 
 type deliverTm struct {
@@ -33,7 +32,7 @@ type DeliverInfoRes struct {
 }
 
 //Info 物流查询接口
-func (s *deliverTm) Info(ctx context.Context, AppID interface{}, LmOrderId string) (res *DeliverInfoRes, err error) {
+func (s *deliverTm) Info(ctx context.Context, UserId, LmOrderId string) (res *DeliverInfoRes, err error) {
 
 	method := "queryLogistics"
 
@@ -41,7 +40,7 @@ func (s *deliverTm) Info(ctx context.Context, AppID interface{}, LmOrderId strin
 		"BizUid":           server.BizUid,
 		"LmOrderId":        LmOrderId,
 		"AccountType":      "ANONY",
-		"ThirdPartyUserId": gconv.String(AppID),
+		"ThirdPartyUserId": UserId,
 	}
 
 	result, err := post(ctx, method, request)

upstream/tm/tm_order.go

@@ -73,7 +73,7 @@ func (s *orderTm) Before(ctx context.Context, addr OrderAddress, itemLists []Ord
 }
 
 type OrderCreateReq struct {
-	AppID        interface{}
+	UserId       string
 	ChannelOrder string
 	Address      OrderAddress
 	ItemLists    []OrderGoodsItem
@@ -108,7 +108,7 @@ func (s *orderTm) Create(ctx context.Context, req OrderCreateReq) (res *OrderCre
 	request["BizUid"] = server.BizUid
 	request["OutTradeId"] = req.ChannelOrder
 	request["AccountType"] = typeAnony
-	request["ThirdPartyUserId"] = gconv.String(req.AppID)
+	request["ThirdPartyUserId"] = req.UserId
 
 	result, err := post(ctx, method, request)
 	_ = json.Unmarshal([]byte(result), &res)
@@ -116,7 +116,7 @@ func (s *orderTm) Create(ctx context.Context, req OrderCreateReq) (res *OrderCre
 }
 
 type OrderPayReq struct {
-	AppID        interface{}
+	UserId       string
 	ChannelOrder string
 	LmOrderId    string
 }
@@ -129,14 +129,14 @@ func (s *orderTm) Pay(ctx context.Context, req OrderPayReq) (res *OrderCreateRes
 		"LmOrderId":        req.LmOrderId,
 		"OutTradeId":       req.ChannelOrder,
 		"AccountType":      typeAnony,
-		"ThirdPartyUserId": gconv.String(req.AppID),
+		"ThirdPartyUserId": req.UserId,
 	})
 	_ = json.Unmarshal([]byte(result), &res)
 	return
 }
 
 type OrderListReq struct {
-	AppID           interface{}
+	UserId          string
 	ChannelOrder    string
 	LmOrderId       string
 	LogisticsStatus string
@@ -151,60 +151,62 @@ type OrderFilter struct {
 }
 
 type OrderListRes struct {
-	Code      string `json:"Code"`
-	Message   string `json:"Message"`
-	RequestId string `json:"RequestId"`
-	Success   bool   `json:"Success"`
 	PostFee struct {
+		FundAmount      int    `json:"FundAmount"`
 		FundType        string `json:"FundType"`
-		FundAmount      int64  `json:"FundAmount"`
-		FundAmountMoney uint   `json:"FundAmountMoney"`
+		FundAmountMoney int    `json:"FundAmountMoney"`
 	} `json:"PostFee"`
-
+	RequestId   string `json:"RequestId"`
+	Message     string `json:"Message"`
+	PageSize    int    `json:"PageSize"`
+	PageNumber  int    `json:"PageNumber"`
 	LmOrderList struct {
-		OrderIds struct {
-			OrderIds []string `json:"OrderIds"`
-		} `json:"OrderIds"`
-		PayTradeIds struct {
-			PayTradeIds []string `json:"PayTradeIds"`
-		} `json:"PayTradeIds"`
 		LmOrderList []struct {
-			LmOrderId    string `json:"LmOrderId"`   //订单号，对外统一使用此ID做主键操作
-			OrderStatus  int    `json:"OrderStatus"` //订单状态，6=交易成功
-			OrderAmount  uint   `json:"OrderAmount"` //订单总金额
-			TbOrderId    string `json:"TbOrderId"`   //淘宝订单号
+			PostFee struct {
+				FundAmount      int    `json:"FundAmount"`
+				FundType        string `json:"FundType"`
+				FundAmountMoney int    `json:"FundAmountMoney"`
+			} `json:"PostFee"`
+			ExtJson             string `json:"ExtJson"`
+			OrderStatus         int    `json:"OrderStatus"`
+			ShopName            string `json:"ShopName"`
 			EnableStatus        int    `json:"EnableStatus"`
+			TbOrderId           int64  `json:"TbOrderId"`
+			OrderAmount         int    `json:"OrderAmount"`
+			FundStructureModels struct {
+				FundStructureModels []struct {
+					FundAmount      int    `json:"FundAmount"`
+					FundType        string `json:"FundType"`
+					FundAmountMoney int    `json:"FundAmountMoney"`
+				} `json:"FundStructureModels"`
+			} `json:"FundStructureModels"`
 			CreateDate      string `json:"CreateDate"`
+			LmOrderId       string `json:"LmOrderId"`
+			LogisticsStatus int    `json:"LogisticsStatus"`
 			SubOrderList    struct {
 				SubOrderList []struct {
-					ItemId        int64  `json:"ItemId"`
-					OrderStatus   int    `json:"OrderStatus"` //订单状态，6=交易成功
-					LmOrderId     string `json:"LmOrderId"`   //子订单号
-					TbOrderId     string `json:"TbOrderId"`   //淘宝子订单号
-					SkuId         string `json:"SkuId"`       //下单的商品SkuId
-					Number        int64  `json:"Number"`      //下单数量
-					EnableStatus  int    `json:"EnableStatus"`
-					ItemPic       string `json:"ItemPic"` //商品图片
 					ItemPriceList struct {
 						ItemPriceList []struct {
+							FundAmount      int    `json:"FundAmount"`
 							FundType        string `json:"FundType"`
-							FundAmount      int64  `json:"FundAmount"`
-							FundAmountMoney uint   `json:"FundAmountMoney"` //子订单金额，以分为单位
+							FundAmountMoney int    `json:"FundAmountMoney"`
 						} `json:"ItemPriceList"`
 					} `json:"ItemPriceList"`
-					ItemTitle string `json:"ItemTitle"` //商品名称
-					SkuName   string `json:"SkuName"`   //下单的商品SKU显示名称
+					OrderStatus  int    `json:"OrderStatus"`
+					Number       int    `json:"Number"`
+					EnableStatus int    `json:"EnableStatus"`
+					TbOrderId    int64  `json:"TbOrderId"`
+					ItemTitle    string `json:"ItemTitle"`
+					SkuName      string `json:"SkuName"`
+					ItemPic      string `json:"ItemPic"`
+					SkuId        string `json:"SkuId"`
+					ItemId       int64  `json:"ItemId"`
+					LmOrderId    int    `json:"LmOrderId"`
 				} `json:"SubOrderList"`
 			} `json:"SubOrderList"`
-			PostFee struct {
-				FundType        string `json:"FundType"`
-				FundAmount      int64  `json:"FundAmount"`
-				FundAmountMoney int64  `json:"FundAmountMoney"`
-			} `json:"PostFee"`
-
-			LogisticsStatus int64 `json:"LogisticsStatus"` //物流状态
 		} `json:"LmOrderList"`
 	} `json:"LmOrderList"`
+	Code string `json:"Code"`
 }
 
 //List 列表
@@ -229,16 +231,16 @@ func (s *orderTm) List(ctx context.Context, req OrderListReq) (res *OrderListRes
 		"PageNumber":       "1",
 		"PageSize":         "20",
 		"AccountType":      typeAnony,
-		"ThirdPartyUserId": gconv.String(req.AppID),
+		"ThirdPartyUserId": req.UserId,
 	}
 
 	result, err := post(ctx, method, request)
-	_ = gjson.New(result).Scan(&res)
+	_ = json.Unmarshal([]byte(result), &res)
 	return
 }
 
 type OrderCancelReq struct {
-	AppID     interface{}
+	UserId    string
 	LmOrderId string
 }
 
@@ -250,7 +252,7 @@ func (s *orderTm) Cancel(ctx context.Context, req OrderCancelReq) (res *OrderLis
 		"BizUid":           server.BizUid,
 		"LmOrderId":        req.LmOrderId,
 		"AccountType":      typeAnony,
-		"ThirdPartyUserId": gconv.String(req.AppID),
+		"ThirdPartyUserId": req.UserId,
 	})
 	_ = json.Unmarshal([]byte(result), &res)
 	return

upstream/tm/tm_refund.go

@@ -12,7 +12,7 @@ type refundTm struct {
 var Refund = refundTm{}
 
 type RefundSubmitReq struct {
-	AppID        interface{}
+	UserId       string
 	SubLmOrderId string //子订单号
 	DisputeId    string //售后ID
 	CpCode       string //物流编码
@@ -29,7 +29,7 @@ func (s *refundTm) Submit(ctx context.Context, req RefundSubmitReq) (res *Common
 		"DisputeId":        req.DisputeId,
 		"CpCode":           req.CpCode,
 		"LogisticsNo":      req.LogisticsNo,
-		"ThirdPartyUserId": gconv.String(req.AppID),
+		"ThirdPartyUserId": req.UserId,
 		"AccountType":      typeAnony,
 	}
 
@@ -39,14 +39,14 @@ func (s *refundTm) Submit(ctx context.Context, req RefundSubmitReq) (res *Common
 }
 
 //Cancel 取消退款申请接口
-func (s *refundTm) Cancel(ctx context.Context, AppID uint, subLmOrderId, disputeId string) (res *CommonRes, err error) {
+func (s *refundTm) Cancel(ctx context.Context, UserId, subLmOrderId, disputeId string) (res *CommonRes, err error) {
 	method := "cancelRefund"
 
 	request := map[string]string{
 		"BizUid":           server.BizUid,
 		"SubLmOrderId":     subLmOrderId,
 		"DisputeId":        disputeId,
-		"ThirdPartyUserId": gconv.String(AppID),
+		"ThirdPartyUserId": UserId,
 		"AccountType":      typeAnony,
 	}
 
@@ -56,7 +56,7 @@ func (s *refundTm) Cancel(ctx context.Context, AppID uint, subLmOrderId, dispute
 }
 
 type RefundBeforeReq struct {
-	AppID        interface{}
+	UserId       string
 	ChannelOrder string
 	SubLmOrderId string
 	BizClaimType string
@@ -93,7 +93,7 @@ func (s *refundTm) Before(ctx context.Context, req RefundBeforeReq) (res *Refund
 		"SubLmOrderId":     req.SubLmOrderId,
 		"GoodsStatus":      req.GoodsStatus,
 		"BizClaimType":     req.BizClaimType,
-		"ThirdPartyUserId": gconv.String(req.AppID),
+		"ThirdPartyUserId": req.UserId,
 		"AccountType":      typeAnony,
 	}
 
@@ -103,7 +103,7 @@ func (s *refundTm) Before(ctx context.Context, req RefundBeforeReq) (res *Refund
 }
 
 type RefundApplyReq struct {
-	AppID             interface{}
+	UserId            string
 	SubLmOrderId      string                //子订单号
 	BizClaimType      string                //退款类型
 	ApplyRefundFee    string                //申请退款金额
@@ -144,7 +144,7 @@ func (s *refundTm) Apply(ctx context.Context, req *RefundApplyReq) (res *RefundA
 	request["GoodsStatus"] = req.GoodsStatus
 	request["BizUid"] = server.BizUid
 	request["AccountType"] = typeAnony
-	request["ThirdPartyUserId"] = gconv.String(req.AppID)
+	request["ThirdPartyUserId"] = req.UserId
 
 	result, err := post(ctx, method, request)
 	_ = json.Unmarshal([]byte(result), &res)
@@ -186,13 +186,13 @@ type RefundInfoRes struct {
 }
 
 //Info 详情
-func (s *refundTm) Info(ctx context.Context, AppID uint, subLmOrderId string) (res *RefundInfoRes, err error) {
+func (s *refundTm) Info(ctx context.Context, UserId, subLmOrderId string) (res *RefundInfoRes, err error) {
 	method := "queryRefundApplicationDetail"
 
 	request := map[string]string{
 		"BizUid":           server.BizUid,
 		"SubLmOrderId":     subLmOrderId,
-		"ThirdPartyUserId": gconv.String(AppID),
+		"ThirdPartyUserId": UserId,
 		"AccountType":      typeAnony,
 	}