1

dao/print_setting.go

@@ -1,9 +1,11 @@
 package dao
 
 import (
+	"fmt"
 	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-print/globals"
 	settingModel "git.rosy.net.cn/jx-print/model/app_model"
+	"github.com/jmoiron/sqlx"
 )
 
 type PrintSettingDao struct{}
@@ -26,13 +28,14 @@ func (p *PrintSettingDao) QueryPrintNoIsExit(printNo string) (bool, error) {
 }
 
 // InsertPrintSetting 插入打印机设置
-func (p *PrintSettingDao) InsertPrintSetting(param *settingModel.PrintSetting) error {
-	return Insert(globals.GetDB(), param)
+func (p *PrintSettingDao) InsertPrintSetting(tx *sqlx.Tx, param *settingModel.PrintSetting) error {
+	return InsertTx(tx, param)
 }
 
 // UpdatePrinterSetting 修改打印机配置
 func (p *PrintSettingDao) UpdatePrinterSetting(param *settingModel.UpdatePrintSetting) error {
 	db := globals.GetDB()
+
 	sql := `UPDATE print_setting SET `
 	var param2 []interface{}
 
@@ -41,72 +44,50 @@ func (p *PrintSettingDao) UpdatePrinterSetting(param *settingModel.UpdatePrintSe
 		param2 = append(param2, param.CallNameSetting)
 	}
 	if param.SystemVoice != 0 {
-		sql += ` system_voice = ? `
+		sql += ` ,system_voice = ? `
 		param2 = append(param2, param.SystemVoice)
 	}
 	if param.PrintVoiceSetting != "" {
-		sql += ` print_voice_setting = ? `
+		sql += ` ,print_voice_setting = ? `
 		param2 = append(param2, param.PrintVoiceSetting)
 	}
 	if param.OrderVoiceSetting != "" {
-		sql += ` order_voice_setting = ? `
+		sql += ` ,order_voice_setting = ? `
 		param2 = append(param2, param.OrderVoiceSetting)
 	}
 	if param.RiderVoiceSetting != "" {
-		sql += ` rider_voice_setting = ? `
+		sql += ` ,rider_voice_setting = ? `
 		param2 = append(param2, param.RiderVoiceSetting)
 	}
 	if param.CustomerVoiceSetting != "" {
-		sql += ` customer_voice_setting = ? `
+		sql += ` ,customer_voice_setting = ? `
 		param2 = append(param2, param.CustomerVoiceSetting)
 	}
 	if param.PickingSetting != "" {
-		sql += ` picking_setting = ? `
+		sql += ` ,picking_setting = ? `
 		param2 = append(param2, param.PickingSetting)
 	}
 	sql += ` WHERE print_no = ? `
+	param2 = append(param2, param.PrintNo)
 
 	_, err := db.Exec(sql, param2...)
 	return err
 }
 
 // DeleteSetting 删除打印机设置
-func (p *PrintSettingDao) DeleteSetting(printNo []string) error {
-	_, err := globals.GetDB().Exec(`DELETE FROM print_setting WHERE print_no in (?)`, []interface{}{printNo}...)
+func (p *PrintSettingDao) DeleteSetting(printNo string) error {
+	_, err := globals.GetDB().Exec(`DELETE FROM print_setting WHERE print_no = ?`, []interface{}{printNo}...)
 	return err
 }
 
-// GetUserPrintSetting 获取用户打印机设置
-func (p *PrintSettingDao) GetUserPrintSetting(userId, printNo string) {
-	sql := `
-	SELECT
-		s.* 
-	FROM
-		printer p
-		INNER JOIN print_setting s ON s.print_no = p.print_no 
-	WHERE
-		p.user_id = ? 
-		AND p.print_no = ?
-`
-	param := []interface{}{userId, printNo}
-
-	var setting *settingModel.PrintSetting
-	if err := globals.GetDB().QueryRow(sql, param...).Scan(&setting); err != nil {
-		return
-	}
-	if setting == nil {
-		return
-	}
-
-	//json.Unmarshal([]byte(setting.))
-}
-
 // QueryPrintSetting 查询打印机设置
 func (p *PrintSettingDao) QueryPrintSetting(printNo string) (*settingModel.PrintSetting, error) {
-	var result *settingModel.PrintSetting
-	if err := globals.GetDB().QueryRow(`SELECT * FROM print_setting WHERE print_no = ? AND deleted_at = ?`, printNo, utils.DefaultTimeValue).Scan(&result); err != nil {
+	var result []*settingModel.PrintSetting
+	if err := globals.GetDB().Select(&result, `SELECT * FROM print_setting WHERE print_no = ? AND deleted_at = ?`, printNo, utils.DefaultTimeValue); err != nil {
 		return nil, err
 	}
-
-	return result, nil
+	if len(result) != 1 {
+		return nil, fmt.Errorf("打印机设置查询错误,联系管理员")
+	}
+	return result[0], nil
 }