diff --git a/dao/print_bill.go b/dao/print_bill.go index eeaefe6..7e2c4b6 100644 --- a/dao/print_bill.go +++ b/dao/print_bill.go @@ -7,7 +7,10 @@ import ( ) // QueryPrintBill 查询打印机账户是否存在 -func QueryPrintBill(userId, printNo string) ([]*app_model.PrintBill, error) { +func QueryPrintBill(db *sqlx.Tx, userId, printNo string) ([]*app_model.PrintBill, error) { + if db == nil { + db = globals.GetTxDb() + } sql := `SELECT * FROM print_bill WHERE 1 = 1 ` var param []interface{} if userId != "" { @@ -20,7 +23,7 @@ func QueryPrintBill(userId, printNo string) ([]*app_model.PrintBill, error) { } var result []*app_model.PrintBill - if err := globals.GetDB().Select(&result, sql, param...); err != nil { + if err := db.Select(&result, sql, param...); err != nil { return nil, err } return result, nil @@ -46,7 +49,7 @@ func AddMoney(db *sqlx.Tx, printNo string, money int64) error { // UpdateBillToUser 当打印机账户从菜市绑定时,未分配用户,用户再使用小程序绑定时,将打印机分配给用户! func UpdateBillToUser(db *sqlx.Tx, param *app_model.PrintBill) error { sql := `UPDATE print_bill SET user_id = ? WHERE print_no = ?` - _, err := globals.GetTxDb().Exec(sql, []interface{}{param.UserId, param.PrintNo}...) + _, err := db.Exec(sql, []interface{}{param.UserId, param.PrintNo}...) return err } diff --git a/services/print_server/app_server/print_bill.go b/services/print_server/app_server/print_bill.go index 3b0b43c..8b19d23 100644 --- a/services/print_server/app_server/print_bill.go +++ b/services/print_server/app_server/print_bill.go @@ -15,7 +15,7 @@ var PrintBillServer = new(PrintBill) // InitPPrintBill 初始化打印机账户 func (p *PrintBill) InitPPrintBill(tx *sqlx.Tx, bill *app_model.PrintBill) error { // 查询打印机是否有账户,没有添加 - result, err := dao.QueryPrintBill("", bill.PrintNo) + result, err := dao.QueryPrintBill(tx, "", bill.PrintNo) if err != nil { return err } @@ -40,7 +40,7 @@ func (p *PrintBill) InitPPrintBill(tx *sqlx.Tx, bill *app_model.PrintBill) error // QueryPrintBill 查询打印机余额 func (p *PrintBill) QueryPrintBill(userId, printNo string) (*app_model.PrintBill, error) { - result, err := dao.QueryPrintBill(userId, printNo) + result, err := dao.QueryPrintBill(nil, userId, printNo) if err != nil { return nil, err }