设备下线处理

invoice/src/entity/invoice.go

@@ -114,34 +114,34 @@ type MailboxConf struct {
 	SMTPPort int
 }
 
-var SuccessCode string
-var LineUpCode string
-var TimingCron string
-var WaitCode string
-var OpenTimingCron string
-var Url string
-var SealCode string
-var PdfUrl string
-
-var Title string
-var Body string
-var Sender string
-var SPassword string
-var SMTPAddr string
-var SMTPPort int
-
-var SaleTax string
-var InvType string
-var BillType string
-var SpecialRedFlag string
-var OperationCode string
-var Verified string
-var Kpr string
-var JyUrl string
-var Frequency int
-var OpenFrequency int
-var WarningEmail string
-var Fhr string
-var Sky string
-var WarningTime int64
-var NsqUrl string
+var (
+	SuccessCode    string
+	LineUpCode     string
+	TimingCron     string
+	WaitCode       string
+	OpenTimingCron string
+	Url            string
+	SealCode       string
+	PdfUrl         string
+	Title          string
+	Body           string
+	Sender         string
+	SPassword      string
+	SMTPAddr       string
+	SMTPPort       int
+	SaleTax        string
+	InvType        string
+	BillType       string
+	SpecialRedFlag string
+	OperationCode  string
+	Verified       string
+	Kpr            string
+	JyUrl          string
+	Frequency      int
+	OpenFrequency  int
+	WarningEmail   string
+	Fhr            string
+	Sky            string
+	WarningTime    int64
+	NsqUrl         string
+)

invoice/src/service/InvoiceService.go

@@ -168,6 +168,8 @@ func (u *InvoiceService) InvoiceDownload(swno string, saleTax string, isRed stri
 	//排队中
 	//dat.ReturnMsg.MsgCode="1089"
 
+	//设备不在线
+	dat.ReturnMsg.MsgCode = "22"
 	//失败
 	//dat.ReturnMsg.MsgCode = "1000"
 	util.Loger.Println("发票下载:", "流水号：", swno, "结果:", dat)
@@ -181,28 +183,22 @@ func (u *InvoiceService) InvoiceDownload(swno string, saleTax string, isRed stri
 		fmt.Println(swno1)
 		pdfData := make(map[string]interface{})
 		path := util.ImgHandle(dat.FpMsgs[0].PdfContent, swno, saleTax, swno1)
-		//path := "/c/v/c/v"
 		pdfData["path"] = path
 		pdfData["fpdm"] = dat.FpMsgs[0].Fpdm
 		pdfData["fphm"] = dat.FpMsgs[0].Fphm
 		pdfData["swno"] = swno
 		return pdfData, 0, dat.ReturnMsg.Msg
-		//} else if dat.ReturnMsg.MsgCode == entity.LineUpCode || dat.ReturnMsg.MsgCode == entity.SealCode || dat.ReturnMsg.MsgCode == "20" || dat.ReturnMsg.MsgCode == entity.WaitCode {
-		//	if isLoop == 0 {
-		//		u.Timer(swno, saleTax, isRed, isfeedback, changed, resType, orderCode)
-		//	}
-		//	return nil, 2, dat.ReturnMsg.Msg
-		//} else {
-		//	arr := strings.Split(entity.WarningEmail, ",")
-		//	util.SendPdf(arr, true, swno, "发票下载时出现问题,"+dat.ReturnMsg.Msg)
-		//	return nil, 1, dat.ReturnMsg.Msg
-		//}
-	} else {
+	} else if dat.ReturnMsg.MsgCode == entity.LineUpCode || dat.ReturnMsg.MsgCode == entity.SealCode || dat.ReturnMsg.MsgCode == "20" || dat.ReturnMsg.MsgCode == entity.WaitCode || dat.ReturnMsg.MsgCode == "22" {
 		if isLoop == 0 {
 			u.Timer(swno, saleTax, isRed, isfeedback, changed, resType, orderCode)
 		}
 		return nil, 2, dat.ReturnMsg.Msg
+	} else {
+		arr := strings.Split(entity.WarningEmail, ",")
+		util.SendPdf(arr, true, swno, "发票下载时出现问题,"+dat.ReturnMsg.Msg)
+		return nil, 1, dat.ReturnMsg.Msg
 	}
+
 }
 
 // 发票是否存在

invoice/src/util/push.go

@@ -95,8 +95,8 @@ type Msg struct {
 func SendPdf(emailArr []string, fool bool, orderCode string, msg string) bool {
 	//自定义需要的字段
 	errMap := map[string]interface{}{
-		"order_code": "订单号",
-		"需要记录的参数":    "相关参数",
+		/*"order_code": "订单号",
+		"需要记录的参数":    "相关参数",*/
 	}
 	//nsq
 	text := ""