BaseSystem
/
plugins
12
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

plugin wx order query

This commit is contained in:
李子铭 2024-07-16 11:13:30 +08:00
parent cb09456240
commit 362f38989c
9 changed files with 172 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/weixin_cpn/go.mod
View File

@ -20,6 +20,7 @@ require (
github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77 // indirect
github.com/oklog/run v1.0.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/wechatpay-apiv3/wechatpay-go v0.2.18 // indirect
golang.org/x/net v0.22.0 // indirect
golang.org/x/sys v0.18.0 // indirect
golang.org/x/text v0.14.0 // indirect

11
plugins/weixin_cpn/go.sum
View File

@ -1,7 +1,9 @@
codeup.aliyun.com/6552e56cc3b2728a4557fc18/plugin v0.0.0-20240716012838-3fabb484eb3d h1:9kUWxNabZ3Iq6yNbb1lGEb4BGsK5pclxaJ57jUw1wOw=
codeup.aliyun.com/6552e56cc3b2728a4557fc18/plugin v0.0.0-20240716012838-3fabb484eb3d/go.mod h1:QdW8HjHYQN8LCkFAB9e4oh7HziePCYnDXnUaKtmb8iQ=
github.com/agiledragon/gomonkey v2.0.2+incompatible/go.mod h1:2NGfXu1a80LLr2cmWXGBDaHEjb1idR6+FVlX5T3D9hw=
github.com/bufbuild/protocompile v0.4.0 h1:LbFKd2XowZvQ/kajzguUp2DC9UEIQhIq77fZZlaQsNA=
github.com/bufbuild/protocompile v0.4.0/go.mod h1:3v93+mbWn/v3xzN+31nwkJfrEpAUwp+BagBSZWx+TP8=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/envoyproxy/protoc-gen-validate v1.0.4 h1:gVPz/FMfvh57HdSJQyvBtF00j8JU4zdyUgIUNhlgg0A=
@ -31,9 +33,17 @@ github.com/oklog/run v1.0.0 h1:Ru7dDtJNOyC66gQ5dQmaCa0qIsAUFY3sFpK1Xk8igrw=
github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
github.com/wechatpay-apiv3/wechatpay-go v0.2.18 h1:vj5tvSmnEIz3ZsnFNNUzg+3Z46xgNMJbrO4aD4wP15w=
github.com/wechatpay-apiv3/wechatpay-go v0.2.18/go.mod h1:A254AUBVB6R+EqQFo3yTgeh7HtyqRRtN2w9hQSOrd4Q=
golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc=
golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@ -50,5 +60,6 @@ google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6h
google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

102
plugins/weixin_cpn/internal/transform.go
View File

@ -4,28 +4,67 @@ import (
"codeup.aliyun.com/6552e56cc3b2728a4557fc18/plugin/proto"
"encoding/json"
"fmt"
"github.com/wechatpay-apiv3/wechatpay-go/core"
"github.com/wechatpay-apiv3/wechatpay-go/services/cashcoupons"
"go/types"
"plugins/weixin_cpn/internal/vo"
)
type Config struct {
AppId string `json:"app_id"`
Prk string `json:"prk"`
Npk string `json:"npk"`
MchID string `json:"mch_id"`
MchCertificateSerialNumber string `json:"mch_certificate_serial_number"`
MchAPIv3Key string `json:"mch_ap_iv_3_key"`
PrivateKeyPath string `json:"private_key_path"`
}
func transConfig(config *proto.Config) (*Config, error) {
func transConfig(config []byte) (*Config, error) {
var c Config
err := json.Unmarshal(config.Conf, &c)
err := json.Unmarshal(config, &c)
if err != nil {
return nil, err
}
return &c, nil
}
func orderReq(order *proto.OrderRequest_Order, product *proto.OrderRequest_Product) (*types.Nil, error) {
func orderReq(order *proto.OrderRequest_Order, product *proto.OrderRequest_Product) (cashcoupons.SendCouponRequest, error) {
type Extra struct {
LogonId string `json:"logon_id"`
PhoneId string `json:"phone_id"`
StockCreatorMchid string `json:"stock_creator_mchid"`
Appid string `json:"app_id"`
}
var extra Extra
if order.Extra != nil {
err := json.Unmarshal(order.Extra, &extra)
if err != nil {
return cashcoupons.SendCouponRequest{}, fmt.Errorf("order extra json unmarshal error: %v", err)
}
}
c := cashcoupons.SendCouponRequest{
Openid: core.String(order.Account),
StockId: core.String(product.ProductNo),
OutRequestNo: core.String(order.OrderNo),
Appid: core.String(extra.Appid),
StockCreatorMchid: core.String(extra.StockCreatorMchid),
}
return c, nil
}
func orderResp(order *proto.OrderRequest_Order, tradeNo string) *proto.OrderResponse {
return &proto.OrderResponse{
Result: &proto.Result{
Status: proto.Status_ING,
OrderNo: order.GetOrderNo(),
TradeNo: tradeNo,
Message: "成功",
Data: nil,
Extra: nil,
},
}
}
func queryReq(order *proto.QueryRequest_Order) (*cashcoupons.QueryCouponRequest, error) {
type Extra struct {
Appid string `json:"app_id"`
}
var extra Extra
if order.Extra != nil {
@ -34,32 +73,26 @@ func orderReq(order *proto.OrderRequest_Order, product *proto.OrderRequest_Produ
return nil, fmt.Errorf("order extra json unmarshal error: %v", err)
}
}
return nil, nil
return &cashcoupons.QueryCouponRequest{
CouponId: core.String(order.TradeNo),
Appid: core.String(extra.Appid),
Openid: core.String(order.Account),
}, nil
}
func orderResp(request *proto.OrderRequest) *proto.OrderResponse {
return nil
func queryResp(request *proto.QueryRequest, resp *cashcoupons.Coupon) *proto.QueryResponse {
data, _ := resp.MarshalJSON()
status := vo.QueryStatus(*resp.Status)
return &proto.QueryResponse{
Result: &proto.Result{
Status: status.GetOrderStatus(),
OrderNo: request.Order.GetOrderNo(),
TradeNo: request.Order.TradeNo,
Message: status.GetText(),
Data: data,
Extra: nil,
},
}
func queryReq(in *proto.QueryRequest_Order) (*types.Nil, error) {
type Extra struct {
LogonId string `json:"logon_id"`
PhoneId string `json:"phone_id"`
ActivityID string `json:"activity_id"`
}
var extra Extra
if in.Extra != nil {
err := json.Unmarshal(in.Extra, &extra)
if err != nil {
return nil, fmt.Errorf("order extra json unmarshal error: %v", err)
}
}
return nil, nil
}
func queryResp(request *proto.QueryRequest) *proto.QueryResponse {
return nil
}
func notifyReq(in *proto.NotifyRequest) *types.Nil {
@ -67,5 +100,10 @@ func notifyReq(in *proto.NotifyRequest) *types.Nil {
}
func notifyResp() *proto.NotifyResponse {
return nil
return &proto.NotifyResponse{
Result: &proto.Result{
Status: proto.Status_ING,
Extra: nil,
},
}
}

26
plugins/weixin_cpn/internal/util.go Normal file
View File

@ -0,0 +1,26 @@
package internal
import (
"context"
"fmt"
"github.com/wechatpay-apiv3/wechatpay-go/core"
"github.com/wechatpay-apiv3/wechatpay-go/core/option"
"github.com/wechatpay-apiv3/wechatpay-go/services/cashcoupons"
"github.com/wechatpay-apiv3/wechatpay-go/utils"
)
func apiSrv(ctx context.Context, config *Config) (*cashcoupons.CouponApiService, error) {
mchPrivateKey, err := utils.LoadPrivateKeyWithPath(config.PrivateKeyPath)
if err != nil {
return nil, fmt.Errorf("load merchant private key error:%v", err)
}
opts := []core.ClientOption{
option.WithWechatPayAutoAuthCipher(config.MchID, config.MchCertificateSerialNumber, mchPrivateKey, config.MchAPIv3Key),
}
client, err := core.NewClient(ctx, opts...)
if err != nil {
return nil, fmt.Errorf("new wechat pay client err:%v", err)
}
svc := cashcoupons.CouponApiService{Client: client}
return &svc, err
}

8
plugins/weixin_cpn/internal/vo/code.go
View File

@ -1,9 +1,9 @@
package vo
type Code string
type Code int
const CodeSuccess Code = "10000"
const CodeSuccess Code = 200
func (c Code) IsSuccess() bool {
return c == CodeSuccess
func (c Code) Value() int {
return int(c)
}

8
plugins/weixin_cpn/internal/vo/constant.go
View File

@ -1,8 +0,0 @@
package vo
const (
Version = "1.0"
Format = "json"
SignType = "RSA2"
Charset = "UTF-8"
)

21
plugins/weixin_cpn/internal/vo/query_status.go
View File

@ -5,24 +5,21 @@ import "codeup.aliyun.com/6552e56cc3b2728a4557fc18/plugin/proto"
type QueryStatus string
const (
QueryStatusInit = "INIT"
QueryStatusSuccess = "SUCCESS"
QueryStatusFailed = "FAILED"
QueryStatusPending = "PENDING"
QueryStatusAvailable = "SENDED"
QueryStatusUsed = "USED"
QueryStatusExpired = "EXPIRED"
)
var queryStatusTextMap = map[QueryStatus]string{
QueryStatusInit: "初始化(表示还没有完成发放)",
QueryStatusSuccess: "成功(表示发放完成)",
QueryStatusFailed: "失败(表示发放失败)",
QueryStatusPending: "挂起(表示活动流水发放出现可重试异常会重试，如果达到最大重试次数后，依然没有成功的状态)",
QueryStatusAvailable: "可用",
QueryStatusUsed: "已实扣",
QueryStatusExpired: "已过期",
}
var queryStatusMap = map[QueryStatus]proto.Status{
QueryStatusInit: proto.Status_ING,
QueryStatusSuccess: proto.Status_SUCCESS,
QueryStatusFailed: proto.Status_FAIL,
QueryStatusPending: proto.Status_FAIL,
QueryStatusAvailable: proto.Status_SUCCESS,
QueryStatusUsed: proto.Status_WRITE_OFF,
QueryStatusExpired: proto.Status_OVERDUE,
}
func (o QueryStatus) GetText() string {

46
plugins/weixin_cpn/internal/weixin_cpn.go
View File

@ -3,6 +3,7 @@ package internal
import (
"codeup.aliyun.com/6552e56cc3b2728a4557fc18/plugin/proto"
"context"
"plugins/weixin_cpn/internal/vo"
)
// 插件通信信息,若不对应则会报错panic
@ -13,18 +14,51 @@ const (
CookieValue = "wx_pay_cpn"
)
type WeiXinCpnService struct {
AppId string
}
type WeiXinCpnService struct{}
func (p *WeiXinCpnService) Order(ctx context.Context, request *proto.OrderRequest) (*proto.OrderResponse, error) {
return nil, nil
config, err := transConfig(request.Config)
if err != nil {
return nil, err
}
svc, err := apiSrv(ctx, config)
if err != nil {
return nil, err
}
req, err := orderReq(request.GetOrder(), request.GetProduct())
if err != nil {
return nil, err
}
resp, result, err := svc.SendCoupon(ctx, req)
if err != nil {
return nil, err
}
if result.Response.StatusCode != vo.CodeSuccess.Value() {
return nil, err
}
return orderResp(request.GetOrder(), *resp.CouponId), nil
}
func (p *WeiXinCpnService) Query(ctx context.Context, request *proto.QueryRequest) (*proto.QueryResponse, error) {
return nil, nil
config, err := transConfig(request.Config)
svc, err := apiSrv(ctx, config)
if err != nil {
return nil, err
}
req, err := queryReq(request.GetOrder())
if err != nil {
return nil, err
}
resp, result, err := svc.QueryCoupon(ctx, *req)
if err != nil {
return nil, err
}
if result.Response.StatusCode != vo.CodeSuccess.Value() {
return nil, err
}
return queryResp(request, resp), nil
}
func (p *WeiXinCpnService) Notify(_ context.Context, request *proto.NotifyRequest) (*proto.NotifyResponse, error) {
return nil, nil
return notifyResp(), nil
}

21
plugins/weixin_cpn/internal/weixin_cpn_test.go
View File

@ -13,9 +13,10 @@ var server = &WeiXinCpnService{}
func config() []byte {
c := &Config{
AppId: "2021004125622196",
Prk: "",
Npk: "",
MchID: "1605446142",
MchCertificateSerialNumber: "4D081089DEB385316CBDCB55C070287E4920AC76",
MchAPIv3Key: "ChengDuLanSeXiongDi1234567890123",
PrivateKeyPath: "/Users/lsxd/code/go/other/mq/wx/wechat_private_key.pem",
}
marshal, _ := json.Marshal(c)
return marshal
@ -26,8 +27,8 @@ func TestOrder(t *testing.T) {
Config: config(),
Order: &proto.OrderRequest_Order{
OrderNo: "240403164049635931",
Account: "",
Extra: []byte(`{"logon_id":"13100720242"}`),
Account: "oO3vO5AxRWgTjmMD38FTvnB5Rq6o",
Extra: []byte(`{"app_id":"13100720242", "stock_creator_mchid":"stock_creator_mchid"}`),
},
Product: &proto.OrderRequest_Product{
ProductNo: "3102024032977191",
@ -49,10 +50,10 @@ func TestQuery(t *testing.T) {
request := &proto.QueryRequest{
Config: config(),
Order: &proto.QueryRequest_Order{
OrderNo: "240403180614988314_80",
TradeNo: "",
Account: "",
Extra: []byte(`{"phone_id":"","logon_id":"13691105465","activity_id":"ACT873CCV02108400"}`),
OrderNo: "",
TradeNo: "69445765514",
Account: "oO3vO5AxRWgTjmMD38FTvnB5Rq6o",
Extra: []byte(`{"app_id":"wx9ed74283ad25bca1"}`),
},
}
t.Run("TestQuery", func(t *testing.T) {
@ -62,7 +63,7 @@ func TestQuery(t *testing.T) {
return
}
fmt.Printf("%+v \n", got)
assert.Equal(t, int(proto.Status_SUCCESS), int(got.Result.Status))
//assert.Equal(t, int(proto.Status_SUCCESS), int(got.Result.Status))
})
}