更新 go.mod 和 go.sum 文件，升级 Go 版本和工具链，添加新的依赖项并更新现有依赖项的版本。优化订单处理逻辑，修改订单失败提示信息为更明确的内容，增强代码可读性。同时新增单元测试以确保功能正常。
This commit is contained in:
danial
16
go.mod
16
go.mod
@@ -1,12 +1,13 @@
|
||||
module gateway
|
||||
|
||||
go 1.23
|
||||
go 1.23.0
|
||||
|
||||
toolchain go1.23.6
|
||||
toolchain go1.24.3
|
||||
|
||||
require github.com/beego/beego/v2 v2.3.4
|
||||
|
||||
require (
|
||||
github.com/PuerkitoBio/goquery v1.10.3
|
||||
github.com/bytedance/gopkg v0.1.2-0.20240828084325-780ca9ee70fb
|
||||
github.com/bytedance/sonic v1.13.2
|
||||
github.com/carlmjohnson/requests v0.24.3
|
||||
@@ -35,11 +36,13 @@ require (
|
||||
go.opentelemetry.io/otel/sdk/metric v1.35.0
|
||||
go.opentelemetry.io/otel/trace v1.35.0
|
||||
go.uber.org/zap v1.27.0
|
||||
golang.org/x/exp v0.0.0-20250128182459-e0ece0dbea4c
|
||||
)
|
||||
|
||||
require (
|
||||
filippo.io/edwards25519 v1.1.0 // indirect
|
||||
github.com/BurntSushi/toml v1.5.0 // indirect
|
||||
github.com/andybalholm/cascadia v1.3.3 // indirect
|
||||
github.com/beorn7/perks v1.0.1 // indirect
|
||||
github.com/bytedance/sonic/loader v0.2.4 // indirect
|
||||
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
|
||||
@@ -70,11 +73,10 @@ require (
|
||||
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
|
||||
go.uber.org/multierr v1.11.0 // indirect
|
||||
golang.org/x/arch v0.14.0 // indirect
|
||||
golang.org/x/crypto v0.33.0 // indirect
|
||||
golang.org/x/exp v0.0.0-20250128182459-e0ece0dbea4c // indirect
|
||||
golang.org/x/net v0.35.0 // indirect
|
||||
golang.org/x/sys v0.30.0 // indirect
|
||||
golang.org/x/text v0.22.0 // indirect
|
||||
golang.org/x/crypto v0.38.0 // indirect
|
||||
golang.org/x/net v0.40.0 // indirect
|
||||
golang.org/x/sys v0.33.0 // indirect
|
||||
golang.org/x/text v0.25.0 // indirect
|
||||
google.golang.org/genproto/googleapis/api v0.0.0-20250218202821-56aae31c358a // indirect
|
||||
google.golang.org/genproto/googleapis/rpc v0.0.0-20250218202821-56aae31c358a // indirect
|
||||
google.golang.org/grpc v1.71.0 // indirect
|
||||
|
||||
74
go.sum
74
go.sum
@@ -2,6 +2,10 @@ filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
|
||||
filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
|
||||
github.com/BurntSushi/toml v1.5.0 h1:W5quZX/G/csjUnuI8SUYlsHs9M38FC7znL0lIO+DvMg=
|
||||
github.com/BurntSushi/toml v1.5.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
|
||||
github.com/PuerkitoBio/goquery v1.10.3 h1:pFYcNSqHxBD06Fpj/KsbStFRsgRATgnf3LeXiUkhzPo=
|
||||
github.com/PuerkitoBio/goquery v1.10.3/go.mod h1:tMUX0zDMHXYlAQk6p35XxQMqMweEKB7iK7iLNd4RH4Y=
|
||||
github.com/andybalholm/cascadia v1.3.3 h1:AG2YHrzJIm4BZ19iwJ/DAua6Btl3IwJX+VI4kktS1LM=
|
||||
github.com/andybalholm/cascadia v1.3.3/go.mod h1:xNd9bqTn98Ln4DwST8/nG+H0yuB8Hmgu1YHNnWw0GeA=
|
||||
github.com/beego/beego/v2 v2.3.4 h1:HurQEOGIEhLlPFCTR6ZDuQkybrUl2Ag2i6CdVD2rGiI=
|
||||
github.com/beego/beego/v2 v2.3.4/go.mod h1:5cqHsOHJIxkq44tBpRvtDe59GuVRVv/9/tyVDxd5ce4=
|
||||
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
|
||||
@@ -49,6 +53,7 @@ github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=
|
||||
github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
|
||||
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
|
||||
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
|
||||
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
|
||||
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
|
||||
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
|
||||
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
|
||||
@@ -120,6 +125,7 @@ github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyC
|
||||
github.com/widuu/gojson v0.0.0-20170212122013-7da9d2cd949b h1:ieRJ8K7QAPWWltEOv7rzMruuPd7gbeAqTaBFhUECIy0=
|
||||
github.com/widuu/gojson v0.0.0-20170212122013-7da9d2cd949b/go.mod h1:9W1pyetRkwXqjR9tjOSrSuhGHBK0EqXoQSwWbhBHHwA=
|
||||
github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
|
||||
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
|
||||
go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
|
||||
go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
|
||||
go.opentelemetry.io/contrib/bridges/otelzap v0.10.0 h1:ojdSRDvjrnm30beHOmwsSvLpoRF40MlwNCA+Oo93kXU=
|
||||
@@ -160,35 +166,87 @@ golang.org/x/arch v0.14.0 h1:z9JUEZWr8x4rR0OU6c4/4t6E6jOZ8/QBS2bBYBm4tx4=
|
||||
golang.org/x/arch v0.14.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys=
|
||||
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
|
||||
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
|
||||
golang.org/x/crypto v0.33.0 h1:IOBPskki6Lysi0lo9qQvbxiQ+FvsCC/YWOecCHAixus=
|
||||
golang.org/x/crypto v0.33.0/go.mod h1:bVdXmD7IV/4GdElGPozy6U7lWdRXA4qyRVGJV57uQ5M=
|
||||
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
|
||||
golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
|
||||
golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
|
||||
golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
|
||||
golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
|
||||
golang.org/x/crypto v0.38.0 h1:jt+WWG8IZlBnVbomuhg2Mdq0+BBQaHbtqHEFEigjUV8=
|
||||
golang.org/x/crypto v0.38.0/go.mod h1:MvrbAqul58NNYPKnOra203SB9vpuZW0e+RRZV+Ggqjw=
|
||||
golang.org/x/exp v0.0.0-20250128182459-e0ece0dbea4c h1:KL/ZBHXgKGVmuZBZ01Lt57yE5ws8ZPSkkihmEyq7FXc=
|
||||
golang.org/x/exp v0.0.0-20250128182459-e0ece0dbea4c/go.mod h1:tujkw807nyEEAamNbDrEGzRav+ilXA7PCRAd6xsmwiU=
|
||||
golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
|
||||
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
|
||||
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
|
||||
golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
|
||||
golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
|
||||
golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
|
||||
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
|
||||
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
||||
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
|
||||
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
|
||||
golang.org/x/net v0.35.0 h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8=
|
||||
golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk=
|
||||
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
|
||||
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
|
||||
golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
|
||||
golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
|
||||
golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
|
||||
golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
|
||||
golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
|
||||
golang.org/x/net v0.40.0 h1:79Xs7wF06Gbdcg4kdCCIQArK11Z1hr5POQ6+fIYHNuY=
|
||||
golang.org/x/net v0.40.0/go.mod h1:y0hY0exeL2Pku80/zKK7tpntoX23cqL3Oa6njdgRtds=
|
||||
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
|
||||
golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
|
||||
golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
|
||||
golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
|
||||
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
|
||||
golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
||||
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
||||
golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
||||
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
||||
golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
|
||||
golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
|
||||
golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
|
||||
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
|
||||
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
|
||||
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
|
||||
golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
|
||||
golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
|
||||
golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
|
||||
golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
|
||||
golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
|
||||
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
||||
golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
|
||||
golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
|
||||
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
|
||||
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
|
||||
golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
|
||||
golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
|
||||
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
|
||||
golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
|
||||
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
|
||||
golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4=
|
||||
golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA=
|
||||
golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U=
|
||||
golang.org/x/time v0.6.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
|
||||
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
||||
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
|
||||
golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
|
||||
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
|
||||
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
|
||||
golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
|
||||
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
|
||||
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||
|
||||
@@ -89,7 +89,7 @@ func (c *OrderController) OrderSchedule() {
|
||||
|
||||
// 插入处理失败的动账通知
|
||||
service.SolvePayFail(ctx, orderInfo.BankOrderId, orderInfo.BankTransId, scanData.ReturnData)
|
||||
c.Ctx.WriteString("订单失败")
|
||||
c.Ctx.WriteString("三方订单提交失败")
|
||||
}
|
||||
|
||||
func (c *OrderController) OrderUpdate() {
|
||||
|
||||
@@ -365,6 +365,7 @@ func (c *ScanController) GetAllowedMM() {
|
||||
IsLinkSingle bool `json:"isLinkSingle" description:"链接是否单独放置"`
|
||||
LinkID string `json:"linkID" description:"链接"`
|
||||
}
|
||||
|
||||
otelTrace.Logger.WithContext(ctx).Info("当前请求面额数据", zap.Any("profitMarginList", profitMarginList))
|
||||
resData := make([]*profitMarginStruct, 0)
|
||||
for _, v := range profitMarginList {
|
||||
|
||||
@@ -27,6 +27,7 @@ import (
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
"github.com/PuerkitoBio/goquery"
|
||||
"github.com/beego/beego/v2/client/httplib"
|
||||
"github.com/beego/beego/v2/server/web"
|
||||
"github.com/bytedance/gopkg/util/gopool"
|
||||
@@ -192,6 +193,259 @@ func processWaitingQueue() {
|
||||
}
|
||||
}
|
||||
|
||||
func fcProcessStrategy1(ctx context.Context, cardNo, cardPwd, bankOrderId, channelCode string, payUrl *url.URL) (bool, string) {
|
||||
var err error
|
||||
|
||||
req := httplib.NewBeegoRequestWithCtx(ctx, payUrl.String(), "GET").SetTimeout(time.Second*30, time.Second*30).
|
||||
SetTransport(otelhttp.NewTransport(http.DefaultTransport)).
|
||||
Retries(3).SetProxy(func(req *http.Request) (*url.URL, error) {
|
||||
proxy, err := utils.OrderBasedProxyStrategyInstance.GetProxy(ctx, bankOrderId)
|
||||
if err != nil {
|
||||
otelTrace.Logger.WithContext(ctx).Error("获取代理失败", zap.Error(err))
|
||||
return nil, err
|
||||
}
|
||||
return url.Parse(proxy)
|
||||
})
|
||||
|
||||
response, err := req.String()
|
||||
if err != nil {
|
||||
otelTrace.Logger.WithContext(ctx).Error("获取代理失败", zap.Error(err))
|
||||
return false, ""
|
||||
}
|
||||
|
||||
doc, err := goquery.NewDocumentFromReader(strings.NewReader(response))
|
||||
if err != nil {
|
||||
otelTrace.Logger.WithContext(ctx).Error("解析html失败", zap.Error(err))
|
||||
return false, ""
|
||||
}
|
||||
|
||||
submitParams := map[string]string{}
|
||||
|
||||
doc.Find("input[name=pay_callbackurl]").Each(func(index int, s *goquery.Selection) {
|
||||
submitParams["pay_callbackurl"] = s.AttrOr("value", "")
|
||||
})
|
||||
|
||||
doc.Find("input[name=pay_bankcode]").Each(func(index int, s *goquery.Selection) {
|
||||
submitParams["pay_bankcode"] = s.AttrOr("value", "")
|
||||
})
|
||||
|
||||
doc.Find("input[name=pay_md5sign]").Each(func(index int, s *goquery.Selection) {
|
||||
submitParams["pay_md5sign"] = s.AttrOr("value", "")
|
||||
})
|
||||
|
||||
doc.Find("input[name=pay_notifyurl]").Each(func(index int, s *goquery.Selection) {
|
||||
submitParams["pay_notifyurl"] = s.AttrOr("value", "")
|
||||
})
|
||||
|
||||
doc.Find("input[name=pay_orderid]").Each(func(index int, s *goquery.Selection) {
|
||||
submitParams["pay_orderid"] = s.AttrOr("value", "")
|
||||
})
|
||||
|
||||
doc.Find("input[name=pay_productname]").Each(func(index int, s *goquery.Selection) {
|
||||
submitParams["pay_productname"] = s.AttrOr("value", "")
|
||||
})
|
||||
|
||||
doc.Find("input[name=pay_amount]").Each(func(index int, s *goquery.Selection) {
|
||||
submitParams["pay_amount"] = s.AttrOr("value", "")
|
||||
})
|
||||
|
||||
doc.Find("input[name=pay_memberid]").Each(func(index int, s *goquery.Selection) {
|
||||
submitParams["pay_memberid"] = s.AttrOr("value", "")
|
||||
})
|
||||
|
||||
doc.Find("input[name=pay_applydate]").Each(func(index int, s *goquery.Selection) {
|
||||
submitParams["pay_applydate"] = s.AttrOr("value", "")
|
||||
})
|
||||
|
||||
actionUrl := ""
|
||||
doc.Find("form[name=para_form]").Each(func(index int, s *goquery.Selection) {
|
||||
actionUrl = s.AttrOr("action", "")
|
||||
})
|
||||
|
||||
req = httplib.NewBeegoRequestWithCtx(ctx, actionUrl, "GET").
|
||||
SetTimeout(time.Second*30, time.Second*30).
|
||||
SetTransport(otelhttp.NewTransport(http.DefaultTransport)).
|
||||
Retries(3).SetProxy(func(req *http.Request) (*url.URL, error) {
|
||||
proxy, err := utils.OrderBasedProxyStrategyInstance.GetProxy(ctx, bankOrderId)
|
||||
if err != nil {
|
||||
otelTrace.Logger.WithContext(ctx).Error("获取代理失败", zap.Error(err))
|
||||
return nil, err
|
||||
}
|
||||
return url.Parse(proxy)
|
||||
})
|
||||
|
||||
for k, v := range submitParams {
|
||||
req = req.Param(k, v)
|
||||
}
|
||||
|
||||
response, err = req.String()
|
||||
otelTrace.Logger.WithContext(ctx).Info("祥云提交订单请求结果", zap.Any("response", response), zap.Any("submitParams", submitParams))
|
||||
if err != nil {
|
||||
otelTrace.Logger.WithContext(ctx).Error("请求结果失败", zap.Error(err))
|
||||
return false, ""
|
||||
}
|
||||
|
||||
doc, err = goquery.NewDocumentFromReader(strings.NewReader(response))
|
||||
if err != nil {
|
||||
otelTrace.Logger.WithContext(ctx).Error("解析html失败", zap.Error(err))
|
||||
return false, ""
|
||||
}
|
||||
|
||||
doc.Find("form[name=form1]").Each(func(index int, s *goquery.Selection) {
|
||||
actionUrl = s.AttrOr("action", "")
|
||||
})
|
||||
|
||||
if strings.Contains(actionUrl, "47.106.209.190") {
|
||||
actionRawUrl, err := url.Parse(actionUrl)
|
||||
if err != nil {
|
||||
otelTrace.Logger.WithContext(ctx).Error("解析url失败", zap.Error(err))
|
||||
return false, ""
|
||||
}
|
||||
orderId := actionRawUrl.Query().Get("orderId")
|
||||
|
||||
req = httplib.NewBeegoRequestWithCtx(ctx, "http://47.106.209.190:16888/submitcard", "POST").
|
||||
SetTimeout(time.Second*30, time.Second*30).
|
||||
SetTransport(otelhttp.NewTransport(http.DefaultTransport)).
|
||||
Retries(3).SetProxy(func(req *http.Request) (*url.URL, error) {
|
||||
proxy, err := utils.OrderBasedProxyStrategyInstance.GetProxy(ctx, bankOrderId)
|
||||
if err != nil {
|
||||
otelTrace.Logger.WithContext(ctx).Error("获取代理失败", zap.Error(err))
|
||||
return nil, err
|
||||
}
|
||||
return url.Parse(proxy)
|
||||
})
|
||||
req.Param("cardNumber", cardNo)
|
||||
req.Param("cardPassword", cardPwd)
|
||||
req.Param("customerId", "36")
|
||||
req.Param("orderNo", orderId)
|
||||
req.Param("productCode", "8023")
|
||||
|
||||
response, err = req.String()
|
||||
otelTrace.Logger.WithContext(ctx).Info("祥云提交订单请求结果", zap.Any("response", response), zap.Any("orderId", orderId))
|
||||
if err != nil {
|
||||
otelTrace.Logger.WithContext(ctx).Error("请求结果失败", zap.Error(err))
|
||||
return false, ""
|
||||
}
|
||||
type submitCardResp struct {
|
||||
Code int `json:"code"`
|
||||
Message string `json:"message"`
|
||||
}
|
||||
var resData submitCardResp
|
||||
err = json.Unmarshal([]byte(response), &resData)
|
||||
if err != nil {
|
||||
otelTrace.Logger.WithContext(ctx).Error("解析json失败", zap.Error(err))
|
||||
return false, ""
|
||||
}
|
||||
if resData.Code != 1 {
|
||||
return false, resData.Message
|
||||
}
|
||||
return true, resData.Message
|
||||
}
|
||||
|
||||
if strings.Contains(actionUrl, "sgdemo.wotingwen.com") {
|
||||
return fcProcessStrategy2(ctx, cardNo, cardPwd, bankOrderId, channelCode, payUrl)
|
||||
}
|
||||
|
||||
return false, "当前通道不支持，请联系添加"
|
||||
}
|
||||
|
||||
func fcProcessStrategy2(ctx context.Context, cardNo, cardPwd, bankOrderId, channelCode string, payUrl *url.URL) (bool, string) {
|
||||
var err error
|
||||
|
||||
reqUrlList := []string{
|
||||
"http://shopapi.sgxyzpay.com/h5", "http://shop22.wotingwen.com/h5", "http://shop33.wotingwen.com/h5",
|
||||
}
|
||||
reqUrl := random.RandFromGivenSlice(reqUrlList)
|
||||
reqId := ""
|
||||
switch channelCode {
|
||||
case "802A", "803A":
|
||||
arr := strings.Split(payUrl.Fragment, "/")
|
||||
if len(arr) > 0 {
|
||||
reqId = arr[len(arr)-1]
|
||||
}
|
||||
default:
|
||||
reqId = payUrl.Query().Get("id")
|
||||
}
|
||||
|
||||
req := httplib.NewBeegoRequestWithCtx(ctx, fmt.Sprintf("%s/order/setUserPayInfo", reqUrl), "POST").
|
||||
SetTimeout(time.Second*30, time.Second*30).
|
||||
SetTransport(otelhttp.NewTransport(http.DefaultTransport)).
|
||||
Retries(3).SetProxy(func(req *http.Request) (*url.URL, error) {
|
||||
proxy, err := utils.OrderBasedProxyStrategyInstance.GetProxy(ctx, bankOrderId)
|
||||
if err != nil {
|
||||
otelTrace.Logger.WithContext(ctx).Error("获取代理失败", zap.Error(err))
|
||||
return nil, err
|
||||
}
|
||||
return url.Parse(proxy)
|
||||
})
|
||||
|
||||
type PayUrlData struct {
|
||||
Id string `json:"id"`
|
||||
Ip string `json:"ip"`
|
||||
UserPayInfo string `json:"userPayInfo"`
|
||||
Device string `json:"device"`
|
||||
}
|
||||
|
||||
otelTrace.Logger.WithContext(ctx).Info("祥云提交订单请求参数", zap.Any("reqId", PayUrlData{
|
||||
Id: reqId,
|
||||
Ip: utils.GenerateIpv4(),
|
||||
UserPayInfo: fmt.Sprintf("%s,%s", cardNo, cardPwd),
|
||||
Device: "null,",
|
||||
}), zap.Any("payUrl", payUrl), zap.String("channelCode", channelCode))
|
||||
|
||||
req, err = req.JSONBody(PayUrlData{
|
||||
Id: reqId,
|
||||
Ip: utils.GenerateIpv4(),
|
||||
UserPayInfo: fmt.Sprintf("%s,%s", cardNo, cardPwd),
|
||||
Device: "null,",
|
||||
})
|
||||
if err != nil {
|
||||
otelTrace.Logger.WithContext(ctx).Error("祥云提交订单失败", zap.Error(err))
|
||||
return false, ""
|
||||
}
|
||||
respCode, err := req.Response()
|
||||
if err != nil || respCode.StatusCode != http.StatusOK {
|
||||
otelTrace.Logger.WithContext(ctx).Error("祥云提交订单失败", zap.Error(err), zap.Any("respCode", respCode.StatusCode))
|
||||
return false, ""
|
||||
}
|
||||
defer respCode.Body.Close()
|
||||
|
||||
responseBytes, err := io.ReadAll(respCode.Body)
|
||||
if err != nil {
|
||||
otelTrace.Logger.WithContext(ctx).Error("祥云提交订单失败", zap.Error(err))
|
||||
return false, ""
|
||||
}
|
||||
// 解析unicode编码
|
||||
responseBytes, err = unescapeUnicode(responseBytes)
|
||||
if err != nil {
|
||||
otelTrace.Logger.WithContext(ctx).Error("祥云提交订单失败", zap.Error(err))
|
||||
return false, ""
|
||||
}
|
||||
|
||||
response := string(responseBytes)
|
||||
otelTrace.Logger.WithContext(ctx).Info("祥云提交订单返回结果", zap.Any("response", response))
|
||||
|
||||
var resData2 struct {
|
||||
Code int `json:"code"`
|
||||
Msg string `json:"msg"`
|
||||
Data struct {
|
||||
Msg string `json:"msg"`
|
||||
} `json:"data"`
|
||||
}
|
||||
|
||||
err = json.Unmarshal([]byte(response), &resData2)
|
||||
if err != nil {
|
||||
otelTrace.Logger.WithContext(ctx).Error("祥云提交订单失败", zap.Error(err))
|
||||
return false, "订单返回数据错误"
|
||||
}
|
||||
|
||||
if resData2.Code != 0 {
|
||||
return false, resData2.Msg
|
||||
}
|
||||
|
||||
return true, resData2.Data.Msg
|
||||
}
|
||||
|
||||
// processOrderSubmitQueue 处理订单提交队列
|
||||
func processOrderSubmitQueue() {
|
||||
for task := range orderSubmitQueue {
|
||||
@@ -272,107 +526,22 @@ func submitOrder(ctx context.Context, jsonStr string, orderInfo order.OrderInfo,
|
||||
return false, resData.ErrMsg
|
||||
}
|
||||
|
||||
otelTrace.Logger.WithContext(ctx).Info("祥云返回结果", zap.Any("resData", resData))
|
||||
|
||||
// 解析url
|
||||
payUrl, err := url.Parse(resData.Result.PayUrl)
|
||||
if err != nil {
|
||||
otelTrace.Logger.WithContext(ctx).Error("祥云返回结果", zap.Error(err))
|
||||
return false, ""
|
||||
otelTrace.Logger.WithContext(ctx).Error("解析支付链接失败", zap.Error(err))
|
||||
return false, "内部数据处理失败"
|
||||
}
|
||||
|
||||
reqUrlList := []string{
|
||||
"http://shopapi.sgxyzpay.com/h5", "http://shop22.wotingwen.com/h5", "http://shop33.wotingwen.com/h5",
|
||||
}
|
||||
reqUrl := random.RandFromGivenSlice(reqUrlList)
|
||||
reqId := ""
|
||||
switch gojson.Json(jsonStr).Get("channelCode").Tostring() {
|
||||
case "802A", "803A":
|
||||
arr := strings.Split(payUrl.Fragment, "/")
|
||||
if len(arr) > 0 {
|
||||
reqId = arr[len(arr)-1]
|
||||
}
|
||||
default:
|
||||
reqId = payUrl.Query().Get("id")
|
||||
}
|
||||
channelCode := gojson.Json(jsonStr).Get("channelCode").Tostring()
|
||||
|
||||
req = httplib.NewBeegoRequestWithCtx(ctx, fmt.Sprintf("%s/order/setUserPayInfo", reqUrl), "POST").
|
||||
SetTimeout(time.Second*30, time.Second*30).
|
||||
SetTransport(otelhttp.NewTransport(http.DefaultTransport)).
|
||||
Retries(3).SetProxy(func(req *http.Request) (*url.URL, error) {
|
||||
proxy, err := utils.OrderBasedProxyStrategyInstance.GetProxy(ctx, orderInfo.BankOrderId)
|
||||
if err != nil {
|
||||
otelTrace.Logger.WithContext(ctx).Error("获取代理失败", zap.Error(err))
|
||||
return nil, err
|
||||
}
|
||||
return url.Parse(proxy)
|
||||
})
|
||||
|
||||
type PayUrlData struct {
|
||||
Id string `json:"id"`
|
||||
Ip string `json:"ip"`
|
||||
UserPayInfo string `json:"userPayInfo"`
|
||||
Device string `json:"device"`
|
||||
if channelCode == "822A" {
|
||||
return fcProcessStrategy1(ctx, cardInfo.CardNo, cardInfo.Data, orderInfo.BankOrderId, channelCode, payUrl)
|
||||
}
|
||||
|
||||
otelTrace.Logger.WithContext(ctx).Info("祥云提交订单请求参数", zap.Any("reqId", PayUrlData{
|
||||
Id: reqId,
|
||||
Ip: utils.GenerateIpv4(),
|
||||
UserPayInfo: fmt.Sprintf("%s,%s", cardInfo.CardNo, cardInfo.Data),
|
||||
Device: "null,",
|
||||
}), zap.Any("payUrl", payUrl), zap.String("channelCode", gojson.Json(jsonStr).Get("channelCode").Tostring()))
|
||||
|
||||
req, err = req.JSONBody(PayUrlData{
|
||||
Id: reqId,
|
||||
Ip: utils.GenerateIpv4(),
|
||||
UserPayInfo: fmt.Sprintf("%s,%s", cardInfo.CardNo, cardInfo.Data),
|
||||
Device: "null,",
|
||||
})
|
||||
if err != nil {
|
||||
otelTrace.Logger.WithContext(ctx).Error("祥云提交订单失败", zap.Error(err))
|
||||
return false, ""
|
||||
ok, msg := fcProcessStrategy2(ctx, cardInfo.CardNo, cardInfo.Data, orderInfo.BankOrderId, channelCode, payUrl)
|
||||
if !ok {
|
||||
return false, msg
|
||||
}
|
||||
respCode, err := req.Response()
|
||||
if err != nil || respCode.StatusCode != http.StatusOK {
|
||||
otelTrace.Logger.WithContext(ctx).Error("祥云提交订单失败", zap.Error(err), zap.Any("respCode", respCode.StatusCode))
|
||||
return false, ""
|
||||
}
|
||||
defer respCode.Body.Close()
|
||||
|
||||
responseBytes, err := io.ReadAll(respCode.Body)
|
||||
if err != nil {
|
||||
otelTrace.Logger.WithContext(ctx).Error("祥云提交订单失败", zap.Error(err))
|
||||
return false, ""
|
||||
}
|
||||
// 解析unicode编码
|
||||
responseBytes, err = unescapeUnicode(responseBytes)
|
||||
if err != nil {
|
||||
otelTrace.Logger.WithContext(ctx).Error("祥云提交订单失败", zap.Error(err))
|
||||
return false, ""
|
||||
}
|
||||
|
||||
response = string(responseBytes)
|
||||
otelTrace.Logger.WithContext(ctx).Info("祥云提交订单返回结果", zap.Any("response", response))
|
||||
|
||||
var resData2 struct {
|
||||
Code int `json:"code"`
|
||||
Msg string `json:"msg"`
|
||||
Data struct {
|
||||
Msg string `json:"msg"`
|
||||
} `json:"data"`
|
||||
}
|
||||
|
||||
err = json.Unmarshal([]byte(response), &resData2)
|
||||
if err != nil {
|
||||
otelTrace.Logger.WithContext(ctx).Error("祥云提交订单失败", zap.Error(err))
|
||||
return false, "订单返回数据错误"
|
||||
}
|
||||
|
||||
if resData2.Code != 0 {
|
||||
return false, resData2.Msg
|
||||
}
|
||||
|
||||
return true, resData2.Data.Msg
|
||||
return true, msg
|
||||
}
|
||||
|
||||
// SendCard 发送卡密
|
||||
|
||||
@@ -33,6 +33,7 @@ import (
|
||||
"go.opentelemetry.io/otel/attribute"
|
||||
"go.opentelemetry.io/otel/trace"
|
||||
"go.uber.org/zap"
|
||||
"golang.org/x/exp/slices"
|
||||
)
|
||||
|
||||
type TradeCatCardImpl struct {
|
||||
@@ -46,47 +47,60 @@ func (c *TradeCatCardImpl) HasDependencyHTML() bool {
|
||||
|
||||
// 生成md5加密
|
||||
func (c *TradeCatCardImpl) generateSign(ctx context.Context, params map[string]interface{}, key string) string {
|
||||
ignoreKeys := []string{"sign", "gtype", "key"}
|
||||
keys := maputil.Keys(params)
|
||||
sort.Strings(keys)
|
||||
sign := ""
|
||||
for _, key2 := range keys {
|
||||
if slices.Contains(ignoreKeys, key2) {
|
||||
continue
|
||||
}
|
||||
sign += key2 + "=" + convertor.ToString(params[key2]) + "&"
|
||||
}
|
||||
sign += "secret=" + key
|
||||
return utils.EncodeMd5Str(sign)
|
||||
sign += "key=" + key
|
||||
fmt.Println("sign", sign)
|
||||
return strings.ToUpper(utils.EncodeMd5Str(sign))
|
||||
}
|
||||
|
||||
// SendCard 发送卡密
|
||||
func (c *TradeCatCardImpl) SendCard(ctx context.Context, jsonStr string, orderInfo order.OrderInfo, cardInfo supplier.RedeemCardInfo, attach string) (bool, string) {
|
||||
cfg := config.Config{}
|
||||
|
||||
params := map[string]any{
|
||||
"merchantId": gojson.Json(jsonStr).Get("merchantId").Tostring(),
|
||||
"tenantId": gojson.Json(jsonStr).Get("tenantId").Tostring(),
|
||||
"actionType": 2,
|
||||
"bizOrderNo": orderInfo.BankOrderId,
|
||||
"cardPwd": cardInfo.CardNo,
|
||||
"cardKey": cardInfo.Data,
|
||||
"expectAmount": int(orderInfo.OrderAmount) * 100,
|
||||
"notify": 1,
|
||||
"bizNotifyUrl": fmt.Sprintf("%s%s", cfg.GatewayAddr(), "/Ninja/notify"),
|
||||
"expectCardType": gojson.Json(jsonStr).Get("expectCardType").Tostring(),
|
||||
reqData := struct {
|
||||
ApiId string `json:"api_id"`
|
||||
Orderid string `json:"orderid"`
|
||||
Money int `json:"money"`
|
||||
NotifyUrl string `json:"notify_url"`
|
||||
ReturnUrl string `json:"return_url"`
|
||||
Gtype string `json:"gtype"`
|
||||
Sign string `json:"sign"`
|
||||
}{
|
||||
ApiId: gojson.Json(jsonStr).Get("api_id").Tostring(),
|
||||
Orderid: orderInfo.BankOrderId,
|
||||
Money: int(orderInfo.OrderAmount),
|
||||
NotifyUrl: fmt.Sprintf("%s%s", cfg.GatewayAddr(), "/Ninja/notify"),
|
||||
ReturnUrl: "http://127.0.0.1",
|
||||
Gtype: gojson.Json(jsonStr).Get("gtype").Tostring(),
|
||||
}
|
||||
formData := make(map[string]any)
|
||||
|
||||
// 给出一个固定的demo
|
||||
formData["sign"] = generateNinjaSign(ctx, params, gojson.Json(jsonStr).Get("secret").Tostring())
|
||||
formData["data"] = params
|
||||
formData, err := convertor.StructToMap(reqData)
|
||||
if err != nil {
|
||||
otelTrace.Logger.WithContext(ctx).Error("结构体转换为map失败", zap.Error(err))
|
||||
return false, "内部数据处理失败"
|
||||
}
|
||||
|
||||
req := httplib.NewBeegoRequestWithCtx(ctx, "http://154.19.85.125:13962/api/merchant/order", "POST").
|
||||
formData["key"] = gojson.Json(jsonStr).Get("key").Tostring()
|
||||
reqData.Sign = c.generateSign(ctx, formData, gojson.Json(jsonStr).Get("key").Tostring())
|
||||
|
||||
req := httplib.NewBeegoRequestWithCtx(ctx, "https://pay.smcbai.com/yizhifu", "POST").
|
||||
SetTransport(otelhttp.NewTransport(http.DefaultTransport)).
|
||||
SetTimeout(time.Second*3, time.Second*3).Retries(3)
|
||||
|
||||
otelTrace.Logger.WithContext(ctx).Info("请求参数：", zap.Any("params", formData))
|
||||
otelTrace.Logger.WithContext(ctx).Info("请求参数：", zap.Any("params", reqData))
|
||||
|
||||
req.Header("Accept-Charset", "utf-8")
|
||||
|
||||
resp, err := req.JSONBody(formData)
|
||||
resp, err := req.JSONBody(reqData)
|
||||
response, err := resp.String()
|
||||
|
||||
if err != nil {
|
||||
@@ -95,11 +109,9 @@ func (c *TradeCatCardImpl) SendCard(ctx context.Context, jsonStr string, orderIn
|
||||
}
|
||||
|
||||
type AutoGenerated struct {
|
||||
Code int `json:"code"`
|
||||
Message string `json:"message"`
|
||||
Data struct {
|
||||
OrderNo string `json:"orderNo"`
|
||||
} `json:"data,omitempty"`
|
||||
Code int `json:"code"`
|
||||
Msg string `json:"msg"`
|
||||
PayUrl string `json:"payUrl"`
|
||||
}
|
||||
|
||||
var resData AutoGenerated
|
||||
|
||||
21
internal/service/supplier/third_party/trade_cat_test.go
vendored
Normal file
21
internal/service/supplier/third_party/trade_cat_test.go
vendored
Normal file
@@ -0,0 +1,21 @@
|
||||
package third_party
|
||||
|
||||
import (
|
||||
"context"
|
||||
"gateway/internal/models/order"
|
||||
"gateway/internal/service/supplier"
|
||||
"testing"
|
||||
|
||||
"github.com/google/uuid"
|
||||
)
|
||||
|
||||
func TestTradeCatCardImpl_SendCard(t *testing.T) {
|
||||
tradeCatCard := &TradeCatCardImpl{}
|
||||
tradeCatCard.SendCard(context.Background(), "{\"api_id\":\"7057282\",\"key\":\"F7E0227698ED9B3D569163695FB17B2A\",\"money\":100,\"notify_url\":\"http://127.0.0.1\",\"return_url\":\"http://127.0.0.1\",\"gtype\":\"9801\"}", order.OrderInfo{
|
||||
OrderAmount: 100,
|
||||
BankOrderId: uuid.New().String(),
|
||||
}, supplier.RedeemCardInfo{
|
||||
CardNo: "1234567890",
|
||||
Data: "1234567890",
|
||||
}, "")
|
||||
}
|
||||
Reference in New Issue
Block a user