1

business/jxstore/cms/print.go

@@ -62,13 +62,15 @@ func AddPrinter(appID int, printers []*model.AddPrinterParam) (err error) {
 				continue
 			}
 			have := false
+			userId := ""
 			for _, bsl := range bindStoreList {
 				if bsl.StoreID == v.StoreId {
 					have = true
+					userId = bsl.UserId
 				}
 			}
 			if !have {
-				if err := dao.BindStoreList(printers[0]); err != nil {
+				if err := dao.BindStoreList(printers[0], userId); err != nil {
 					errs = append(errs, fmt.Errorf("BindStoreList err : %v ", err))
 					continue
 				}
@@ -81,6 +83,16 @@ func AddPrinter(appID int, printers []*model.AddPrinterParam) (err error) {
 			errs = append(errs, err)
 			continue
 		}
+		// 检查心跳
+		exits, err := dao.CheckHeard(v.PrintNo)
+		if err != nil {
+			errs = append(errs, fmt.Errorf("CheckHeard err : %v ", err))
+			continue
+		}
+		if !exits {
+			errs = append(errs, fmt.Errorf("打印机未激活,请激活后在绑定"))
+			continue
+		}
 
 		printer := &model.Printer{
 			AppID:        appID,
@@ -159,7 +171,7 @@ func InitPrint(printer *model.Printer, printParam *model.AddPrinterParam) error
 	}
 
 	// 初始化绑定信息
-	if err := dao.BindStoreList(printParam); err != nil {
+	if err := dao.BindStoreList(printParam, ""); err != nil {
 		txDb.Rollback()
 		return err
 	}