1

services/print_server/app_server/print_setting.go

@@ -6,6 +6,7 @@ import (
 	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-print/dao"
 	settingModel "git.rosy.net.cn/jx-print/model/app_model"
+	"github.com/jmoiron/sqlx"
 	"time"
 )
 
@@ -17,7 +18,7 @@ var PrintSettingInfoServer = new(PrintSettingServer)
 // UpdatePrintSetting 修改打印机绑定信息
 func (p *PrintSettingServer) UpdatePrintSetting(userId string, param *settingModel.UpdatePrintSetting) error {
 	// 判断打印机和用户是否匹配
-	isTrue, err := dao.GetPrintById(userId, param.PrintNo)
+	isTrue, _, err := dao.GetPrintById(userId, param.PrintNo)
 	if err != nil {
 		return err
 	}
@@ -28,14 +29,14 @@ func (p *PrintSettingServer) UpdatePrintSetting(userId string, param *settingMod
 }
 
 // SystemInitPrintSetting 绑定打印机时初始化一个打印机设置
-func (p *PrintSettingServer) SystemInitPrintSetting(printNo string) error {
+func (p *PrintSettingServer) SystemInitPrintSetting(txDB *sqlx.Tx, printNo string) error {
 	// 打印机标号唯一,判断打印机是否存在设置
 	isHave, err := dao.PrintSettingInfoDao.QueryPrintNoIsExit(printNo)
 	if err != nil {
 		return err
 	}
 	if !isHave {
-		return errors.New("已经存在绑定的打印机设置,联系管理员")
+		return nil
 	}
 	day := time.Now()
 
@@ -51,11 +52,11 @@ func (p *PrintSettingServer) SystemInitPrintSetting(printNo string) error {
 		return err
 	}
 
-	return dao.PrintSettingInfoDao.InsertPrintSetting(param)
+	return dao.PrintSettingInfoDao.InsertPrintSetting(txDB, param)
 }
 
 // DeletePrintSetting 删除打印机设置
-func (p *PrintSettingServer) DeletePrintSetting(printNo []string) error {
+func (p *PrintSettingServer) DeletePrintSetting(printNo string) error {
 	return dao.PrintSettingInfoDao.DeleteSetting(printNo)
 }