From bbcfcb3b9542375fe1734d1aa2e86f71c1408724 Mon Sep 17 00:00:00 2001 From: lwl0608 Date: Thu, 21 Mar 2024 20:31:12 +0800 Subject: [PATCH] fix recover --- app/mix/dao/mysql.go | 4 ++++ app/mix/service/logic/vas_op.go | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/mix/dao/mysql.go b/app/mix/dao/mysql.go index 03694888..6170c4c6 100644 --- a/app/mix/dao/mysql.go +++ b/app/mix/dao/mysql.go @@ -524,6 +524,10 @@ func (m *Mysql) UpdateCoinOrderStatus(ctx *gin.Context, tx *sqlx.Tx, orderId str // 获取金币订单 for update func (m *Mysql) GetCoinOrderByIdForUpdate(ctx *gin.Context, tx *sqlx.Tx, id string) (order *dbstruct.CoinOrder, err error) { + if tx == nil { + err = errors.New("tx is must require") + return + } var tmpOrder dbstruct.CoinOrder err = tx.GetContext(ctx, &tmpOrder, fmt.Sprintf("select * from %s where id = ? for update", TableCoinOrder), id) if err != nil { diff --git a/app/mix/service/logic/vas_op.go b/app/mix/service/logic/vas_op.go index 9822aea5..3e5be25f 100644 --- a/app/mix/service/logic/vas_op.go +++ b/app/mix/service/logic/vas_op.go @@ -9,7 +9,7 @@ import ( // 获取金币订单 func (v *Vas) OpCoinOrderList(ctx *gin.Context, req *vasproto.OpCoinOrderListReq) ([]*dbstruct.CoinOrder, error) { if len(req.OrderId) > 0 { - o, err := v.store.GetCoinOrderByIdForUpdate(ctx, nil, req.OrderId) + o, err := v.store.GetCoinOrderById(ctx, nil, req.OrderId) return []*dbstruct.CoinOrder{o}, err } return v.store.GetCoinOrders(ctx, nil, req.Mid, req.St, req.Et, req.Offset, req.Limit)