diff --git a/upstream/tm/tm_account.go b/upstream/tm/tm_account.go index 66a61c6addf8c99c55bee8e242a150a52ce5775e..ad4318b5c8e19b71e7e822cd23bc3f5ea9ebfe81 100644 --- a/upstream/tm/tm_account.go +++ b/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 diff --git a/upstream/tm/tm_deliver.go b/upstream/tm/tm_deliver.go index f7bb625ef67e95062c109a2f45f501eace385898..fe0a4a544bef6550d6eaf3c4a9ce88310e5f2940 100644 --- a/upstream/tm/tm_deliver.go +++ b/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) diff --git a/upstream/tm/tm_order.go b/upstream/tm/tm_order.go index 992c81a0728649a804526316680aeb95e267a869..32ca8f6e1a9485ececea3f31cf86b1b23adc73a7 100644 --- a/upstream/tm/tm_order.go +++ b/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 { + 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"` //æ·˜å®è®¢å•å· - EnableStatus int `json:"EnableStatus"` - CreateDate string `json:"CreateDate"` - SubOrderList struct { + 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 diff --git a/upstream/tm/tm_refund.go b/upstream/tm/tm_refund.go index 2120d361494ee49d35a744ef91897205c0798706..77bc34a380574bda311828c9306351e85ec303d8 100644 --- a/upstream/tm/tm_refund.go +++ b/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, }