This commit is contained in:
李子铭 2025-03-04 15:55:05 +08:00
parent ec182fabad
commit ce81f41693
3 changed files with 49 additions and 14 deletions

View File

@ -4,31 +4,35 @@ import (
"voucher/internal/biz/mixrepos" "voucher/internal/biz/mixrepos"
"voucher/internal/biz/repo" "voucher/internal/biz/repo"
"voucher/internal/biz/wechatrepo" "voucher/internal/biz/wechatrepo"
"voucher/internal/conf"
"voucher/internal/data" "voucher/internal/data"
) )
type Cmb struct { type Cmb struct {
bc *conf.Bootstrap
rdb *data.Rdb rdb *data.Rdb
OrderRepo repo.OrderRepo OrderRepo repo.OrderRepo
ProductRepo repo.ProductRepo ProductRepo repo.ProductRepo
ThirdMQSend mixrepos.MQSendMixRepo MqSendMixRepo mixrepos.MQSendMixRepo
WechatCpnRepo wechatrepo.WechatCpnRepo WechatCpnRepo wechatrepo.WechatCpnRepo
GenerateMixRepo mixrepos.GenerateMixRepo GenerateMixRepo mixrepos.GenerateMixRepo
} }
func NewCmb( func NewCmb(
bc *conf.Bootstrap,
rdb *data.Rdb, rdb *data.Rdb,
orderRepo repo.OrderRepo, orderRepo repo.OrderRepo,
ProductRepo repo.ProductRepo, ProductRepo repo.ProductRepo,
thirdMQSend mixrepos.MQSendMixRepo, MqSendMixRepo mixrepos.MQSendMixRepo,
WechatCpnRepo wechatrepo.WechatCpnRepo, WechatCpnRepo wechatrepo.WechatCpnRepo,
GenerateMixRepo mixrepos.GenerateMixRepo, GenerateMixRepo mixrepos.GenerateMixRepo,
) *Cmb { ) *Cmb {
return &Cmb{ return &Cmb{
bc: bc,
rdb: rdb, rdb: rdb,
OrderRepo: orderRepo, OrderRepo: orderRepo,
ProductRepo: ProductRepo, ProductRepo: ProductRepo,
ThirdMQSend: thirdMQSend, MqSendMixRepo: MqSendMixRepo,
WechatCpnRepo: WechatCpnRepo, WechatCpnRepo: WechatCpnRepo,
GenerateMixRepo: GenerateMixRepo, GenerateMixRepo: GenerateMixRepo,
} }

View File

@ -2,13 +2,47 @@ package cmb
import ( import (
"context" "context"
"fmt"
"go.opentelemetry.io/otel/trace"
"voucher/internal/biz/bo" "voucher/internal/biz/bo"
"voucher/internal/pkg/mq"
) )
func (v *Cmb) PushOrderMQ(ctx context.Context, orderNo string) error {
eventMap := v.bc.RocketMQ.EventMap["order"]
sendOption := []mq.SendOption{
mq.WithSendShardingKeysOption(fmt.Sprintf("%s", orderNo)),
mq.WithOpenTelemetryOption(trace.SpanFromContext(ctx).SpanContext().TraceID().String()),
}
if err := v.MqSendMixRepo.SendSync(ctx, eventMap.Topic, []byte("{}"), sendOption...); err != nil {
return fmt.Errorf("收单成功,消费队列投递失败[%v]", err)
}
return nil
}
func (v *Cmb) OrderConsume(ctx context.Context, order *bo.OrderBo) (err error) { func (v *Cmb) OrderConsume(ctx context.Context, order *bo.OrderBo) (err error) {
return return
} }
func (v *Cmb) PushQueryDelayMQ(ctx context.Context, orderNo string) error {
eventMap := v.bc.RocketMQ.EventMap["query"]
sendOption := []mq.SendOption{
mq.WithSendShardingKeysOption(orderNo),
mq.WithOpenTelemetryOption(trace.SpanFromContext(ctx).SpanContext().TraceID().String()),
mq.WithSendDelayLevelOption(300),
}
if err := v.MqSendMixRepo.SendSync(ctx, eventMap.Topic, []byte("{}"), sendOption...); err != nil {
return fmt.Errorf("查询入队投递失败[%v]", err)
}
return nil
}
func (v *Cmb) QueryConsume(ctx context.Context, order *bo.OrderBo) (err error) { func (v *Cmb) QueryConsume(ctx context.Context, order *bo.OrderBo) (err error) {
return return
} }

View File

@ -49,16 +49,13 @@ func (v *Cmb) order(ctx context.Context, req *bo.OrderCreateReqBo) (orderNo stri
} }
o := &bo.OrderBo{ o := &bo.OrderBo{
OrderNo: orderNo, OrderNo: orderNo,
OutBizNo: req.OutBizNo,
OutBizNo: req.OutBizNo, ProductNo: req.ProductNo,
ProductNo: req.ProductNo, Account: req.Account,
Account: req.Account, AppID: product.AppID,
MerchantNo: product.MerchantNo,
AppID: product.AppID, Channel: product.Channel,
MerchantNo: product.MerchantNo,
Channel: product.Channel,
AccountType: vo.OrderAccountTypeOpenId, AccountType: vo.OrderAccountTypeOpenId,
Type: vo.OrderTypeCmb, Type: vo.OrderTypeCmb,
Status: vo.OrderStatusWait, Status: vo.OrderStatusWait,
@ -69,7 +66,7 @@ func (v *Cmb) order(ctx context.Context, req *bo.OrderCreateReqBo) (orderNo stri
return return
} }
//v.ThirdMQSend err = v.PushOrderMQ(ctx, orderNo)
return return
} }