From be333c9feb38f65cb9cc25c3f677c2b0ec4b0f83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Wed, 7 Dec 2022 17:33:29 +0800 Subject: [PATCH] 1 --- dao/print_bill.go | 2 +- model/model.go | 2 +- services/print_server/print.go | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dao/print_bill.go b/dao/print_bill.go index 3b1e239..d8c4474 100644 --- a/dao/print_bill.go +++ b/dao/print_bill.go @@ -32,7 +32,7 @@ func QueryPrintBill(db *sqlx.Tx, userId, printNo string) ([]*app_model.PrintBill // QueryPrintBillList 查询打印机余额 func QueryPrintBillList(userId string, printNo []string) ([]*app_model.PrintBill, error) { - db := globals.GetTxDb() + db := globals.GetDB() sql := `SELECT * FROM print_bill WHERE 1 = 1 ` var param []interface{} if userId != "" { diff --git a/model/model.go b/model/model.go index 72f0083..c23ea1a 100644 --- a/model/model.go +++ b/model/model.go @@ -95,7 +95,7 @@ type PrintInfo struct { type PagedInfo struct { TotalCount int `json:"totalCount"` Data interface{} `json:"data"` - PrintBill map[string]int64 `json:"print_bill"` + PrintBill map[string]int64 `json:"printBill"` } type ModelIDCULD struct { diff --git a/services/print_server/print.go b/services/print_server/print.go index f112053..b97fcf6 100644 --- a/services/print_server/print.go +++ b/services/print_server/print.go @@ -87,6 +87,7 @@ func GetPrinters(userId string, appID int, printNo, name string, status, isOnlin if err != nil { return nil, err } + globals.SugarLogger.Debugf("====================%s", utils.Format4Output(printBillList, false)) for _, v := range printBillList { page.PrintBill[v.PrintNo] = v.PrintBalance }