From efd8dd03ec164308879947e0f577edef86a5fb42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=AD=90=E9=93=AD?= Date: Mon, 10 Mar 2025 11:25:52 +0800 Subject: [PATCH] cmb --- internal/biz/cmb.go | 2 +- internal/biz/repo/order_wechat.go | 2 +- internal/data/repoimpl/order_wechat.go | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/biz/cmb.go b/internal/biz/cmb.go index 82b4375..23c167d 100644 --- a/internal/biz/cmb.go +++ b/internal/biz/cmb.go @@ -54,7 +54,7 @@ func (v *VoucherBiz) CmbQuery(ctx context.Context, orderNo string) (reps *v1.Cmb err = lock.NewMutex(v.rdb.Rdb, c.TTL).Lock(ctx, c.Key, func(ctx context.Context) error { - orderWechat, err := v.OrderWechatRepo.GetByOrderNo(ctx, orderNo) + orderWechat, err := v.OrderWechatRepo.GetLastByOrderNo(ctx, orderNo) if err != nil { return err } diff --git a/internal/biz/repo/order_wechat.go b/internal/biz/repo/order_wechat.go index 6cea8ca..956b89f 100644 --- a/internal/biz/repo/order_wechat.go +++ b/internal/biz/repo/order_wechat.go @@ -10,7 +10,7 @@ type OrderWechatRepo interface { Success(ctx context.Context, id uint64, couponId string) error Fail(ctx context.Context, id uint64, remark string) error GetByOutRequestNo(ctx context.Context, outRequestNo string) (*bo.OrderWechatBo, error) - GetByOrderNo(ctx context.Context, orderNo string) (*bo.OrderWechatBo, error) + GetLastByOrderNo(ctx context.Context, orderNo string) (*bo.OrderWechatBo, error) GetByMSCId(ctx context.Context, mchId, stockId, couponId string) (*bo.OrderWechatBo, error) Used(ctx context.Context, id uint64) error Expired(ctx context.Context, id uint64) error diff --git a/internal/data/repoimpl/order_wechat.go b/internal/data/repoimpl/order_wechat.go index 1c96945..e0a7415 100644 --- a/internal/data/repoimpl/order_wechat.go +++ b/internal/data/repoimpl/order_wechat.go @@ -85,10 +85,10 @@ func (p *OrderWechatRepoImpl) GetByOutRequestNo(ctx context.Context, outRequestN return p.ToBo(info), nil } -func (p *OrderWechatRepoImpl) GetByOrderNo(ctx context.Context, orderNo string) (*bo.OrderWechatBo, error) { +func (p *OrderWechatRepoImpl) GetLastByOrderNo(ctx context.Context, orderNo string) (*bo.OrderWechatBo, error) { info := &model.OrderWechat{} - tx := p.DB(ctx).Where(model.OrderWechat{OrderNo: orderNo}).Find(&info) + tx := p.DB(ctx).Where(model.OrderWechat{OrderNo: orderNo}).Order("id desc").Find(&info) if tx.Error != nil { return nil, tx.Error