From c3901c7f94ac066488712448d72c53795926b69f Mon Sep 17 00:00:00 2001 From: ziming Date: Tue, 27 May 2025 16:20:27 +0800 Subject: [PATCH] mock use --- internal/biz/wechat_notify.go | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/internal/biz/wechat_notify.go b/internal/biz/wechat_notify.go index 9201f7e..88bb49b 100644 --- a/internal/biz/wechat_notify.go +++ b/internal/biz/wechat_notify.go @@ -30,13 +30,7 @@ func (v *VoucherBiz) WechatNotifyConsumer(ctx context.Context, tag string, req * } else if req.PlainText.Status.IsUsed() { - if err = v.used(ctx, order, req.PlainText.ConsumeInformation.ConsumeTime); err != nil { - return err - } - - _ = v.wxToBBUse(ctx, order, req) - - return v.useLog(ctx, order, req) + return v.used(ctx, order, req) } else if req.PlainText.Status.IsExpired() { @@ -90,11 +84,11 @@ func (v *VoucherBiz) createUseLog(ctx context.Context, order *bo.OrderBo, req *b return nil } -func (v *VoucherBiz) used(ctx context.Context, order *bo.OrderBo, consumeTime string) error { +func (v *VoucherBiz) used(ctx context.Context, order *bo.OrderBo, req *bo.WechatVoucherNotifyBo) error { var usedTime time.Time - if consumeTime != "" { - usedTime, _ = time.Parse(time.RFC3339, consumeTime) + if req.PlainText.ConsumeInformation.ConsumeTime != "" { + usedTime, _ = time.Parse(time.RFC3339, req.PlainText.ConsumeInformation.ConsumeTime) } else { usedTime = time.Now() } @@ -108,7 +102,17 @@ func (v *VoucherBiz) used(ctx context.Context, order *bo.OrderBo, consumeTime st return err } - return v.notify(ctx, order) + if err := v.notify(ctx, order); err != nil { + return err + } + + if err := v.useLog(ctx, order, req); err != nil { + return err + } + + _ = v.wxToBBUse(ctx, order, req) + + return nil } func (v *VoucherBiz) available(ctx context.Context, order *bo.OrderBo) error {