liucaijun
/
voucher
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cmb

This commit is contained in:
李子铭 2025-03-06 17:29:57 +08:00
parent 1800084933
commit 159fece2dd
6 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
internal/biz/cmb/consume.go
View File

@ -107,6 +107,7 @@ func (v *Cmb) NotifyConsume(ctx context.Context, order *bo.OrderBo, orderOutRequ
if err != nil { if err != nil {
return err return err
} }
req := &v1.CmbNotifyRequest{ req := &v1.CmbNotifyRequest{
Ticket: orderWechat.OrderNo, Ticket: orderWechat.OrderNo,
Status: status.GetValue(), Status: status.GetValue(),
@ -119,7 +120,7 @@ func (v *Cmb) NotifyConsume(ctx context.Context, order *bo.OrderBo, orderOutRequ
return err return err
} }
request, err := v.CmbMixRepo.GetCmbRequest(ctx, &bo.CmbRequestBo{ request, err := v.CmbMixRepo.GetRequest(ctx, &bo.CmbRequestBo{
FuncName: vo.CmbNotifyFuncName, FuncName: vo.CmbNotifyFuncName,
BizContent: string(bizJsonBytes), BizContent: string(bizJsonBytes),
}) })

9
internal/biz/mixrepos/cmb.go
View File

@ -4,13 +4,12 @@ import (
"context" "context"
v1 "voucher/api/v1" v1 "voucher/api/v1"
"voucher/internal/biz/bo" "voucher/internal/biz/bo"
"voucher/internal/biz/vo"
) )
type CmbMixRepo interface { type CmbMixRepo interface {
OrderVerify(ctx context.Context, req *v1.CmbRequest, funcName vo.CmbFuncName) (*v1.CmbOrderRequest, error) OrderVerify(ctx context.Context, req *v1.CmbRequest) (*v1.CmbOrderRequest, error)
ProductQueryVerify(ctx context.Context, req *v1.CmbRequest, funcName vo.CmbFuncName) (*v1.CmbQueryProductRequest, error) ProductQueryVerify(ctx context.Context, req *v1.CmbRequest) (*v1.CmbQueryProductRequest, error)
GetRequest(ctx context.Context, bizContent string) (*v1.CmbRequest, error) GetMockRequest(ctx context.Context, bizContent string) (*v1.CmbRequest, error)
GetCmbRequest(_ context.Context, reqBo *bo.CmbRequestBo) (*v1.CmbRequest, error) GetRequest(_ context.Context, reqBo *bo.CmbRequestBo) (*v1.CmbRequest, error)
GetResponse(ctx context.Context, reqBo *bo.CmbResponseBo) (*v1.CmbReply, error) GetResponse(ctx context.Context, reqBo *bo.CmbResponseBo) (*v1.CmbReply, error)
} }

5
internal/biz/vo/cmb.go
View File

@ -4,9 +4,8 @@ package vo
type CmbFuncName string type CmbFuncName string
const ( const (
CmbOrderFuncName CmbFuncName = "/voucher/cmb/v1/order" // CmbNotifyFuncName . 券状态回调通知方法
CmbProductQueryFuncName CmbFuncName = "/voucher/cmb/v1/product/query" CmbNotifyFuncName CmbFuncName = "updateCodeStatus.json"
CmbNotifyFuncName CmbFuncName = "updateCodeStatus.json"
) )
func (s CmbFuncName) GetValue() string { func (s CmbFuncName) GetValue() string {

15
internal/data/mixrepoimpl/cmb.go
View File

@ -9,7 +9,6 @@ import (
v1 "voucher/api/v1" v1 "voucher/api/v1"
"voucher/internal/biz/bo" "voucher/internal/biz/bo"
"voucher/internal/biz/mixrepos" "voucher/internal/biz/mixrepos"
"voucher/internal/biz/vo"
"voucher/internal/conf" "voucher/internal/conf"
"voucher/internal/pkg/cmb" "voucher/internal/pkg/cmb"
) )
@ -22,8 +21,8 @@ func NewCmbMixRepoImpl(bc *conf.Bootstrap) mixrepos.CmbMixRepo {
return &CmbMixRepoImpl{bc: bc} return &CmbMixRepoImpl{bc: bc}
} }
func (s *CmbMixRepoImpl) OrderVerify(ctx context.Context, req *v1.CmbRequest, funcName vo.CmbFuncName) (*v1.CmbOrderRequest, error) { func (s *CmbMixRepoImpl) OrderVerify(ctx context.Context, req *v1.CmbRequest) (*v1.CmbOrderRequest, error) {
bizStr, err := s.Verify(ctx, req, funcName) bizStr, err := s.Verify(ctx, req)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -36,8 +35,8 @@ func (s *CmbMixRepoImpl) OrderVerify(ctx context.Context, req *v1.CmbRequest, fu
return resp, nil return resp, nil
} }
func (s *CmbMixRepoImpl) ProductQueryVerify(ctx context.Context, req *v1.CmbRequest, funcName vo.CmbFuncName) (*v1.CmbQueryProductRequest, error) { func (s *CmbMixRepoImpl) ProductQueryVerify(ctx context.Context, req *v1.CmbRequest) (*v1.CmbQueryProductRequest, error) {
bizStr, err := s.Verify(ctx, req, funcName) bizStr, err := s.Verify(ctx, req)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -50,7 +49,7 @@ func (s *CmbMixRepoImpl) ProductQueryVerify(ctx context.Context, req *v1.CmbRequ
return resp, nil return resp, nil
} }
func (s *CmbMixRepoImpl) Verify(_ context.Context, req *v1.CmbRequest, funcName vo.CmbFuncName) (string, error) { func (s *CmbMixRepoImpl) Verify(_ context.Context, req *v1.CmbRequest) (string, error) {
str := cmb.SortStructStr(req) str := cmb.SortStructStr(req)
b, err := cmb.Verify(s.bc.Cmb.CmbSm2Puk, str, req.Sign) b, err := cmb.Verify(s.bc.Cmb.CmbSm2Puk, str, req.Sign)
@ -70,7 +69,7 @@ func (s *CmbMixRepoImpl) Verify(_ context.Context, req *v1.CmbRequest, funcName
return bizStr, nil return bizStr, nil
} }
func (s *CmbMixRepoImpl) GetCmbRequest(_ context.Context, reqBo *bo.CmbRequestBo) (*v1.CmbRequest, error) { 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.Sm2Puk, reqBo.BizContent)
if err != nil { if err != nil {
@ -100,7 +99,7 @@ func (s *CmbMixRepoImpl) GetCmbRequest(_ context.Context, reqBo *bo.CmbRequestBo
return req, nil return req, nil
} }
func (s *CmbMixRepoImpl) GetRequest(_ context.Context, bizContent string) (*v1.CmbRequest, error) { func (s *CmbMixRepoImpl) GetMockRequest(_ context.Context, bizContent string) (*v1.CmbRequest, error) {
encryptBody, err := cmb.Encrypt(s.bc.Cmb.Sm2Puk, bizContent) encryptBody, err := cmb.Encrypt(s.bc.Cmb.Sm2Puk, bizContent)
if err != nil { if err != nil {

4
internal/service/cmb.go
View File

@ -51,7 +51,7 @@ func (s *VoucherService) cmbOrder(ctx http.Context) (*v1.CmbOrderReply, error) {
return nil, err return nil, err
} }
bizContent, err := s.CmbMixRepo.OrderVerify(ctx, req, vo.CmbOrderFuncName) bizContent, err := s.CmbMixRepo.OrderVerify(ctx, req)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -116,7 +116,7 @@ func (s *VoucherService) cmbProductQuery(ctx http.Context) (*v1.CmbQueryProductR
return nil, err return nil, err
} }
bizContent, err := s.CmbMixRepo.ProductQueryVerify(ctx, req, vo.CmbProductQueryFuncName) bizContent, err := s.CmbMixRepo.ProductQueryVerify(ctx, req)
if err != nil { if err != nil {
return nil, err return nil, err
} }

4
internal/service/cmb_mock.go
View File

@ -18,7 +18,7 @@ func (s *VoucherService) CmbOrderMock(ctx http.Context) error {
return err return err
} }
reply, err := s.CmbMixRepo.GetRequest(ctx, string(bizJsonBytes)) reply, err := s.CmbMixRepo.GetMockRequest(ctx, string(bizJsonBytes))
if err != nil { if err != nil {
return err return err
} }
@ -38,7 +38,7 @@ func (s *VoucherService) CmbProductQueryMock(ctx http.Context) error {
return err return err
} }
reply, err := s.CmbMixRepo.GetRequest(ctx, string(bizJsonBytes)) reply, err := s.CmbMixRepo.GetMockRequest(ctx, string(bizJsonBytes))
if err != nil { if err != nil {
return err return err
} }