From 5b59315547eb99399d51d1f44a91a8c1b4ab43e6 Mon Sep 17 00:00:00 2001
From: suyl <770236076@qq.com>
Date: Wed, 21 Jul 2021 10:03:53 +0800
Subject: [PATCH] aa

---
 dao/print_dao.go  |  6 +++++-
 services/print.go | 10 +++++-----
 services/sim.go   |  6 ++++--
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/dao/print_dao.go b/dao/print_dao.go
index b512723..ee50045 100644
--- a/dao/print_dao.go
+++ b/dao/print_dao.go
@@ -7,7 +7,7 @@ import (
 	"time"
 )
 
-func GetPrinters(db *sqlx.DB, appID int, printNo string, status int, statusNeq int) (printers []*model.Printer, err error) {
+func GetPrinters(db *sqlx.DB, appID int, printNo string, status int, statusNeq int, flowFlag int) (printers []*model.Printer, err error) {
 	sql := `
 		SELECT * 
 		  FROM printer 
@@ -30,6 +30,10 @@ func GetPrinters(db *sqlx.DB, appID int, printNo string, status int, statusNeq i
 		sql += " AND status <> ?"
 		sqlParams = append(sqlParams, statusNeq)
 	}
+	if flowFlag != 0 {
+		sql += " AND flow_flag = ?"
+		sqlParams = append(sqlParams, flowFlag)
+	}
 	if err = db.Select(&printers, sql, sqlParams...); err == nil {
 		return printers, err
 	}
diff --git a/services/print.go b/services/print.go
index 747f924..889021f 100644
--- a/services/print.go
+++ b/services/print.go
@@ -38,7 +38,7 @@ func AddPrinters(c *gin.Context, tokenInfo *model.TokenInfo, appID int, printInf
 			errs = append(errs, fmt.Errorf("请输入正确的打印机编号！print_no :%s 。", v.PrintNo))
 			continue
 		}
-		printers, _ := dao.GetPrinters(db, appID, v.PrintNo, 0, 0)
+		printers, _ := dao.GetPrinters(db, appID, v.PrintNo, 0, 0, 0)
 		if len(printers) > 0 {
 			errs = append(errs, fmt.Errorf("此打印机已被其他应用绑定！print_no :%s 。", v.PrintNo))
 			continue
@@ -88,7 +88,7 @@ func DelPrinters(c *gin.Context, appID int, tokenInfo *model.TokenInfo, printNos
 			errs = append(errs, fmt.Errorf("请输入正确的打印机编号！print_no :%s 。", v))
 			continue
 		}
-		printers, _ := dao.GetPrinters(db, appID, v, 0, 0)
+		printers, _ := dao.GetPrinters(db, appID, v, 0, 0, 0)
 		if len(printers) == 0 {
 			errs = append(errs, fmt.Errorf("未在该应用下查到此打印机！app_id: %d, print_no: %s", appID, v))
 			continue
@@ -116,7 +116,7 @@ func UpdatePrinter(c *gin.Context, appID int, tokenInfo *model.TokenInfo, printN
 		return fmt.Errorf("未查询到此应用！app_id:%d", appID)
 	}
 
-	printers, _ := dao.GetPrinters(db, appID, printNo, 0, 0)
+	printers, _ := dao.GetPrinters(db, appID, printNo, 0, 0, 0)
 	if len(printers) == 0 {
 		return fmt.Errorf("未在该应用下查到此打印机！app_id: %d, print_no: %s", appID, printNo)
 	}
@@ -155,7 +155,7 @@ func TestPrint(c *gin.Context, appID int, tokenInfo *model.TokenInfo, printNo st
 	if apps, _ := dao.GetApps(db, appID, tokenInfo.User.UserID, ""); len(apps) == 0 {
 		return "", fmt.Errorf("未查询到此应用！app_id:%d", appID)
 	}
-	printers, _ := dao.GetPrinters(db, appID, printNo, 0, 0)
+	printers, _ := dao.GetPrinters(db, appID, printNo, 0, 0, 0)
 	if len(printers) == 0 {
 		return "", fmt.Errorf("未在该应用下查到此打印机！app_id: %d, print_no: %s", appID, printNo)
 	}
@@ -180,7 +180,7 @@ func GetPrintMessages(c *gin.Context, appID int, tokenInfo *model.TokenInfo, pri
 	if apps, _ := dao.GetApps(db, appID, tokenInfo.User.UserID, ""); len(apps) == 0 {
 		return nil, fmt.Errorf("未查询到此应用！app_id:%d", appID)
 	}
-	printers, _ := dao.GetPrinters(db, appID, printNo, 0, 0)
+	printers, _ := dao.GetPrinters(db, appID, printNo, 0, 0, 0)
 	if len(printers) == 0 {
 		return nil, fmt.Errorf("未在该应用下查到此打印机！app_id: %d, print_no: %s", appID, printNo)
 	}
diff --git a/services/sim.go b/services/sim.go
index c97db9b..0ada63a 100644
--- a/services/sim.go
+++ b/services/sim.go
@@ -1,6 +1,7 @@
 package services
 
 import (
+	"fmt"
 	"git.rosy.net.cn/baseapi/platformapi/tibiotapi"
 	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-print/dao"
@@ -26,7 +27,8 @@ func SimFlowDaySettle() (err error) {
 		return
 	}
 	//找出所有状态不为 超流量的打印机（iccid卡）
-	printers, _ := dao.GetPrinters(db, 0, "", 0, model.PrinterStatusOverFlow)
+	printers, _ := dao.GetPrinters(db, 0, "", 0, 0, 0)
+	fmt.Println("1111111111111111", utils.Format4Output(printers, true))
 	for _, v := range printers {
 		//查询前一日使用的流量数
 		if v.IccID != "" {
@@ -83,7 +85,7 @@ func SimFlowMonthSettle() {
 		return
 	}
 	//找出所有有iccid 卡的
-	printers, _ := dao.GetPrinters(db, 0, "", 0, model.PrinterStatusOverFlow)
+	printers, _ := dao.GetPrinters(db, 0, "", 0, 0, 0)
 	for _, v := range printers {
 		if v.IccID != "" {
 			flowIncome := &model.SimFlowIncome{