diff --git a/cmd/server/wire.go b/cmd/server/wire.go index 1a78891..5c592b1 100644 --- a/cmd/server/wire.go +++ b/cmd/server/wire.go @@ -10,6 +10,7 @@ import ( "github.com/go-kratos/kratos/v2/log" "github.com/google/wire" "voucher/internal/biz" + "voucher/internal/biz/cmb" "voucher/internal/conf" "voucher/internal/data" "voucher/internal/data/mixrepoimpl" @@ -26,6 +27,7 @@ func wireApp(*conf.Bootstrap, log.Logger, *log2.AccessLogger) (*kratos.App, func panic(wire.Build( server.ProviderSetServer, service.ProviderSetService, + cmb.ProviderSetCmb, biz.ProviderSetBiz, data.ProviderDataSet, repoimpl.ProviderRepoImplSet, diff --git a/cmd/server/wire_gen.go b/cmd/server/wire_gen.go index 0d70abb..44d2ed9 100644 --- a/cmd/server/wire_gen.go +++ b/cmd/server/wire_gen.go @@ -9,7 +9,7 @@ package main import ( "github.com/go-kratos/kratos/v2" "github.com/go-kratos/kratos/v2/log" - "voucher/internal/biz" + "voucher/internal/biz/cmb" "voucher/internal/conf" "voucher/internal/data" "voucher/internal/data/mixrepoimpl" @@ -48,7 +48,7 @@ func wireApp(bootstrap *conf.Bootstrap, logger log.Logger, accessLogger *log2.Ac return nil, nil, err } generateMixRepo := mixrepoimpl.NewGenerateMixRepoImpl(rdb) - voucherBiz := biz.NewVoucherBiz(rdb, orderRepo, thirdMQSend, wechatCpnRepo, generateMixRepo) + voucherBiz := cmb.NewCmb(rdb, orderRepo, thirdMQSend, wechatCpnRepo, generateMixRepo) voucherService := service.NewVoucherService(bootstrap, voucherBiz) httpServer := server.NewHTTPServer(bootstrap, helper, accessLogger, voucherService) consumer := server.NewConsumer(helper, bootstrap, voucherService) diff --git a/internal/biz/cmb/cmb.go b/internal/biz/cmb/cmb.go index 08cceb5..f6a30e1 100644 --- a/internal/biz/cmb/cmb.go +++ b/internal/biz/cmb/cmb.go @@ -1 +1,36 @@ package cmb + +import ( + "voucher/internal/biz/mixrepos" + "voucher/internal/biz/repo" + "voucher/internal/biz/thirdrepo" + "voucher/internal/biz/wechatrepo" + "voucher/internal/data" +) + +type Cmb struct { + rdb *data.Rdb + OrderRepo repo.OrderRepo + ProductRepo repo.ProductRepo + ThirdMQSend thirdrepo.ThirdMQSend + WechatCpnRepo wechatrepo.WechatCpnRepo + GenerateMixRepo mixrepos.GenerateMixRepo +} + +func NewCmb( + rdb *data.Rdb, + orderRepo repo.OrderRepo, + ProductRepo repo.ProductRepo, + thirdMQSend thirdrepo.ThirdMQSend, + WechatCpnRepo wechatrepo.WechatCpnRepo, + GenerateMixRepo mixrepos.GenerateMixRepo, +) *Cmb { + return &Cmb{ + rdb: rdb, + OrderRepo: orderRepo, + ProductRepo: ProductRepo, + ThirdMQSend: thirdMQSend, + WechatCpnRepo: WechatCpnRepo, + GenerateMixRepo: GenerateMixRepo, + } +} diff --git a/internal/biz/cmb/consume.go b/internal/biz/cmb/consume.go new file mode 100644 index 0000000..6c2c5d0 --- /dev/null +++ b/internal/biz/cmb/consume.go @@ -0,0 +1,17 @@ +package cmb + +import ( + "context" +) + +func (v *Cmb) OrderConsume(ctx context.Context, orderNo string) (err error) { + return +} + +func (v *Cmb) QueryConsume(ctx context.Context, orderNo string) (err error) { + return +} + +func (v *Cmb) NotifyConsume(ctx context.Context, orderNo string) (err error) { + return +} diff --git a/internal/biz/cmb/provider_set.go b/internal/biz/cmb/provider_set.go new file mode 100644 index 0000000..e22c1d4 --- /dev/null +++ b/internal/biz/cmb/provider_set.go @@ -0,0 +1,8 @@ +package cmb + +import ( + "github.com/google/wire" +) + +// ProviderSetCmb is biz providers. +var ProviderSetCmb = wire.NewSet(NewCmb) diff --git a/internal/biz/cmb.go b/internal/biz/cmb/voucher.go similarity index 80% rename from internal/biz/cmb.go rename to internal/biz/cmb/voucher.go index 43d4963..d4dfac8 100644 --- a/internal/biz/cmb.go +++ b/internal/biz/cmb/voucher.go @@ -1,4 +1,4 @@ -package biz +package cmb import ( "context" @@ -12,7 +12,7 @@ import ( "voucher/internal/pkg/uid" ) -func (v *VoucherBiz) CmbOrder(ctx context.Context, req *bo.OrderCreateReqBo) (reps *bo.OrderCreateRepBo, err error) { +func (v *Cmb) CmbOrder(ctx context.Context, req *bo.OrderCreateReqBo) (reps *bo.OrderCreateRepBo, err error) { err = lock.NewMutex(v.rdb.Rdb, time.Second*30).Lock(ctx, fmt.Sprintf("cmb_order_%s", req.OutBizNo), func(ctx context.Context) error { @@ -63,7 +63,7 @@ func (v *VoucherBiz) CmbOrder(ctx context.Context, req *bo.OrderCreateReqBo) (re return } -func (v *VoucherBiz) CmbQuery(ctx context.Context, req *bo.OrderCreateReqBo) (reps *bo.OrderCreateRepBo, err error) { +func (v *Cmb) CmbQuery(ctx context.Context, req *bo.OrderCreateReqBo) (reps *bo.OrderCreateRepBo, err error) { err = lock.NewMutex(v.rdb.Rdb, time.Second*30).Lock(ctx, fmt.Sprintf("cmb_order_%s", req.OutBizNo), func(ctx context.Context) error { @@ -73,6 +73,6 @@ func (v *VoucherBiz) CmbQuery(ctx context.Context, req *bo.OrderCreateReqBo) (re return } -func (v *VoucherBiz) CmbNotify(ctx context.Context, order *bo.OrderBo) (err error) { +func (v *Cmb) CmbNotify(ctx context.Context, order *bo.OrderBo) (err error) { return } diff --git a/internal/biz/consume/consume.go b/internal/biz/consume/consume.go deleted file mode 100644 index ff269c4..0000000 --- a/internal/biz/consume/consume.go +++ /dev/null @@ -1 +0,0 @@ -package consume diff --git a/internal/biz/consume/notify.go b/internal/biz/consume/notify.go deleted file mode 100644 index ff269c4..0000000 --- a/internal/biz/consume/notify.go +++ /dev/null @@ -1 +0,0 @@ -package consume diff --git a/internal/biz/consume/order.go b/internal/biz/consume/order.go deleted file mode 100644 index ff269c4..0000000 --- a/internal/biz/consume/order.go +++ /dev/null @@ -1 +0,0 @@ -package consume diff --git a/internal/biz/consume/query.go b/internal/biz/consume/query.go deleted file mode 100644 index ff269c4..0000000 --- a/internal/biz/consume/query.go +++ /dev/null @@ -1 +0,0 @@ -package consume diff --git a/internal/biz/voucher.go b/internal/biz/voucher.go index eea847f..853ce70 100644 --- a/internal/biz/voucher.go +++ b/internal/biz/voucher.go @@ -1,36 +1,21 @@ package biz import ( - "voucher/internal/biz/mixrepos" - "voucher/internal/biz/repo" - "voucher/internal/biz/thirdrepo" - "voucher/internal/biz/wechatrepo" + "voucher/internal/biz/cmb" "voucher/internal/data" ) type VoucherBiz struct { - rdb *data.Rdb - OrderRepo repo.OrderRepo - ProductRepo repo.ProductRepo - ThirdMQSend thirdrepo.ThirdMQSend - WechatCpnRepo wechatrepo.WechatCpnRepo - GenerateMixRepo mixrepos.GenerateMixRepo + rdb *data.Rdb + Cmb *cmb.Cmb } func NewVoucherBiz( rdb *data.Rdb, - orderRepo repo.OrderRepo, - ProductRepo repo.ProductRepo, - thirdMQSend thirdrepo.ThirdMQSend, - WechatCpnRepo wechatrepo.WechatCpnRepo, - GenerateMixRepo mixrepos.GenerateMixRepo, + Cmb *cmb.Cmb, ) *VoucherBiz { return &VoucherBiz{ - rdb: rdb, - OrderRepo: orderRepo, - ProductRepo: ProductRepo, - ThirdMQSend: thirdMQSend, - WechatCpnRepo: WechatCpnRepo, - GenerateMixRepo: GenerateMixRepo, + rdb: rdb, + Cmb: Cmb, } }