From 81ba7e7366572bf833bfe87893af96c4ff7f1a92 Mon Sep 17 00:00:00 2001
From: suyl <770236076@qq.com>
Date: Fri, 13 Aug 2021 11:20:15 +0800
Subject: [PATCH] aa

---
 model/model.go    |  1 +
 services/order.go | 10 ++++++----
 services/sim.go   | 16 +++++++++++-----
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/model/model.go b/model/model.go
index b8220a5..893105c 100644
--- a/model/model.go
+++ b/model/model.go
@@ -169,6 +169,7 @@ type Printer struct {
 	Sound        string     `json:"sound"`                    //声音类型 sounda ,b,c,d,e,f,g
 	Volume       int        `json:"volume"`                   //音量，1-5 ，对应打印机2-10
 	FlowFlag     int        `json:"flow_flag" db:"flow_flag"` //是否超流量了，1表示超了
+	OfflineCount int        `json:"-" db:"offline_count"`     //掉线次数
 }
 
 type PrintMsg struct {
diff --git a/services/order.go b/services/order.go
index 0686cea..4fc6b05 100644
--- a/services/order.go
+++ b/services/order.go
@@ -94,11 +94,13 @@ var (
 			sumIncome, _ := dao.GetSimFlowIncomeSum(db, iccID, monthBegin, monthEnd)
 			sumExpend, _ := dao.GetSimFlowExpendSum(db, iccID, monthBegin, monthEnd)
 			if sumIncome != nil && sumExpend != nil {
-				if sumIncome.Flow-sumExpend.Flow <= 0 {
-					if printer, err := dao.GetPrinter(db, "", iccID); err == nil && printer != nil {
-						printer.FlowFlag = 1
-						err = dao.Update(db, printer, "flow_flag")
+				if printer, err := dao.GetPrinter(db, "", iccID); err == nil && printer != nil {
+					flowFlag := 0
+					if sumIncome.Flow-sumExpend.Flow <= 0 {
+						flowFlag = 1
 					}
+					printer.FlowFlag = flowFlag
+					err = dao.Update(db, printer, "flow_flag")
 				}
 			}
 			return err
diff --git a/services/sim.go b/services/sim.go
index a35b863..9b11a30 100644
--- a/services/sim.go
+++ b/services/sim.go
@@ -72,8 +72,10 @@ func SimFlowDaySettle() (err error) {
 			if sumIncome != nil && sumExpend != nil {
 				if sumIncome.Flow-sumExpend.Flow <= 0 {
 					v.FlowFlag = 1
-					err = dao.Update(db, v, "flow_flag")
+				} else {
+					v.FlowFlag = 0
 				}
+				err = dao.Update(db, v, "flow_flag")
 			}
 		}
 	}
@@ -93,7 +95,11 @@ func SimFlowMonthSettle() {
 	printers, _ := dao.GetPrinters(db, 0, "", 0, 0, 0)
 	for _, v := range printers {
 		if v.IccID != "" {
-			FlowIncome(db, v.IccID, 30, "MB", model.FlowIncomeTypeJX)
+			if err := FlowIncome(db, v.IccID, 30, "MB", model.FlowIncomeTypeJX); err == nil {
+				//划转后，每个月月初打印机都应该是不缺流量的状态
+				v.FlowFlag = 0
+				dao.Update(db, v, "flow_flag")
+			}
 		}
 	}
 }
@@ -107,11 +113,11 @@ func FlowIncome(db *sqlx.DB, iccID string, flow float64, unit string, incomeType
 		CreatedAt:    &now,
 		UpdatedAt:    &now,
 		LastOperator: "jxadmin",
-		Flow:         30,
-		FlowUnit:     "MB",
+		Flow:         flow,
+		FlowUnit:     unit,
 		IncomeType:   incomeType,
 	}
-	dao.Insert(db, flowIncome)
+	err = dao.Insert(db, flowIncome)
 	return err
 }