aa

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
 }