Skip to content

L
library
提交 47afeff1 authored 作者: 张立波's avatar 张立波
浏览文件
操作

Merge branch 'itao'

上级 1636d39a 66f06a3f
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 1262 行增加 和 432 行删除
notify/model.go
浏览文件 @ 47afeff1
...@@ -27,7 +27,7 @@ type NotifyGoodsData struct { ...@@ -27,7 +27,7 @@ type NotifyGoodsData struct {
type ThirdGoods struct { type ThirdGoods struct {
ThirdId interface{} `json:"third_id"` //三方商品id ThirdId interface{} `json:"third_id"` //三方商品id
Skus []int `json:"skus"` //三方规格id Skus []int `json:"skus,omitempty"` //三方规格id
} }
//通知消息系统 //通知消息系统
......
upstream/ali/ali.go
浏览文件 @ 47afeff1
...@@ -86,9 +86,9 @@ func (s *Config) Post(ctx context.Context, method string, params g.Map) (str str ...@@ -86,9 +86,9 @@ func (s *Config) Post(ctx context.Context, method string, params g.Map) (str str
ctx = context.WithValue(ctx, "Method", "POST") ctx = context.WithValue(ctx, "Method", "POST")
ctx = context.WithValue(ctx, "URI", Url) ctx = context.WithValue(ctx, "URI", Url)
if err != nil { if err != nil {
g.Log().Cat(PkgName).Ctx(ctx).Infof("参数【%v】错误【%v】响应时间【%v】", paramStr, err.Error(), gtime.TimestampMilli()-Start) g.Log().Ctx(ctx).Cat(PkgName).Cat("error").Infof("参数【%v】错误【%v】响应时间【%v】", paramStr, err.Error(), gtime.TimestampMilli()-Start)
} else { } else {
g.Log().Cat(PkgName).Ctx(ctx).Infof("参数【%v】响应【%v】响应时间【%v】", str, gtime.TimestampMilli()-Start) g.Log().Ctx(ctx).Cat(PkgName).Infof("参数【%v】响应【%v】响应时间【%v】", str, gtime.TimestampMilli()-Start)
} }
}() }()
str = resp.ReadAllString() str = resp.ReadAllString()
......
upstream/dwd/dwd.go
浏览文件 @ 47afeff1
...@@ -15,6 +15,7 @@ type Config struct { ...@@ -15,6 +15,7 @@ type Config struct {
AppKey string AppKey string
AppSecret string AppSecret string
API string API string
DB int
} }
var server *Config var server *Config
...@@ -24,6 +25,9 @@ const CacheKey = "dwd:token" ...@@ -24,6 +25,9 @@ const CacheKey = "dwd:token"
func New(req *Config) { func New(req *Config) {
server = req server = req
if server.DB == 0 {
server.DB = 10
}
return return
} }
...@@ -89,7 +93,7 @@ func post(ctx context.Context, method string, req interface{}) (res *CommonRes, ...@@ -89,7 +93,7 @@ func post(ctx context.Context, method string, req interface{}) (res *CommonRes,
ctx = context.WithValue(ctx, "Method", "POST") ctx = context.WithValue(ctx, "Method", "POST")
ctx = context.WithValue(ctx, "URI", method) ctx = context.WithValue(ctx, "URI", method)
if err != nil { if err != nil {
g.Log().Ctx(ctx).Infof("参数【%v】错误【%v】响应时间【%v】", request.MustToJsonString(), err.Error(), gtime.TimestampMilli()-Start) g.Log().Ctx(ctx).Cat(PkgName).Cat("error").Infof("参数【%v】错误【%v】响应时间【%v】", request.MustToJsonString(), err.Error(), gtime.TimestampMilli()-Start)
} else { } else {
g.Log().Ctx(ctx).Cat(PkgName).Infof("参数【%v】响应【%v】响应时间【%v】", request.MustToJsonString(), str, gtime.TimestampMilli()-Start) g.Log().Ctx(ctx).Cat(PkgName).Infof("参数【%v】响应【%v】响应时间【%v】", request.MustToJsonString(), str, gtime.TimestampMilli()-Start)
} }
......
upstream/dwd/dwd_token.go
浏览文件 @ 47afeff1
...@@ -52,7 +52,7 @@ func (s *tokenDwd) Access(ctx context.Context) (res string, err error) { ...@@ -52,7 +52,7 @@ func (s *tokenDwd) Access(ctx context.Context) (res string, err error) {
defer func() { defer func() {
_ = conn.Close() _ = conn.Close()
}() }()
_, _ = conn.DoVar("SELECT", 10) _, _ = conn.DoVar("SELECT", server.DB)
cache, _ := conn.DoVar("HGETALL", CacheKey) cache, _ := conn.DoVar("HGETALL", CacheKey)
if !cache.IsEmpty() { if !cache.IsEmpty() {
_ = cache.Scan(&s) _ = cache.Scan(&s)
...@@ -90,7 +90,7 @@ func (s *tokenDwd) post(ctx context.Context, req interface{}) (res string, err e ...@@ -90,7 +90,7 @@ func (s *tokenDwd) post(ctx context.Context, req interface{}) (res string, err e
ctx = context.WithValue(ctx, "Method", "POST") ctx = context.WithValue(ctx, "Method", "POST")
ctx = context.WithValue(ctx, "URI", "token") ctx = context.WithValue(ctx, "URI", "token")
if err != nil { if err != nil {
g.Log().Ctx(ctx).Infof("参数【%v】错误【%v】响应时间【%v】", request.MustToJsonString(), err.Error(), gtime.TimestampMilli()-Start) g.Log().Ctx(ctx).Cat(PkgName).Cat("error").Infof("参数【%v】错误【%v】响应时间【%v】", request.MustToJsonString(), err.Error(), gtime.TimestampMilli()-Start)
} else { } else {
g.Log().Ctx(ctx).Cat(PkgName).Infof("参数【%v】响应【%v】响应时间【%v】", request.MustToJsonString(), res, gtime.TimestampMilli()-Start) g.Log().Ctx(ctx).Cat(PkgName).Infof("参数【%v】响应【%v】响应时间【%v】", request.MustToJsonString(), res, gtime.TimestampMilli()-Start)
} }
......
upstream/hdh/hdh.go
浏览文件 @ 47afeff1
...@@ -48,7 +48,7 @@ func post(ctx context.Context, method string, req interface{}) (res string, err ...@@ -48,7 +48,7 @@ func post(ctx context.Context, method string, req interface{}) (res string, err
ctx = context.WithValue(ctx, "Method", "POST") ctx = context.WithValue(ctx, "Method", "POST")
ctx = context.WithValue(ctx, "URI", Url) ctx = context.WithValue(ctx, "URI", Url)
if err != nil { if err != nil {
g.Log().Ctx(ctx).Infof("参数【%v】错误【%v】响应时间【%v】", param.MustToJsonString(), err.Error(), gtime.TimestampMilli()-Start) g.Log().Ctx(ctx).Cat(pkgName).Cat("error").Infof("参数【%v】错误【%v】响应时间【%v】", param.MustToJsonString(), err.Error(), gtime.TimestampMilli()-Start)
} else { } else {
g.Log().Ctx(ctx).Cat(pkgName).Infof("参数【%v】响应【%v】响应时间【%v】", param.MustToJsonString(), res, gtime.TimestampMilli()-Start) g.Log().Ctx(ctx).Cat(pkgName).Infof("参数【%v】响应【%v】响应时间【%v】", param.MustToJsonString(), res, gtime.TimestampMilli()-Start)
} }
......
upstream/itao/itao.go
浏览文件 @ 47afeff1
...@@ -6,52 +6,57 @@ import ( ...@@ -6,52 +6,57 @@ import (
"crypto/sha1" "crypto/sha1"
"encoding/hex" "encoding/hex"
"github.com/gogf/gf/encoding/gjson" "github.com/gogf/gf/encoding/gjson"
"github.com/gogf/gf/errors/gerror"
"github.com/gogf/gf/frame/g" "github.com/gogf/gf/frame/g"
"github.com/gogf/gf/os/gtime" "github.com/gogf/gf/os/gtime"
"github.com/gogf/gf/util/gconv" "github.com/gogf/gf/util/gconv"
"net/url"
"sort" "sort"
"strings" "strings"
"time" "time"
) )
type Config struct { type Config struct {
ApiUrl string ApiUrl string
AppKey string AppKey string
AppSecret string AppSecret string
AccessToken string DB int
} }
var server *Config var server *Config
const PkgName = "itao" const PkgName = "itao"
const CacheKey = "itao:token"
const Host = "https://open.huoju6.com/openapi/param2/1/com.huoju6.open/"
func New(req *Config) { func New(req *Config) {
server = req server = req
if server.DB == 0 {
server.DB = 10
}
return return
} }
type CommonRes struct { type CommonRes struct {
Success bool `json:"success"` Success bool `json:"success"`
ErrorCode string `json:"errorCode"` ErrCode string `json:"errCode"`
ErrorMessage string `json:"errorMessage"` ErrMsg string `json:"errMsg"`
} }
func (s *Config) CreateSign(signStr string) (sign string) { func generate(req string) (res string) {
//拼接参数 //拼接参数
appSecret := []byte(s.AppSecret) mac := hmac.New(sha1.New, []byte(server.AppSecret))
mac := hmac.New(sha1.New, appSecret) mac.Write([]byte(req))
mac.Write([]byte(signStr))
mdStr := hex.EncodeToString(mac.Sum(nil)) mdStr := hex.EncodeToString(mac.Sum(nil))
sign = strings.ToUpper(mdStr) res = strings.ToUpper(mdStr)
return return
} }
func (s *Config) sign(method string, param g.Map) g.Map { func sign(method string, req g.Map) (err error) {
var keys []string var keys []string
param["_aop_timestamp"] = gtime.Now().TimestampMilliStr() req["_aop_timestamp"] = gtime.Now().TimestampMilliStr()
mewparam := param for k := range req {
for k := range mewparam {
keys = append(keys, k) keys = append(keys, k)
} }
...@@ -61,23 +66,35 @@ func (s *Config) sign(method string, param g.Map) g.Map { ...@@ -61,23 +66,35 @@ func (s *Config) sign(method string, param g.Map) g.Map {
for _, v := range keys { for _, v := range keys {
if v != "_aop_signature" { if v != "_aop_signature" {
signStr += v signStr += v
signStr += gconv.String(mewparam[v]) signStr += gconv.String(req[v])
} }
} }
//拼接参数 //拼接参数
signStr = "param2/1/" + method + "/" + s.AppKey + signStr signStr = "param2/1/com.huoju6.open/" + method + "/" + server.AppKey + signStr
param["_aop_signature"] = s.CreateSign(signStr) req["_aop_signature"] = generate(signStr)
return
return param
} }
func (s *Config) Post(ctx context.Context, method string, params g.Map) (str string, err error) { func (s *Config) Post(ctx context.Context, method string, params g.Map) (str string, err error) {
params["access_token"], err = AccessToken(ctx)
if err != nil {
return
}
str, err = Post(ctx, method, params)
return
}
func Post(ctx context.Context, method string, params g.Map) (str string, err error) {
Start := gtime.TimestampMilli() Start := gtime.TimestampMilli()
allparams := s.sign(method, params) err = sign(method, params)
Url := s.ApiUrl + method + "/" + s.AppKey if err != nil {
return
}
Url := Host + method + "/" + server.AppKey
Request := g.Client() Request := g.Client()
Request.SetHeader("Content-Type", "application/x-www-form-urlencoded") Request.SetHeader("Content-Type", "application/x-www-form-urlencoded")
resp, err := Request.Timeout(time.Second*5).Post(Url, allparams) resp, err := Request.Timeout(time.Second*5).Get(Url, params)
defer func() { defer func() {
_ = resp.Close() _ = resp.Close()
...@@ -95,3 +112,101 @@ func (s *Config) Post(ctx context.Context, method string, params g.Map) (str str ...@@ -95,3 +112,101 @@ func (s *Config) Post(ctx context.Context, method string, params g.Map) (str str
return return
} }
func (s *Config) Get(ctx context.Context, method string, params g.Map) (str string, err error) {
params["access_token"], err = AccessToken(ctx)
if err != nil {
return
}
str, err = Get(ctx, method, params)
return
}
func Get(ctx context.Context, method string, params g.Map) (str string, err error) {
Start := gtime.TimestampMilli()
err = sign(method, params)
if err != nil {
return
}
Url := Host + method + "/" + server.AppKey
Request := g.Client()
Values := url.Values{}
for k, v := range params {
Values.Add(k, gconv.String(v))
}
Request.SetHeader("Content-Type", "application/x-www-form-urlencoded")
resp, err := Request.Timeout(time.Second * 5).Get(Url + "?" + Values.Encode())
defer func() {
_ = resp.Close()
paramStr := gjson.New(params).MustToJsonString()
ctx = context.WithValue(ctx, "Method", "GET")
ctx = context.WithValue(ctx, "URI", Url)
if err != nil {
g.Log().Cat(PkgName).Ctx(ctx).Infof("参数【%v】错误【%v】响应时间【%vms】", paramStr, err.Error(), gtime.TimestampMilli()-Start)
} else {
g.Log().Cat(PkgName).Ctx(ctx).Infof("参数【%v】响应【%v】响应时间【%vms】", paramStr, str, gtime.TimestampMilli()-Start)
}
}()
str = resp.ReadAllString()
return
}
func AccessToken(ctx context.Context) (res string, err error) {
var conn = g.Redis().Conn()
defer func() {
_ = conn.Close()
}()
_, _ = conn.DoVar("SELECT", server.DB)
cache, _ := conn.DoVar("HGETALL", CacheKey)
if cache.IsEmpty() {
g.Log().Ctx(ctx).Cat(PkgName).Line(true).Info("获取token失败")
err = gerror.New("获取token失败")
return
}
var result *AuthTokenRes
_ = gjson.New(cache).Scan(&result)
if result == nil {
g.Log().Ctx(ctx).Cat(PkgName).Line(true).Info("获取token失败")
err = gerror.New("获取token失败")
return
}
if result.AccessToken == "" || result.AccessTokenExpireTime < gtime.TimestampMilli() {
result, err = RefreshToken(ctx)
}
res = result.AccessToken
return
}
//RefreshToken 刷新
func RefreshToken(ctx context.Context) (res *AuthTokenRes, err error) {
var conn = g.Redis().Conn()
defer func() {
_ = conn.Close()
}()
_, _ = conn.DoVar("SELECT", server.DB)
cache, _ := conn.DoVar("HGETALL", CacheKey)
if cache.IsEmpty() {
g.Log().Ctx(ctx).Cat(PkgName).Line(true).Info("获取token失败")
err = gerror.New("获取token失败")
return
}
_ = gjson.New(cache).Scan(&res)
if res.AccessTokenExpireTime > gtime.Now().Add(time.Hour).TimestampMilli() {
return
}
res, err = Auth.Token(ctx, res.RefreshToken, 2)
if err != nil {
return
}
if res.Code != "success" {
g.Log().Ctx(ctx).Cat(PkgName).Line(true).Info("获取token失败")
err = gerror.New("获取token失败")
return
}
_, _ = conn.Do("HMSET", CacheKey, "accessToken", res.AccessToken, "accessTokenExpireTime", res.AccessTokenExpireTime)
return
}
upstream/itao/itao_address.go
浏览文件 @ 47afeff1
...@@ -47,7 +47,7 @@ type AddressDivisionRes struct { ...@@ -47,7 +47,7 @@ type AddressDivisionRes struct {
//Division 行政区划 //Division 行政区划
func (s addressItao) Division(ctx context.Context, req AddressDivisionReq) (res *AddressDivisionRes, err error) { func (s addressItao) Division(ctx context.Context, req AddressDivisionReq) (res *AddressDivisionRes, err error) {
method := "com.alibaba.c2m/ltao.delivery.queryDivision" method := "tt.order.queryDivision"
result, err := server.Post(ctx, method, g.Map{ result, err := server.Post(ctx, method, g.Map{
"param": req, "param": req,
...@@ -64,24 +64,22 @@ type AddressParseReq struct { ...@@ -64,24 +64,22 @@ type AddressParseReq struct {
type AddressParseRes struct { type AddressParseRes struct {
Result struct { Result struct {
Result struct { City string `json:"city"`
City string `json:"city"` CityId int `json:"cityId"`
CityId int `json:"cityId"` District string `json:"district"`
District string `json:"district"` DistrictId int `json:"districtId"`
DistrictId int `json:"districtId"` Prov string `json:"prov"`
Prov string `json:"prov"` ProvId int `json:"provId"`
ProvId int `json:"provId"` Town string `json:"town"`
Town string `json:"town"` TownId int `json:"townId"`
TownId int `json:"townId"`
} `json:"result"`
Success bool `json:"success"`
} `json:"result"` } `json:"result"`
Success bool `json:"success"`
} }
//Parse 地址解析 //Parse 地址解析
// 省、市必传 // 省、市必传
func (s addressItao) Parse(ctx context.Context, req AddressParseReq) (res *AddressParseRes, err error) { func (s addressItao) Parse(ctx context.Context, req AddressParseReq) (res *AddressParseRes, err error) {
method := "com.alibaba.c2m/ltao.delivery.validate" method := "tt.address.validate"
result, err := server.Post(ctx, method, g.Map{ result, err := server.Post(ctx, method, g.Map{
"param": req, "param": req,
......
upstream/itao/itao_auth.go 0 → 100644
浏览文件 @ 47afeff1
package itao
import (
"context"
"github.com/gogf/gf/encoding/gjson"
"github.com/gogf/gf/frame/g"
)
type auth struct {
}
var Auth = auth{}
type AuthStatusRes struct {
Code string `json:"code"`
Message string `json:"message"`
}
//Status 授权状态
func (s auth) Status(ctx context.Context) (res *AuthStatusRes, err error) {
method := "tt.authority.checkAuthStatus"
result, err := server.Get(ctx, method, g.Map{
"bId": server.AppKey,
})
_ = gjson.New(result).Scan(&res)
return
}
type AuthQrCodeRes struct {
Code string `json:"code"`
Message string `json:"message"`
TempCode string `json:"tempCode"`
TempCodeExpireTime string `json:"tempCodeExpireTime"`
QrCodeUrl string `json:"qrCodeUrl"`
}
//QrCode 二维码
func (s auth) QrCode(ctx context.Context) (res *AuthQrCodeRes, err error) {
method := "tt.authority.generateQrCode"
result, err := Get(ctx, method, g.Map{
"bId": server.AppKey,
})
_ = gjson.New(result).Scan(&res)
return
}
type AuthTokenRes struct {
Code string `json:"code"`
Message string `json:"message"`
RefreshToken string `json:"refreshToken"`
AccessToken string `json:"accessToken"`
AccessTokenExpireTime int64 `json:"accessTokenExpireTime"`
RefreshTokenExpireTime int64 `json:"refreshTokenExpireTime"`
TaoteId string `json:"taoteId"`
TaoteNickName string `json:"taoteNickName"`
Feature string `json:"feature"`
GwTraceId string `json:"gw_trace_id"`
}
//Token 授权
func (s auth) Token(ctx context.Context, code string, Type int) (res *AuthTokenRes, err error) {
method := "tt.auth.getAccessToken"
var request = g.Map{
"bId": server.AppKey,
}
if Type == 1 {
request["code"] = code //临时令牌
request["grantType"] = "code"
} else {
request["refreshToken"] = code //刷新令牌
request["grantType"] = "refreshToken"
}
result, err := Get(ctx, method, request)
_ = gjson.New(result).Scan(&res)
return
}
//Unbind 注销授权
func (s auth) Unbind(ctx context.Context) (res *AuthTokenRes, err error) {
method := "tt.authority.unbind"
result, err := server.Get(ctx, method, g.Map{
"bId": server.AppKey,
})
_ = gjson.New(result).Scan(&res)
return
}
upstream/itao/itao_logistics.go
浏览文件 @ 47afeff1
...@@ -6,47 +6,49 @@ import ( ...@@ -6,47 +6,49 @@ import (
"github.com/gogf/gf/frame/g" "github.com/gogf/gf/frame/g"
) )
type logisticsItao struct { type logistics struct {
} }
var Logistics = logisticsItao{} var Logistics = logistics{}
type LogisticsTraceRes struct { type LogisticsTraceRes struct {
Result struct { Success bool `json:"success"`
Result []struct { ErrMsg string `json:"errMsg"`
DetailList []struct { ErrCode string `json:"errCode"`
Action string `json:"action"` Result []struct {
GmtCreate string `json:"gmtCreate"` CompanyList []struct {
StanderdDesc string `json:"standerdDesc"` BrandCode string `json:"brandCode"`
Status string `json:"status"` CompanyName string `json:"companyName"`
Time string `json:"time"` } `json:"companyList"`
MailNo string `json:"mailNo,omitempty"` DetailList []struct {
TpName string `json:"tpName,omitempty"` Action string `json:"action"`
} `json:"detailList"` GmtCreate string `json:"gmtCreate"`
GoodsList []interface{} `json:"goodsList"` StanderdDesc string `json:"standerdDesc"`
MailNo string `json:"mailNo"` Status string `json:"status"`
Receiver struct { Time string `json:"time"`
Adr string `json:"adr"` MailNo string `json:"mailNo,omitempty"`
CityName string `json:"cityName"` TpName string `json:"tpName,omitempty"`
DistrictName string `json:"districtName"` } `json:"detailList"`
Name string `json:"name"` GoodsList []interface{} `json:"goodsList"`
ProvinceName string `json:"provinceName"` MailNo string `json:"mailNo"`
Telphone string `json:"telphone"` Receiver struct {
} `json:"receiver"` Adr string `json:"adr"`
Status struct { CityName string `json:"cityName"`
StatusCode string `json:"statusCode"` DistrictName string `json:"districtName"`
StatusDesc string `json:"statusDesc"` Name string `json:"name"`
} `json:"status"` ProvinceName string `json:"provinceName"`
} `json:"result"` Telphone string `json:"telphone"`
Success bool `json:"success"` } `json:"receiver"`
ErrMsg string `json:"errMsg"` Status struct {
ErrCode string `json:"errCode"` StatusCode string `json:"statusCode"`
StatusDesc string `json:"statusDesc"`
} `json:"status"`
} `json:"result"` } `json:"result"`
} }
//Trace 物流轨迹 //Trace 物流轨迹
func (logisticsItao) Trace(ctx context.Context, req string) (res *LogisticsTraceRes, err error) { func (logistics) Trace(ctx context.Context, req string) (res *LogisticsTraceRes, err error) {
method := "com.alibaba.c2m/ltao.logistics.queryDetail" method := "tt.logistics.detail"
result, err := server.Post(ctx, method, g.Map{ result, err := server.Post(ctx, method, g.Map{
"request": g.Map{ "request": g.Map{
...@@ -56,3 +58,43 @@ func (logisticsItao) Trace(ctx context.Context, req string) (res *LogisticsTrace ...@@ -56,3 +58,43 @@ func (logisticsItao) Trace(ctx context.Context, req string) (res *LogisticsTrace
_ = gjson.New(result).Scan(&res) _ = gjson.New(result).Scan(&res)
return return
} }
type LogisticsCompanyRes struct {
Result []LogisticsCompanyItem `json:"result"`
Success bool `json:"success"`
}
type LogisticsCompanyItem struct {
Code string `json:"code"`
Name string `json:"name"`
Id int64 `json:"id"`
Type int `json:"type"`
}
type LogisticsCompany struct {
Result map[string][]interface{} `json:"result"`
Success bool `json:"success"`
}
//Company 物流公司
func (logistics) Company(ctx context.Context, req string) (res *LogisticsCompanyRes, err error) {
method := "tt.refund.queryLogisticList"
result, err := server.Post(ctx, method, g.Map{
"request": g.Map{
"bizOrderId": req,
},
})
var data *LogisticsCompany
_ = gjson.New(result).Scan(&data)
res = new(LogisticsCompanyRes)
res.Success = data.Success
for _, item := range data.Result {
for _, val := range item {
var value []LogisticsCompanyItem
_ = gjson.New(val).Scan(&value)
res.Result = append(res.Result, value...)
}
}
return
}
upstream/itao/itao_pay.go 0 → 100644
浏览文件 @ 47afeff1
package itao
import (
"context"
"github.com/gogf/gf/encoding/gjson"
"github.com/gogf/gf/frame/g"
)
type pay struct {
}
var Pay = pay{}
type PayAuthRes struct {
}
func (s pay) Auth(ctx context.Context) (res *PayAuthRes, err error) {
method := "tt.agreementpay.genersignurl"
result, err := server.Post(ctx, method, g.Map{
"request": g.Map{},
})
_ = gjson.NewWithOptions(result, gjson.Options{
StrNumber: true,
}).Scan(&res)
return
}
upstream/itao/itao_refund.go 0 → 100644
浏览文件 @ 47afeff1
package itao
import (
"context"
"github.com/gogf/gf/encoding/gjson"
"github.com/gogf/gf/frame/g"
)
type refund struct {
}
var Refund = refund{}
type RefundPic struct {
MessagePic string `json:"messagePic"`
}
type RefundBeforeRes struct {
CommonRes
Result struct {
BizClaimTypeVOList []struct {
BizClaimType string `json:"bizClaimType"` //refund 仅退款 return_and_refund 退货退款
RefundTypeTitle string `json:"refundTypeTitle"`
} `json:"bizClaimTypeVOList"`
} `json:"result"`
}
//Before 退款类型
func (s refund) Before(ctx context.Context, req string) (res *RefundBeforeRes, err error) {
method := "tt.refund.refundApplyType"
result, err := server.Post(ctx, method, g.Map{
"request": g.Map{
"bizOrderId": req,
},
})
_ = gjson.NewWithOptions(result, gjson.Options{
StrNumber: true,
}).Scan(&res)
return
}
type RefundReasonReq struct {
BizOrderId string `json:"bizOrderId"`
BizClaimType string `json:"bizClaimType"`
GoodsStatus string `json:"goodsStatus,omitempty"`
}
type RefundReasonRes struct {
CommonRes
Result struct {
MaxRefundFee int `json:"maxRefundFee"`
MinRefundFee int `json:"minRefundFee"`
MustProof bool `json:"mustProof"`
RefundTextWrapperVOList []struct {
Name string `json:"name"`
ReasonGroup int `json:"reasonGroup"`
TextId int `json:"textId"`
} `json:"refundTextWrapperVOList"`
} `json:"result"`
}
//Reason 原因
func (s refund) Reason(ctx context.Context, req RefundReasonReq) (res *RefundReasonRes, err error) {
method := "tt.refund.refundApplyInit"
result, err := server.Post(ctx, method, g.Map{
"request": req,
})
_ = gjson.NewWithOptions(result, gjson.Options{
StrNumber: true,
}).Scan(&res)
return
}
type RefundCreateReq struct {
BizOrderId string `json:"bizOrderId"` //子订单号
BizClaimType string `json:"bizClaimType"` //refund 仅退款 return_and_refund 退货退款
GoodsStatus string `json:"goodsStatus,omitempty"` //"1"：未收到货 "2"：未已收到货 未发货情况下，千万不要传
RefundFee string `json:"refundFee"` //退款金额，单位是分
ApplyRefundTextId string `json:"applyRefundTextId"` //原因ID
LeaveMessagePics []RefundPic `json:"leaveMessagePics,omitempty"`
}
type RefundCreateRess struct {
CommonRes
Result struct {
DisputeId string `json:"disputeId"`
} `json:"result"`
}
//Create 申请
func (s refund) Create(ctx context.Context, req RefundCreateReq, image ...string) (res *RefundCreateRess, err error) {
method := "tt.refund.refundSubmit"
if len(image) > 0 {
for _, item := range image {
req.LeaveMessagePics = append(req.LeaveMessagePics, RefundPic{MessagePic: item})
}
}
result, err := server.Post(ctx, method, g.Map{
"request": req,
})
_ = gjson.NewWithOptions(result, gjson.Options{
StrNumber: true,
}).Scan(&res)
return
}
//Cancle 取消售后
//`bizOrderId` 子订单号
//`disputeId` 售后单号
func (s refund) Cancel(ctx context.Context, bizOrderId, disputeId string) (res *CommonRes, err error) {
method := "tt.refund.refundRevoke"
result, err := server.Post(ctx, method, g.Map{
"request": g.Map{
"bizOrderId": bizOrderId,
"disputeId": disputeId,
},
})
_ = gjson.NewWithOptions(result, gjson.Options{
StrNumber: true,
}).Scan(&res)
return
}
type RefundSubmitReq struct {
DisputeId string `json:"disputeId"`
BizOrderId string `json:"bizOrderId"`
CompanyCode string `json:"logisticsCompanyCode"`
CompanyId string `json:"logisticsCompanyId"`
CompanyName string `json:"logisticsCompanyName"`
LogisticsNo string `json:"logisticsNo"`
MobileNum string `json:"mobileNum"`
LeaveMessagePics []RefundPic `json:"leaveMessagePics"`
}
type RefundSubmitRes struct {
CommonRes
Result struct {
DisputeStatus string `json:"disputeStatus"`
//REFUND_WAIT_SELLER_AGREE："买家已经申请退款，等待卖家同意"；
//REFUND_WAIT_BUYER_RETURN_GOODS："卖家已经同意退款，等待买家退货"；
//REFUND_WAIT_SELLER_CONFIRM_GOODS："买家已经退货，等待卖家确认收货"；
//REFUND_CLOSED："退款关闭"；
//REFUND_SUCCESS："退款成功"；
//REFUND_SELLER_REFUSE_BUYER："卖家拒绝退款"；
//REFUND_WAIT_BUYER_CONFIRM_REDO_SEND_GOODS："等待买家确认重新邮寄的货物"；
//REFUND_WAIT_SELLER_CONFIRM_RETURN_ADDRESS："等待卖家确认退货地址"
} `json:"result"`
}
//Submit 提交物流信息
func (s refund) Submit(ctx context.Context, req RefundSubmitReq, image ...string) (res *CommonRes, err error) {
method := "tt.refund.submitLogisticInfo.v1"
if len(image) > 0 {
for _, item := range image {
req.LeaveMessagePics = append(req.LeaveMessagePics, RefundPic{MessagePic: item})
}
}
result, err := server.Post(ctx, method, g.Map{
"request": req,
})
_ = gjson.NewWithOptions(result, gjson.Options{
StrNumber: true,
}).Scan(&res)
return
}
type RefundDetailRes struct {
CommonRes
Result struct {
DisputeId int64 `json:"disputeId"` //退款编号
DisputeStatus string `json:"disputeStatus"`
//退款状态
//REFUND_WAIT_SELLER_AGREE："买家已经申请退款，等待卖家同意"；
//REFUND_WAIT_BUYER_RETURN_GOODS："卖家已经同意退款，等待买家退货"；
//REFUND_WAIT_SELLER_CONFIRM_GOODS："买家已经退货，等待卖家确认收货"；
//REFUND_CLOSED："退款关闭"；
//REFUND_SUCCESS："退款成功"；
//REFUND_SELLER_REFUSE_BUYER："卖家拒绝退款"；
//REFUND_WAIT_BUYER_CONFIRM_REDO_SEND_GOODS："等待买家确认重新邮寄的货物"；
//REFUND_WAIT_SELLER_CONFIRM_RETURN_ADDRESS："等待卖家确认退货地址"
DisputeTimeOut struct {
Duration int `json:"duration"`
GmtCreate int64 `json:"gmtCreate"`
Running bool `json:"running"`
TimeoutActionType string `json:"timeoutActionType"`
} `json:"disputeTimeOut"`
ReasonName string `json:"reasonName"` //退款原因名称
RefundFee int `json:"refundFee"` //退款金额，单位分
ShippingAddressWrapperDTO struct {
AddressDetail string `json:"addressDetail"`
AreaName string `json:"areaName"`
CityName string `json:"cityName"`
ConsigneeFullName string `json:"consigneeFullName"`
DivisionCode string `json:"divisionCode"`
Mobile string `json:"mobile"`
PostCode string `json:"postCode"`
ProvinceName string `json:"provinceName"`
TownName string `json:"townName"`
} `json:"shippingAddressWrapperDTO"`
} `json:"result"`
}
//Detail 详情
func (s refund) Detail(ctx context.Context, bizOrderId, disputeId string) (res *RefundDetailRes, err error) {
method := "tt.refund.queryRefundDetail"
result, err := server.Post(ctx, method, g.Map{
"request": g.Map{
"bizOrderId": bizOrderId,
"disputeId": disputeId,
},
})
_ = gjson.NewWithOptions(result, gjson.Options{
StrNumber: true,
}).Scan(&res)
return
}
upstream/itao/itao_upload.go 0 → 100644
浏览文件 @ 47afeff1
package itao
import (
"context"
"github.com/gogf/gf/encoding/gjson"
"github.com/gogf/gf/frame/g"
"github.com/gogf/gf/os/gtime"
"github.com/gogf/gf/util/gconv"
"net/url"
"time"
)
type upload struct {
}
var Upload = upload{}
type UploadImageReq struct {
FileName string `json:"fileName"`
FileContent string `json:"fileContent"`
ImageData string `json:"imageData"`
}
type UploadImageRes struct {
Code string `json:"code"`
Message string `json:"message"`
FileUrl string `json:"fileUrl"`
}
func (s upload) Image(ctx context.Context, req UploadImageReq) (res *UploadImageRes, err error) {
method := "tt.upload.image"
if req.FileContent == "" {
req.FileContent = "base64"
}
var request = g.Map{}
request["access_token"], err = AccessToken(ctx)
if err != nil {
return
}
result, err := s.post(ctx, method, request, gconv.Map(req))
_ = gjson.New(result).Scan(&res)
return
}
func (upload) post(ctx context.Context, method string, params, req g.Map) (str string, err error) {
Start := gtime.TimestampMilli()
err = sign(method, params)
if err != nil {
return
}
Url := Host + method + "/" + server.AppKey
Values := url.Values{}
for k, v := range params {
Values.Add(k, gconv.String(v))
}
resp, err := g.Client().ContentJson().Timeout(time.Second*5).Post(Url+"?"+Values.Encode(), req)
defer func() {
_ = resp.Close()
paramStr := gjson.New(params).MustToJsonString()
ctx = context.WithValue(ctx, "Method", "POST")
ctx = context.WithValue(ctx, "URI", Url)
if err != nil {
g.Log().Cat(PkgName).Ctx(ctx).Infof("参数【%v】错误【%v】响应时间【%vms】", paramStr, err.Error(), gtime.TimestampMilli()-Start)
} else {
g.Log().Cat(PkgName).Ctx(ctx).Infof("参数【%v】响应【%v】响应时间【%vms】", paramStr, str, gtime.TimestampMilli()-Start)
}
}()
str = resp.ReadAllString()
return
}
upstream/schl/base.go
浏览文件 @ 47afeff1
...@@ -46,10 +46,10 @@ func (c *Config) Post(ctx context.Context, api string, bodyMap g.Map) (result st ...@@ -46,10 +46,10 @@ func (c *Config) Post(ctx context.Context, api string, bodyMap g.Map) (result st
defer func() { defer func() {
ctx = context.WithValue(ctx, "URI", api) ctx = context.WithValue(ctx, "URI", api)
if err != nil { if err != nil {
g.Log().Ctx(ctx).Cat("error").Async(true). g.Log().Ctx(ctx).Cat(pkgName).Cat("error").
Infof("参数【%v】错误【%v】响应时间:【%v ms】", gjson.New(bodyMap).MustToJsonString(), err.Error(), gtime.TimestampMilli()-Start) Infof("参数【%v】错误【%v】响应时间:【%v ms】", gjson.New(bodyMap).MustToJsonString(), err.Error(), gtime.TimestampMilli()-Start)
} else { } else {
g.Log().Ctx(ctx).Cat(pkgName).Async(true). g.Log().Ctx(ctx).Cat(pkgName).
Infof("参数【%v】响应【%v】响应时间:【%v ms】", gjson.New(bodyMap).MustToJsonString(), result, gtime.TimestampMilli()-Start) Infof("参数【%v】响应【%v】响应时间:【%v ms】", gjson.New(bodyMap).MustToJsonString(), result, gtime.TimestampMilli()-Start)
} }
}() }()
......
upstream/tm/tm.go
浏览文件 @ 47afeff1
...@@ -110,7 +110,7 @@ func post(ctx context.Context, method string, params map[string]string) (str str ...@@ -110,7 +110,7 @@ func post(ctx context.Context, method string, params map[string]string) (str str
ctx = context.WithValue(ctx, "Method", "POST") ctx = context.WithValue(ctx, "Method", "POST")
ctx = context.WithValue(ctx, "URI", apiUrl+params["Action"]) ctx = context.WithValue(ctx, "URI", apiUrl+params["Action"])
if err != nil { if err != nil {
g.Log().Ctx(ctx).Infof("参数【%v】错误【%v】响应时间【%v】", paramStr, err.Error(), gtime.TimestampMilli()-Start) g.Log().Ctx(ctx).Cat(PkgName).Cat("error").Infof("参数【%v】错误【%v】响应时间【%v】", paramStr, err.Error(), gtime.TimestampMilli()-Start)
} else { } else {
g.Log().Ctx(ctx).Cat(PkgName).Infof("参数【%v】响应【%v】响应时间【%v】", paramStr, str, gtime.TimestampMilli()-Start) g.Log().Ctx(ctx).Cat(PkgName).Infof("参数【%v】响应【%v】响应时间【%v】", paramStr, str, gtime.TimestampMilli()-Start)
} }
......
upstream/wpc/wpc.go
浏览文件 @ 47afeff1
...@@ -95,7 +95,7 @@ func post(ctx context.Context, method string, req interface{}) (res string, err ...@@ -95,7 +95,7 @@ func post(ctx context.Context, method string, req interface{}) (res string, err
ctx = context.WithValue(ctx, "Method", "POST") ctx = context.WithValue(ctx, "Method", "POST")
ctx = context.WithValue(ctx, "URI", method) ctx = context.WithValue(ctx, "URI", method)
if err != nil { if err != nil {
g.Log().Ctx(ctx).Infof("参数【%v】错误【%v】响应时间【%v】", paramStr, err.Error(), gtime.TimestampMilli()-Start) g.Log().Ctx(ctx).Cat(pkgName).Cat("error").Infof("参数【%v】错误【%v】响应时间【%v】", paramStr, err.Error(), gtime.TimestampMilli()-Start)
} else { } else {
g.Log().Ctx(ctx).Cat(pkgName).Infof("参数【%v】响应【%v】响应时间【%v】", paramStr, res, gtime.TimestampMilli()-Start) g.Log().Ctx(ctx).Cat(pkgName).Infof("参数【%v】响应【%v】响应时间【%v】", paramStr, res, gtime.TimestampMilli()-Start)
} }
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论