diff --git a/internal/biz/cmb/consume.go b/internal/biz/cmb/consume.go index 7850c09..a049c25 100644 --- a/internal/biz/cmb/consume.go +++ b/internal/biz/cmb/consume.go @@ -107,6 +107,7 @@ func (v *Cmb) NotifyConsume(ctx context.Context, order *bo.OrderBo, orderOutRequ if err != nil { return err } + req := &v1.CmbNotifyRequest{ Ticket: orderWechat.OrderNo, Status: status.GetValue(), @@ -119,7 +120,7 @@ func (v *Cmb) NotifyConsume(ctx context.Context, order *bo.OrderBo, orderOutRequ return err } - request, err := v.CmbMixRepo.GetCmbRequest(ctx, &bo.CmbRequestBo{ + request, err := v.CmbMixRepo.GetRequest(ctx, &bo.CmbRequestBo{ FuncName: vo.CmbNotifyFuncName, BizContent: string(bizJsonBytes), }) diff --git a/internal/biz/mixrepos/cmb.go b/internal/biz/mixrepos/cmb.go index 87d41cb..b11e786 100644 --- a/internal/biz/mixrepos/cmb.go +++ b/internal/biz/mixrepos/cmb.go @@ -4,13 +4,12 @@ import ( "context" v1 "voucher/api/v1" "voucher/internal/biz/bo" - "voucher/internal/biz/vo" ) type CmbMixRepo interface { - OrderVerify(ctx context.Context, req *v1.CmbRequest, funcName vo.CmbFuncName) (*v1.CmbOrderRequest, error) - ProductQueryVerify(ctx context.Context, req *v1.CmbRequest, funcName vo.CmbFuncName) (*v1.CmbQueryProductRequest, error) - GetRequest(ctx context.Context, bizContent string) (*v1.CmbRequest, error) - GetCmbRequest(_ context.Context, reqBo *bo.CmbRequestBo) (*v1.CmbRequest, error) + OrderVerify(ctx context.Context, req *v1.CmbRequest) (*v1.CmbOrderRequest, error) + ProductQueryVerify(ctx context.Context, req *v1.CmbRequest) (*v1.CmbQueryProductRequest, error) + GetMockRequest(ctx context.Context, bizContent string) (*v1.CmbRequest, error) + GetRequest(_ context.Context, reqBo *bo.CmbRequestBo) (*v1.CmbRequest, error) GetResponse(ctx context.Context, reqBo *bo.CmbResponseBo) (*v1.CmbReply, error) } diff --git a/internal/biz/vo/cmb.go b/internal/biz/vo/cmb.go index 0d50198..08e492b 100644 --- a/internal/biz/vo/cmb.go +++ b/internal/biz/vo/cmb.go @@ -4,9 +4,8 @@ package vo type CmbFuncName string const ( - CmbOrderFuncName CmbFuncName = "/voucher/cmb/v1/order" - CmbProductQueryFuncName CmbFuncName = "/voucher/cmb/v1/product/query" - CmbNotifyFuncName CmbFuncName = "updateCodeStatus.json" + // CmbNotifyFuncName . 券状态回调通知方法 + CmbNotifyFuncName CmbFuncName = "updateCodeStatus.json" ) func (s CmbFuncName) GetValue() string { diff --git a/internal/data/mixrepoimpl/cmb.go b/internal/data/mixrepoimpl/cmb.go index a857c8f..d176226 100644 --- a/internal/data/mixrepoimpl/cmb.go +++ b/internal/data/mixrepoimpl/cmb.go @@ -9,7 +9,6 @@ import ( v1 "voucher/api/v1" "voucher/internal/biz/bo" "voucher/internal/biz/mixrepos" - "voucher/internal/biz/vo" "voucher/internal/conf" "voucher/internal/pkg/cmb" ) @@ -22,8 +21,8 @@ func NewCmbMixRepoImpl(bc *conf.Bootstrap) mixrepos.CmbMixRepo { return &CmbMixRepoImpl{bc: bc} } -func (s *CmbMixRepoImpl) OrderVerify(ctx context.Context, req *v1.CmbRequest, funcName vo.CmbFuncName) (*v1.CmbOrderRequest, error) { - bizStr, err := s.Verify(ctx, req, funcName) +func (s *CmbMixRepoImpl) OrderVerify(ctx context.Context, req *v1.CmbRequest) (*v1.CmbOrderRequest, error) { + bizStr, err := s.Verify(ctx, req) if err != nil { return nil, err } @@ -36,8 +35,8 @@ func (s *CmbMixRepoImpl) OrderVerify(ctx context.Context, req *v1.CmbRequest, fu return resp, nil } -func (s *CmbMixRepoImpl) ProductQueryVerify(ctx context.Context, req *v1.CmbRequest, funcName vo.CmbFuncName) (*v1.CmbQueryProductRequest, error) { - bizStr, err := s.Verify(ctx, req, funcName) +func (s *CmbMixRepoImpl) ProductQueryVerify(ctx context.Context, req *v1.CmbRequest) (*v1.CmbQueryProductRequest, error) { + bizStr, err := s.Verify(ctx, req) if err != nil { return nil, err } @@ -50,7 +49,7 @@ func (s *CmbMixRepoImpl) ProductQueryVerify(ctx context.Context, req *v1.CmbRequ 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) 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 } -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) if err != nil { @@ -100,7 +99,7 @@ func (s *CmbMixRepoImpl) GetCmbRequest(_ context.Context, reqBo *bo.CmbRequestBo 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) if err != nil { diff --git a/internal/service/cmb.go b/internal/service/cmb.go index b4bf641..a4b3f24 100644 --- a/internal/service/cmb.go +++ b/internal/service/cmb.go @@ -51,7 +51,7 @@ func (s *VoucherService) cmbOrder(ctx http.Context) (*v1.CmbOrderReply, error) { return nil, err } - bizContent, err := s.CmbMixRepo.OrderVerify(ctx, req, vo.CmbOrderFuncName) + bizContent, err := s.CmbMixRepo.OrderVerify(ctx, req) if err != nil { return nil, err } @@ -116,7 +116,7 @@ func (s *VoucherService) cmbProductQuery(ctx http.Context) (*v1.CmbQueryProductR return nil, err } - bizContent, err := s.CmbMixRepo.ProductQueryVerify(ctx, req, vo.CmbProductQueryFuncName) + bizContent, err := s.CmbMixRepo.ProductQueryVerify(ctx, req) if err != nil { return nil, err } diff --git a/internal/service/cmb_mock.go b/internal/service/cmb_mock.go index dc82319..e823151 100644 --- a/internal/service/cmb_mock.go +++ b/internal/service/cmb_mock.go @@ -18,7 +18,7 @@ func (s *VoucherService) CmbOrderMock(ctx http.Context) error { return err } - reply, err := s.CmbMixRepo.GetRequest(ctx, string(bizJsonBytes)) + reply, err := s.CmbMixRepo.GetMockRequest(ctx, string(bizJsonBytes)) if err != nil { return err } @@ -38,7 +38,7 @@ func (s *VoucherService) CmbProductQueryMock(ctx http.Context) error { return err } - reply, err := s.CmbMixRepo.GetRequest(ctx, string(bizJsonBytes)) + reply, err := s.CmbMixRepo.GetMockRequest(ctx, string(bizJsonBytes)) if err != nil { return err }