Merge branch 'feat-IRONFANS-70' into test

This commit is contained in:
lwl0608 2024-04-23 17:22:58 +08:00
commit 77bfb2e1d5
2 changed files with 2 additions and 2 deletions

View File

@ -304,7 +304,7 @@ func (m *Mysql) UpdateOutOrderId(ctx *gin.Context, tx *sqlx.Tx, orderId string,
// 获取钱包 for update // 获取钱包 for update
func (m *Mysql) GetWalletForUpdate(ctx *gin.Context, tx *sqlx.Tx, mid int64) (wallet *dbstruct.Wallet, err error) { func (m *Mysql) GetWalletForUpdate(ctx *gin.Context, tx *sqlx.Tx, mid int64) (wallet *dbstruct.Wallet, err error) {
var tmpWallet dbstruct.Wallet var tmpWallet dbstruct.Wallet
err = tx.GetContext(ctx, &tmpWallet, fmt.Sprintf("select * from %s where id = ? for update", TableWallet), mid) err = tx.GetContext(ctx, &tmpWallet, fmt.Sprintf("select * from %s where id=?", TableWallet), mid)
if err != nil { if err != nil {
return return
} }

View File

@ -390,7 +390,7 @@ func (v *Vas) UnlockZoneSuperfanship(ctx *gin.Context, tx *sqlx.Tx, order *dbstr
Oid2: orderId, Oid2: orderId,
}) })
if _err != nil { if _err != nil {
logger.Error("OneStepUnlockContact fail, mid: %v, zid: %v, uid: %v, orderId: %v, err: %v", mid, zid, orderId, err) logger.Error("OneStepUnlockContact fail, mid: %v, zid: %v, uid: %v, orderId: %v, err: %v", mid, zid, zv.Mid, orderId, _err)
} }
return nil return nil