From d61cd68faafd4b7dd82eb72ba7cd2af44e733975 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=AD=90=E9=93=AD?= Date: Sat, 8 Mar 2025 13:59:25 +0800 Subject: [PATCH] cmb --- internal/biz/cmb.go | 2 +- internal/biz/repo/order.go | 2 +- internal/data/repoimpl/order.go | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/biz/cmb.go b/internal/biz/cmb.go index 8fd460d..596e763 100644 --- a/internal/biz/cmb.go +++ b/internal/biz/cmb.go @@ -17,7 +17,7 @@ func (v *VoucherBiz) CmbOrder(ctx context.Context, req *bo.OrderCreateReqBo) (or err = lock.NewMutex(v.rdb.Rdb, c.TTL).Lock(ctx, c.Key, func(ctx context.Context) error { - order, err := v.OrderRepo.GetByOutBizNo(ctx, req.OutBizNo) + order, err := v.OrderRepo.GetByOutBizNo(ctx, req.AppID, req.OutBizNo) if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) { return err diff --git a/internal/biz/repo/order.go b/internal/biz/repo/order.go index f6547b8..f0522ad 100644 --- a/internal/biz/repo/order.go +++ b/internal/biz/repo/order.go @@ -6,7 +6,7 @@ import ( ) type OrderRepo interface { - GetByOutBizNo(ctx context.Context, outBizNo string) (*bo.OrderBo, error) + GetByOutBizNo(ctx context.Context, appId, outBizNo string) (*bo.OrderBo, error) GetByOrderNo(ctx context.Context, orderNo string) (*bo.OrderBo, error) Create(ctx context.Context, req *bo.OrderBo) (*bo.OrderBo, error) GetByID(ctx context.Context, id uint64) (*bo.OrderBo, error) diff --git a/internal/data/repoimpl/order.go b/internal/data/repoimpl/order.go index ffb58b4..3af875d 100644 --- a/internal/data/repoimpl/order.go +++ b/internal/data/repoimpl/order.go @@ -52,10 +52,10 @@ func (p *OrderRepoImpl) Create(ctx context.Context, req *bo.OrderBo) (*bo.OrderB return p.ToBo(info), nil } -func (p *OrderRepoImpl) GetByOutBizNo(ctx context.Context, outBizNo string) (*bo.OrderBo, error) { +func (p *OrderRepoImpl) GetByOutBizNo(ctx context.Context, appId, outBizNo string) (*bo.OrderBo, error) { info := &model.Order{} - tx := p.DB(ctx).Where(model.Order{OutBizNo: outBizNo}).Find(&info) + tx := p.DB(ctx).Where(model.Order{AppID: appId, OutBizNo: outBizNo}).Find(&info) if tx.Error != nil { return nil, tx.Error