From fcea60ddee18c23463205d257284becbcbbb1070 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=AD=90=E9=93=AD?= Date: Sat, 8 Mar 2025 14:37:04 +0800 Subject: [PATCH] cmb --- internal/biz/cmb/consume.go | 2 ++ internal/biz/mixrepos/cmb.go | 11 ++++++++++- internal/data/mixrepoimpl/cmb.go | 4 ++-- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/internal/biz/cmb/consume.go b/internal/biz/cmb/consume.go index 95c724d..f5f6c4b 100644 --- a/internal/biz/cmb/consume.go +++ b/internal/biz/cmb/consume.go @@ -5,6 +5,7 @@ import ( "encoding/json" "errors" "fmt" + "github.com/go-kratos/kratos/v2/log" "github.com/redis/go-redis/v9" "gorm.io/gorm" "time" @@ -250,6 +251,7 @@ func (v *Cmb) NotifyConsume(ctx context.Context, order *bo.OrderBo, orderOutRequ bizStr, err := v.CmbMixRepo.VerifyResponse(ctx, x) if err != nil { + log.Errorf("NotifyConsume CmbMixRepo.VerifyResponse error:%s", err.Error()) return v.OrderNotifyRepo.Fail(ctx, orderNotify.ID, err.Error()) } diff --git a/internal/biz/mixrepos/cmb.go b/internal/biz/mixrepos/cmb.go index 719c92e..e1ba2f4 100644 --- a/internal/biz/mixrepos/cmb.go +++ b/internal/biz/mixrepos/cmb.go @@ -7,13 +7,22 @@ import ( ) type CmbMixRepo interface { - VerifyResponse(ctx context.Context, req *v1.CmbReply) (string, error) + // OrderVerify cmb 券订单参数验证 OrderVerify(ctx context.Context, req *v1.CmbRequest) (*v1.CmbOrderRequest, error) + // QueryVerify cmb 券订单参数验证 QueryVerify(ctx context.Context, req *v1.CmbRequest) (*v1.CmbQueryRequest, error) + // ProductQueryVerify cmb 券产品查询参数验证 ProductQueryVerify(ctx context.Context, req *v1.CmbRequest) (*v1.CmbQueryProductRequest, error) + // GetMockRequest cmb 券参数mock构建 GetMockRequest(ctx context.Context, bizContent string) (*v1.CmbRequest, error) + // GetRequest 我们请求cmb参数构建处理 GetRequest(_ context.Context, reqBo *bo.CmbRequestBo) (*v1.CmbRequest, error) + // GetResponse cmb 请求我们响应返回结果处理 GetResponse(ctx context.Context, reqBo *bo.CmbResponseBo) (*v1.CmbReply, error) + // VerifyResponse cmb 请求响应返回结果验证 + VerifyResponse(ctx context.Context, req *v1.CmbReply) (string, error) + // Request cmb 请求 Request(ctx context.Context, req *v1.CmbRequest, uri string) (*v1.CmbReply, error) + // Decrypt cmb 业务参数 解密 Decrypt(_ context.Context, encryptBody string) (string, error) } diff --git a/internal/data/mixrepoimpl/cmb.go b/internal/data/mixrepoimpl/cmb.go index ced0d96..ff1d0f4 100644 --- a/internal/data/mixrepoimpl/cmb.go +++ b/internal/data/mixrepoimpl/cmb.go @@ -89,7 +89,7 @@ func (s *CmbMixRepoImpl) Verify(_ context.Context, req *v1.CmbRequest) (string, func (s *CmbMixRepoImpl) GetRequest(_ context.Context, reqBo *bo.CmbRequestBo) (*v1.CmbRequest, error) { - encryptBody, err := cmb.Encrypt(s.bc.Cmb.Sm2Puk, reqBo.BizContent) + encryptBody, err := cmb.Encrypt(s.bc.Cmb.CmbSm2Puk, reqBo.BizContent) if err != nil { return nil, err } @@ -107,7 +107,7 @@ func (s *CmbMixRepoImpl) GetRequest(_ context.Context, reqBo *bo.CmbRequestBo) ( str := fmt.Sprintf("%s?%s", reqBo.FuncName, cmb.SortStructStr(req)) - sing, err := cmb.Sign(s.bc.Cmb.CmbSm2Pik, str) + sing, err := cmb.Sign(s.bc.Cmb.Sm2Prk, str) if err != nil { return nil, err }