From 9fc1ab9c8240c5438a80797cc6203ddd5fc9c54a Mon Sep 17 00:00:00 2001 From: ziming Date: Thu, 5 Mar 2026 14:14:58 +0800 Subject: [PATCH] query order notify --- internal/biz/do/rds_mq.go | 12 + internal/biz/order_notify_retry.go | 10 + internal/biz/repo/order.go | 1 + internal/biz/repo/orderBak.go | 10 - internal/biz/repo/order_bak.go | 17 ++ internal/biz/timeslicequery/base.go | 7 +- internal/biz/timeslicequery/query.go | 20 +- internal/biz/timeslicequery/query_bak.go | 62 +++++ .../biz/timeslicequery/retry_query_notice.go | 246 ++++++++++++++++++ internal/data/repoimpl/order.go | 55 ++++ internal/data/repoimpl/order_bak.go | 145 +++++++++++ internal/server/http.go | 1 + internal/server/rds_consume.go | 4 + internal/service/script.go | 19 ++ internal/service/wechat_query.go | 27 ++ test/coupon.go | 6 +- 16 files changed, 625 insertions(+), 17 deletions(-) delete mode 100644 internal/biz/repo/orderBak.go create mode 100644 internal/biz/repo/order_bak.go create mode 100644 internal/biz/timeslicequery/query_bak.go create mode 100644 internal/biz/timeslicequery/retry_query_notice.go diff --git a/internal/biz/do/rds_mq.go b/internal/biz/do/rds_mq.go index 3009437..4a587fc 100644 --- a/internal/biz/do/rds_mq.go +++ b/internal/biz/do/rds_mq.go @@ -33,3 +33,15 @@ type WechatUsedQuery struct { StartTime string `json:"start_time"` EndTime string `json:"end_time"` } + +type RetryQueryNotice struct { + ProductNo string `json:"product_no"` + + ReceiveSuccessStartTime string `json:"receive_success_start_time"` + ReceiveSuccessEndTime string `json:"receive_success_end_time"` + + OrderNos []string `json:"order_nos"` + BatchNos []string `json:"batch_nos"` + OutBizNos []string `json:"out_biz_nos"` + VoucherNos []string `json:"voucher_nos"` +} diff --git a/internal/biz/order_notify_retry.go b/internal/biz/order_notify_retry.go index b7af66c..ce8b8c2 100644 --- a/internal/biz/order_notify_retry.go +++ b/internal/biz/order_notify_retry.go @@ -9,6 +9,16 @@ import ( "voucher/internal/biz/do" ) +func (this *VoucherBiz) PushRetryOrderNotice(ctx http.Context, bodyBytes []byte) error { + + _, err := this.rdb.Rdb.RPush(ctx, "retryQueryNotice", string(bodyBytes)).Result() + if err != nil { + return fmt.Errorf("添加到队列失败:%v", err) + } + + return nil +} + func (this *VoucherBiz) PushOrderNotifyRetry(ctx http.Context, req *do.OrderNotifyRetry) error { queue := this.bc.RdsMQ.GetOrderNotifyRetry() diff --git a/internal/biz/repo/order.go b/internal/biz/repo/order.go index b0e26f4..633ff9a 100644 --- a/internal/biz/repo/order.go +++ b/internal/biz/repo/order.go @@ -15,6 +15,7 @@ type OrderRepo interface { FinFailByStockIdInBatches(ctx context.Context, batchNo string, fun func(ctx context.Context, rows []*bo.OrderBo) error) error FindIngInBatches(ctx context.Context, fun func(ctx context.Context, rows []*bo.OrderBo) error) error FindInBatches(ctx context.Context, w *bo.FindInBatchesUseBo, fun func(ctx context.Context, rows []*bo.OrderBo) error) error + FindRetryQuery(ctx context.Context, req *do.RetryQueryNotice, fun func(ctx context.Context, rows []*bo.OrderBo) error) error GetByOutBizNo(ctx context.Context, t vo.OrderType, outBizNo string) (*bo.OrderBo, error) GetByOrderNo(ctx context.Context, orderNo string) (*bo.OrderBo, error) GetByCouponId(ctx context.Context, merchantNo, batchNo, voucherNo string) (*bo.OrderBo, error) diff --git a/internal/biz/repo/orderBak.go b/internal/biz/repo/orderBak.go deleted file mode 100644 index 2c60b03..0000000 --- a/internal/biz/repo/orderBak.go +++ /dev/null @@ -1,10 +0,0 @@ -package repo - -import ( - "context" - "voucher/internal/biz/bo" -) - -type OrderBakRepo interface { - SpecifyFindInBatches(ctx context.Context, w *bo.FindInBatchesBo, fun func(ctx context.Context, rows []*bo.OrderBo) error) error -} diff --git a/internal/biz/repo/order_bak.go b/internal/biz/repo/order_bak.go new file mode 100644 index 0000000..18ed531 --- /dev/null +++ b/internal/biz/repo/order_bak.go @@ -0,0 +1,17 @@ +package repo + +import ( + "context" + "voucher/internal/biz/bo" + "voucher/internal/biz/do" +) + +type OrderBakRepo interface { + SpecifyFindInBatches(ctx context.Context, w *bo.FindInBatchesBo, fun func(ctx context.Context, rows []*bo.OrderBo) error) error + FindRetryQuery(ctx context.Context, req *do.RetryQueryNotice, fun func(ctx context.Context, rows []*bo.OrderBo) error) error + GetByID(ctx context.Context, id uint64) (*bo.OrderBo, error) + + Used(ctx context.Context, id uint64) error + Available(ctx context.Context, id uint64) error + Expired(ctx context.Context, id uint64) error +} diff --git a/internal/biz/timeslicequery/base.go b/internal/biz/timeslicequery/base.go index 81155bd..f3a6348 100644 --- a/internal/biz/timeslicequery/base.go +++ b/internal/biz/timeslicequery/base.go @@ -19,8 +19,9 @@ type Query struct { rdb *data.Rdb cmb *cmb.Cmb - productRepo repo.ProductRepo - orderRepo repo.OrderRepo + productRepo repo.ProductRepo + orderRepo repo.OrderRepo + orderBakRepo repo.OrderBakRepo wechatCpnRepo wechatrepo.WechatCpnRepo mqSendMixRepo mixrepos.MQSendMixRepo @@ -32,6 +33,7 @@ func NewQuery( cmb *cmb.Cmb, productRepo repo.ProductRepo, orderRepo repo.OrderRepo, + orderBakRepo repo.OrderBakRepo, wechatCpnRepo wechatrepo.WechatCpnRepo, mqSendMixRepo mixrepos.MQSendMixRepo) *Query { return &Query{ @@ -41,6 +43,7 @@ func NewQuery( cmb: cmb, productRepo: productRepo, orderRepo: orderRepo, + orderBakRepo: orderBakRepo, wechatCpnRepo: wechatCpnRepo, mqSendMixRepo: mqSendMixRepo} } diff --git a/internal/biz/timeslicequery/query.go b/internal/biz/timeslicequery/query.go index eb1f58c..2b2cced 100644 --- a/internal/biz/timeslicequery/query.go +++ b/internal/biz/timeslicequery/query.go @@ -32,7 +32,8 @@ func (v *Query) wechatQuery(ctx context.Context, order *bo.OrderBo, useNum *int) func (v *Query) queryUsed(ctx context.Context, order *bo.OrderBo) error { if order.Status.IsUse() { - return v.notify(ctx, order) + _, err := v.cmb.Notify(ctx, order) + return err } if err := v.orderRepo.Used(ctx, order.ID); err != nil { @@ -45,7 +46,8 @@ func (v *Query) queryUsed(ctx context.Context, order *bo.OrderBo) error { func (v *Query) queryExpired(ctx context.Context, order *bo.OrderBo) error { if order.Status.IsExpired() { - return nil + _, err := v.cmb.Notify(ctx, order) + return err } if err := v.orderRepo.Expired(ctx, order.ID); err != nil { @@ -55,6 +57,20 @@ func (v *Query) queryExpired(ctx context.Context, order *bo.OrderBo) error { return v.notify(ctx, order) } +func (v *Query) querySuccess(ctx context.Context, order *bo.OrderBo) error { + + if order.Status.IsSuccess() { + _, err := v.cmb.Notify(ctx, order) + return err + } + + if err := v.orderRepo.Available(ctx, order.ID); err != nil { + return err + } + + return v.notify(ctx, order) +} + func (v *Query) notify(ctx context.Context, order *bo.OrderBo) error { order, err := v.orderRepo.GetByID(ctx, order.ID) diff --git a/internal/biz/timeslicequery/query_bak.go b/internal/biz/timeslicequery/query_bak.go new file mode 100644 index 0000000..b38f75c --- /dev/null +++ b/internal/biz/timeslicequery/query_bak.go @@ -0,0 +1,62 @@ +package timeslicequery + +import ( + "context" + "voucher/internal/biz/bo" +) + +func (v *Query) queryUsedBak(ctx context.Context, order *bo.OrderBo) error { + + if order.Status.IsUse() { + _, err := v.cmb.Notify(ctx, order) + return err + } + + if err := v.orderBakRepo.Used(ctx, order.ID); err != nil { + return err + } + + return v.notify(ctx, order) +} + +func (v *Query) queryExpiredBak(ctx context.Context, order *bo.OrderBo) error { + + if order.Status.IsExpired() { + _, err := v.cmb.Notify(ctx, order) + return err + } + + if err := v.orderBakRepo.Expired(ctx, order.ID); err != nil { + return err + } + + return v.notify(ctx, order) +} + +func (v *Query) querySuccessBak(ctx context.Context, order *bo.OrderBo) error { + + if order.Status.IsSuccess() { + _, err := v.cmb.Notify(ctx, order) + return err + } + + if err := v.orderBakRepo.Available(ctx, order.ID); err != nil { + return err + } + + return v.notify(ctx, order) +} + +func (v *Query) notifyBak(ctx context.Context, order *bo.OrderBo) error { + + order, err := v.orderBakRepo.GetByID(ctx, order.ID) + if err != nil { + return err + } + + if _, err = v.cmb.Notify(ctx, order); err != nil { + return err + } + + return nil +} diff --git a/internal/biz/timeslicequery/retry_query_notice.go b/internal/biz/timeslicequery/retry_query_notice.go new file mode 100644 index 0000000..8646391 --- /dev/null +++ b/internal/biz/timeslicequery/retry_query_notice.go @@ -0,0 +1,246 @@ +package timeslicequery + +import ( + "context" + "encoding/json" + "fmt" + "github.com/go-kratos/kratos/v2/log" + "github.com/hashicorp/go-multierror" + "golang.org/x/sync/errgroup" + "runtime" + "sync" + "time" + "voucher/internal/biz/bo" + "voucher/internal/biz/do" +) + +func (v *Query) RetryQueryNotice(ctx context.Context, msg string) error { + + var req *do.RetryQueryNotice + + if err := json.Unmarshal([]byte(msg), &req); err != nil { + return err + } + + err := v.RetryQueryNoticeOrder(ctx, req) + if err != nil { + return err + } + + return v.RetryQueryNoticeOrderBak(ctx, req) +} + +func (v *Query) RetryQueryNoticeOrder(ctx context.Context, req *do.RetryQueryNotice) error { + + start := time.Now() + num := 0 + errNum := 0 + sucNum := 0 + + var mu sync.Mutex + errs := make([]error, 0) + + eg := new(errgroup.Group) + eg.SetLimit(5) + + err := v.orderRepo.FindRetryQuery(ctx, req, func(ctx context.Context, rows []*bo.OrderBo) error { + + eg.Go(func() error { + + defer func() { + if err := recover(); err != nil { + // 获取调用栈信息 + _, file, line, _ := runtime.Caller(1) // 1 表示获取当前调用者的调用信息 + + mu.Lock() + errs = append(errs, fmt.Errorf("panic: %v,file:%s, line:%d", err, file, line)) + mu.Unlock() + } + }() + + for _, order := range rows { + + if err := v.retryQueryNoticeOrder(ctx, order); err != nil { + + logFields := map[string]string{ + "order_no": order.OrderNo, + "coupon_id": order.VoucherNo, + "open_id": order.Account, + "stock_id": order.BatchNo, + "err": err.Error(), + } + + log.Errorf("微信券查询order,错误:%+v", logFields) + + errNum++ + + if errNum > 20 { + return fmt.Errorf("微信券查询order,已经连续发生20次错误%+v", logFields) + } + + } else { + sucNum++ + } + } + + return nil + }) + + return nil + }) + + // 等待所有任务完成 + if err := eg.Wait(); err != nil { + return fmt.Errorf("微信券查询order，任务执行失败: %v", err) + } + + end := time.Now() + + logFields := map[string]any{ + "num": num, + "sucNum": sucNum, + "errNum": errNum, + "elapsed": end.Sub(start).String(), + } + log.Warnf("微信券查询order,处理完毕:%+v", logFields) + + // 收集错误 + var result error + for _, err2 := range errs { + result = multierror.Append(result, err2) + } + + return err +} + +func (v *Query) retryQueryNoticeOrder(ctx context.Context, order *bo.OrderBo) error { + + if order.Status.IsExpired() { + _, err := v.cmb.Notify(ctx, order) + return err + } + + status, err := v.wechatCpnRepo.Query(ctx, order) + if err != nil { + return err + } + + if status.IsUse() { + return v.queryUsed(ctx, order) + } else if status.IsSuccess() { + return v.querySuccess(ctx, order) + } else if status.IsExpired() { + return v.queryExpired(ctx, order) + } + + return nil +} + +func (v *Query) RetryQueryNoticeOrderBak(ctx context.Context, req *do.RetryQueryNotice) error { + + start := time.Now() + num := 0 + errNum := 0 + sucNum := 0 + + var mu sync.Mutex + errs := make([]error, 0) + + eg := new(errgroup.Group) + eg.SetLimit(5) + + err := v.orderBakRepo.FindRetryQuery(ctx, req, func(ctx context.Context, rows []*bo.OrderBo) error { + + eg.Go(func() error { + + defer func() { + if err := recover(); err != nil { + // 获取调用栈信息 + _, file, line, _ := runtime.Caller(1) // 1 表示获取当前调用者的调用信息 + + mu.Lock() + errs = append(errs, fmt.Errorf("panic: %v,file:%s, line:%d", err, file, line)) + mu.Unlock() + } + }() + + for _, order := range rows { + if err := v.retryQueryNoticeOrderBal(ctx, order); err != nil { + + logFields := map[string]string{ + "order_no": order.OrderNo, + "coupon_id": order.VoucherNo, + "open_id": order.Account, + "stock_id": order.BatchNo, + "err": err.Error(), + } + + log.Errorf("微信券查询orderBak,错误:%+v", logFields) + + errNum++ + + if errNum > 20 { + return fmt.Errorf("微信券查询orderBak,已经连续发生20次错误%+v", logFields) + } + + } else { + sucNum++ + } + } + + return nil + }) + + return nil + }) + + if err != nil { + return err + } + + // 等待所有任务完成 + if err2 := eg.Wait(); err2 != nil { + return fmt.Errorf("微信券查询orderBak，任务执行失败: %v", err2) + } + + end := time.Now() + + logFields := map[string]any{ + "num": num, + "sucNum": sucNum, + "errNum": errNum, + "elapsed": end.Sub(start).String(), + } + log.Warnf("微信券查询orderBak,处理完毕:%+v", logFields) + + // 收集错误 + var result error + for _, err2 := range errs { + result = multierror.Append(result, err2) + } + + return result +} + +func (v *Query) retryQueryNoticeOrderBal(ctx context.Context, order *bo.OrderBo) error { + + if order.Status.IsExpired() { + _, err := v.cmb.Notify(ctx, order) + return err + } + + status, err := v.wechatCpnRepo.Query(ctx, order) + if err != nil { + return err + } + + if status.IsUse() { + return v.queryUsedBak(ctx, order) + } else if status.IsSuccess() { + return v.querySuccessBak(ctx, order) + } else if status.IsExpired() { + return v.queryExpiredBak(ctx, order) + } + + return nil +} diff --git a/internal/data/repoimpl/order.go b/internal/data/repoimpl/order.go index 0ba1690..8fa2c54 100644 --- a/internal/data/repoimpl/order.go +++ b/internal/data/repoimpl/order.go @@ -206,6 +206,61 @@ func (p *OrderRepoImpl) FindInBatches(ctx context.Context, req *bo.FindInBatches return nil } +func (p *OrderRepoImpl) FindRetryQuery(ctx context.Context, req *do.RetryQueryNotice, fun func(ctx context.Context, rows []*bo.OrderBo) error) error { + + statusArr := []uint8{ + vo.OrderStatusSuccess.GetValue(), + vo.OrderStatusUse.GetValue(), + vo.OrderStatusExpired.GetValue(), + } + + tx := p.DB(ctx). + Where("`status` in (?)", statusArr). + Where("activity_id = ''") + + if req.ProductNo != "" { + tx = tx.Where("product_no = ?", req.ProductNo) + } + + if req.ReceiveSuccessStartTime != "" { + tx = tx.Where("receive_success_time > ?", req.ReceiveSuccessStartTime) + } + if req.ReceiveSuccessEndTime != "" { + tx = tx.Where("receive_success_time <= ?", req.ReceiveSuccessEndTime) + } + + if req.ProductNo != "" { + tx = tx.Where("product_no = ?", req.ProductNo) + } + + if req.OrderNos != nil { + tx = tx.Where("order_no IN (?)", req.OrderNos) + } + + if req.OutBizNos != nil { + tx = tx.Where("out_biz_no IN (?)", req.OutBizNos) + } + + if req.VoucherNos != nil { + tx = tx.Where("voucher_no IN (?)", req.VoucherNos) + } + + var results = make([]*model.Order, 0) + + tx.Order("receive_success_time asc") // 显式清除排序，移除默认的 ORDER BY + + result := tx.FindInBatches(&results, 1000, func(tx *gorm.DB, batch int) error { + + return fun(ctx, p.ToBos(results)) + }) + + if result.Error != nil { + return result.Error + } + + return nil +} + func (p *OrderRepoImpl) Create(ctx context.Context, req *bo.OrderBo) (*bo.OrderBo, error) { now := time.Now() diff --git a/internal/data/repoimpl/order_bak.go b/internal/data/repoimpl/order_bak.go index 6509075..49c72d9 100644 --- a/internal/data/repoimpl/order_bak.go +++ b/internal/data/repoimpl/order_bak.go @@ -2,9 +2,15 @@ package repoimpl import ( "context" + "errors" + "fmt" "gorm.io/gorm" + "time" + err2 "voucher/api/err" "voucher/internal/biz/bo" + "voucher/internal/biz/do" "voucher/internal/biz/repo" + "voucher/internal/biz/vo" "voucher/internal/data" "voucher/internal/data/model" ) @@ -61,3 +67,142 @@ func (p *OrderBakRepoImpl) SpecifyFindInBatches(ctx context.Context, req *bo.Fin return nil } + +func (p *OrderBakRepoImpl) FindRetryQuery(ctx context.Context, req *do.RetryQueryNotice, fun func(ctx context.Context, rows []*bo.OrderBo) error) error { + + statusArr := []uint8{ + vo.OrderStatusSuccess.GetValue(), + vo.OrderStatusUse.GetValue(), + vo.OrderStatusExpired.GetValue(), + } + + tx := p.DB(ctx). + Where("`status` in (?)", statusArr). + Where("activity_id = ''") + + if req.ProductNo != "" { + tx = tx.Where("product_no = ?", req.ProductNo) + } + + if req.ReceiveSuccessStartTime != "" { + tx = tx.Where("receive_success_time > ?", req.ReceiveSuccessStartTime) + } + if req.ReceiveSuccessEndTime != "" { + tx = tx.Where("receive_success_time <= ?", req.ReceiveSuccessEndTime) + } + + if req.ProductNo != "" { + tx = tx.Where("product_no = ?", req.ProductNo) + } + + if req.OrderNos != nil { + tx = tx.Where("order_no IN (?)", req.OrderNos) + } + + if req.OutBizNos != nil { + tx = tx.Where("out_biz_no IN (?)", req.OutBizNos) + } + + if req.VoucherNos != nil { + tx = tx.Where("voucher_no IN (?)", req.VoucherNos) + } + + var results = make([]*model.OrderBak, 0) + + tx.Order("receive_success_time asc") // 显式清除排序，移除默认的 ORDER BY + + result := tx.FindInBatches(&results, 1000, func(tx *gorm.DB, batch int) error { + + return fun(ctx, p.ToBos(results)) + }) + + if result.Error != nil { + return result.Error + } + + return nil +} + +func (p *OrderBakRepoImpl) GetByID(ctx context.Context, id uint64) (*bo.OrderBo, error) { + info := &model.OrderBak{} + + tx := p.DB(ctx).Where(model.OrderBak{ID: id}).First(&info) + + if tx.Error != nil { + + if errors.Is(tx.Error, gorm.ErrRecordNotFound) { + return nil, err2.ErrorDbNotFound("订单数据不存在") + } + + return nil, fmt.Errorf("order db fail %w", tx.Error) + } + + if tx.RowsAffected == 0 { + return nil, err2.ErrorDbNotFound("订单数据不存在") + } + + return p.ToBo(info), nil +} + +func (p *OrderBakRepoImpl) Used(ctx context.Context, id uint64) error { + now := time.Now() + + tx := p.DB(ctx). + Where(model.OrderBak{ + ID: id, + }). + Updates(model.OrderBak{ + Status: vo.OrderStatusUse.GetValue(), + Remark: "核销", + LastUseTime: &now, + UpdateTime: &now, + }) + + if tx.Error != nil { + return fmt.Errorf("update db fail %w", tx.Error) + } + + return nil +} + +func (p *OrderBakRepoImpl) Expired(ctx context.Context, id uint64) error { + now := time.Now() + + tx := p.DB(ctx). + Where(model.OrderBak{ + ID: id, + }). + Updates(model.OrderBak{ + Status: vo.OrderStatusExpired.GetValue(), + Remark: "过期", + UpdateTime: &now, + }) + + if tx.Error != nil { + return fmt.Errorf("update db fail %w", tx.Error) + } + + return nil +} + +func (p *OrderBakRepoImpl) Available(ctx context.Context, id uint64) error { + now := time.Now() + + tx := p.DB(ctx). + Where(model.OrderBak{ + ID: id, + Status: vo.OrderStatusUse.GetValue(), + }). + Updates(model.OrderBak{ + Status: vo.OrderStatusSuccess.GetValue(), + Remark: "重置为成功，领取成功时间重置", + ReceiveSuccessTime: &now, // 领取成功时间重置 + UpdateTime: &now, + }) + + if tx.Error != nil { + return fmt.Errorf("update db fail %w", tx.Error) + } + + return nil +} diff --git a/internal/server/http.go b/internal/server/http.go index c265340..ca5ce10 100644 --- a/internal/server/http.go +++ b/internal/server/http.go @@ -42,6 +42,7 @@ func NewHTTPServer( // 订单通知重试 -- 不健全 srv.Route("/voucher/").POST("orderNotifyRetry", cmb.OrderNotifyRetry) + srv.Route("/voucher/").POST("retryOrderNotice", cmb.RetryOrderNotice) // 重试通知 srv.Route("/voucher/").POST("notifyRetry/{id}", cmb.NotifyRetry) // 查询订单状态及微信状态 diff --git a/internal/server/rds_consume.go b/internal/server/rds_consume.go index c1c9636..64e6ebd 100644 --- a/internal/server/rds_consume.go +++ b/internal/server/rds_consume.go @@ -26,6 +26,10 @@ func NewRdbConsumer( ) *RdbConsumer { manager := rdsmq.NewConsumerManager() + if cfTr := voucherService.GetRetryQueryNoticeConfig(); cfTr != nil { + manager.Add(cfTr) + } + if cf := voucherService.GetWechatQueryConfig(); cf != nil { manager.Add(cf) } diff --git a/internal/service/script.go b/internal/service/script.go index c51b809..cd7d2b9 100644 --- a/internal/service/script.go +++ b/internal/service/script.go @@ -11,6 +11,25 @@ import ( "voucher/internal/biz/do" ) +func (this *CmbService) RetryOrderNotice(ctx http.Context) error { + + bodyBytes, err := io.ReadAll(ctx.Request().Body) + if err != nil { + return err + } + + if bodyBytes == nil { + return fmt.Errorf("bodyBytes is empty") + } + + var req *do.RetryQueryNotice + if err = json.Unmarshal(bodyBytes, &req); err != nil { + return err + } + + return this.VoucherBiz.PushRetryOrderNotice(ctx, bodyBytes) +} + func (this *CmbService) OrderNotifyRetry(ctx http.Context) error { bodyBytes, err := io.ReadAll(ctx.Request().Body) diff --git a/internal/service/wechat_query.go b/internal/service/wechat_query.go index 6e44485..dac4b56 100644 --- a/internal/service/wechat_query.go +++ b/internal/service/wechat_query.go @@ -80,3 +80,30 @@ func (s *VoucherService) WechatTimeSliceQueryHandle(ctx context.Context, msg str return nil } + +func (s *VoucherService) GetRetryQueryNoticeConfig() *rdsmq.ConsumeConfig { + + return &rdsmq.ConsumeConfig{ + Rdb: s.rdb.Rdb, + QueueName: "retryQueryNotice", + NumWorkers: 1, + WaitTime: 30, + RetryNum: 1, + Fn: s.RetryQueryNotice, + Logger: s.logHelper, + } +} + +func (s *VoucherService) RetryQueryNotice(ctx context.Context, msg string) error { + + if msg == "" { + s.logHelper.Errorf("wechat TimeSlice query error: batchNo is empty") + return nil + } + + if err := s.timeSliceQuery.RetryQueryNotice(ctx, msg); err != nil { + s.logHelper.Errorf("retry query notice msg:%s error: %v", msg, err) + } + + return nil +} diff --git a/test/coupon.go b/test/coupon.go index 64cc2d4..f63f57e 100644 --- a/test/coupon.go +++ b/test/coupon.go @@ -102,9 +102,9 @@ func QueryCoupon() { return } - appId := "wxd27e255810842ba8" - openId := "o3dEt5Wq3v-bEBXXkzvIlMgMh7Kc" - couponId := "149248300483" + appId := "wx619991cc795028f5" + openId := "oSNb4fnWoktz7YVNIXE5bvoB3-1w" + couponId := "106048490308" req := cashcoupons.QueryCouponRequest{ CouponId: core.String(couponId),