修改打印机绑定

business/jxstore/cms/print.go

@@ -76,10 +76,8 @@ func AddPrinter(appID int, printers []*model.AddPrinterParam) (err error) {
 		}
 
 		// 创建打印机
-		dao.WrapAddIDCULDEntity(printer, "")
+		if err := InitPrint(printer); err != nil {
-		if err = dao.CreateEntity(db, printer); err != nil {
+			return err
-			errs = append(errs, err)
-			continue
 		}
 	}
 	if len(errs) > 0 {
@@ -98,15 +96,15 @@ func InitPrint(printer *model.Printer) error {
 	}
 
 	// 打印机标号唯一,判断打印机是否存在设置
-	var setting *model.PrintSetting
+	//var setting []*model.PrintSetting
-	if err := dao.GetRowTx(txDb, &setting, `SELECT * FROM print_setting WHERE print_no = ?`, []interface{}{printer.PrintNo}...); err != nil {
+	//if err := dao.GetRowsTx(txDb, &setting, `SELECT * FROM print_setting WHERE print_no = ?`, []interface{}{printer.PrintNo}...); err != nil {
-		txDb.Rollback()
+	//	txDb.Rollback()
-		return err
+	//	return err
-	}
+	//}
-	if setting != nil {
+	//if len(setting) == 0 {
-		txDb.Rollback()
+	//	txDb.Rollback()
-		return fmt.Errorf("此打印机已经被绑定过了")
+	//	return fmt.Errorf("此打印机已经被绑定过了")
-	}
+	//}
 
 	// 赋予打印机默认配置
 	day := time.Now()
@@ -121,7 +119,24 @@ func InitPrint(printer *model.Printer) error {
 	if err != nil {
 		return err
 	}
-	dao.CreateEntityTx(txDb, &param)
+	if err := dao.CreateEntityTx(txDb, param); err != nil {
+		txDb.Rollback()
+		return err
+	}
+
+	// 初始化打印机账户
+	if err := dao.CreateEntityTx(txDb, &model.PrintBill{
+		CreatedAt:    time.Now(),
+		UpdatedAt:    time.Now(),
+		PrintNo:      param.PrintNo,
+		PrintBalance: 20000,
+		UserId:       "system",
+	}); err != nil {
+		txDb.Rollback()
+		return err
+	}
+	defer txDb.Commit()
+	return err
 }
 
 // MarshalJson2String 工具类