liulei/jx-print
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aa

Browse Source
This commit is contained in:
suyl
2021-08-13 11:20:15 +08:00
parent 0d3d12d7a5
commit 81ba7e7366
3 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
model/model.go
View File

@@ -169,6 +169,7 @@ type Printer struct {
Sound string `json:"sound"` //声音类型 sounda ,b,c,d,e,f,g Sound string `json:"sound"` //声音类型 sounda ,b,c,d,e,f,g
Volume int `json:"volume"` //音量，1-5 ，对应打印机2-10 Volume int `json:"volume"` //音量，1-5 ，对应打印机2-10
FlowFlag int `json:"flow_flag" db:"flow_flag"` //是否超流量了，1表示超了 FlowFlag int `json:"flow_flag" db:"flow_flag"` //是否超流量了，1表示超了
OfflineCount int `json:"-" db:"offline_count"` //掉线次数
} }
type PrintMsg struct { type PrintMsg struct {

10
services/order.go
View File

@@ -94,11 +94,13 @@ var (
sumIncome, _ := dao.GetSimFlowIncomeSum(db, iccID, monthBegin, monthEnd) sumIncome, _ := dao.GetSimFlowIncomeSum(db, iccID, monthBegin, monthEnd)
sumExpend, _ := dao.GetSimFlowExpendSum(db, iccID, monthBegin, monthEnd) sumExpend, _ := dao.GetSimFlowExpendSum(db, iccID, monthBegin, monthEnd)
if sumIncome != nil && sumExpend != nil { if sumIncome != nil && sumExpend != nil {
if sumIncome.Flow-sumExpend.Flow <= 0 { if printer, err := dao.GetPrinter(db, "", iccID); err == nil && printer != nil {
if printer, err := dao.GetPrinter(db, "", iccID); err == nil && printer != nil { flowFlag := 0
printer.FlowFlag = 1 if sumIncome.Flow-sumExpend.Flow <= 0 {
err = dao.Update(db, printer, "flow_flag") flowFlag = 1
} }
printer.FlowFlag = flowFlag
err = dao.Update(db, printer, "flow_flag")
} }
} }
return err return err

16
services/sim.go
View File

@@ -72,8 +72,10 @@ func SimFlowDaySettle() (err error) {
if sumIncome != nil && sumExpend != nil { if sumIncome != nil && sumExpend != nil {
if sumIncome.Flow-sumExpend.Flow <= 0 { if sumIncome.Flow-sumExpend.Flow <= 0 {
v.FlowFlag = 1 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) printers, _ := dao.GetPrinters(db, 0, "", 0, 0, 0)
for _, v := range printers { for _, v := range printers {
if v.IccID != "" { 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, CreatedAt: &now,
UpdatedAt: &now, UpdatedAt: &now,
LastOperator: "jxadmin", LastOperator: "jxadmin",
Flow: 30, Flow: flow,
FlowUnit: "MB", FlowUnit: unit,
IncomeType: incomeType, IncomeType: incomeType,
} }
dao.Insert(db, flowIncome) err = dao.Insert(db, flowIncome)
return err return err
} }