开票中处理

invoice/src/service/InvoiceService.go

@@ -154,7 +154,7 @@ func (u *InvoiceService) InvoiceDownload(swno string, saleTax string, isRed stri
 	//正常
 	respBytes, err := ioutil.ReadAll(resp.Body)
 	var dat *entity.GetInvoice
-	util.Loger.Println("发票下载:", "流水号：", swno, "结果:", respBytes)
+	util.Loger.Println("发票下载:", "流水号：", swno, "结果:")
 	if err := json.Unmarshal([]byte(respBytes), &dat); err == nil {
 		fmt.Println(swno, "发票下载返回值：", dat)
 	}
@@ -169,7 +169,6 @@ func (u *InvoiceService) InvoiceDownload(swno string, saleTax string, isRed stri
 	//失败
 	//dat.ReturnMsg.MsgCode = "1000"
 	util.Loger.Println("发票下载:", "流水号：", swno, "结果:", dat)
-	//dat.ReturnMsg.MsgCode = entity.LineUpCode
 	if dat.ReturnMsg.MsgCode == entity.SuccessCode {
 		var swno1 string
 		if isRed == "true" {
@@ -188,7 +187,7 @@ func (u *InvoiceService) InvoiceDownload(swno string, saleTax string, isRed stri
 		pdfData["fphm"] = "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 == entity.WaitCode {
+	} 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)
 		}
@@ -234,6 +233,7 @@ func (u *InvoiceService) InvoiceRedSubmit(fpdm string, fphm string, orderCode st
 	song := make(map[string]interface{})
 	song["fpdm"] = fpdm
 	song["fphm"] = fphm
+	song["redcode"] = solgan.Redcode
 	solgan.Yfphm = fphm
 	solgan.Yfpdm = fpdm
 	solgan.IsRed = "true"
@@ -272,8 +272,6 @@ func (u *InvoiceService) InvoiceRedSubmit(fpdm string, fphm string, orderCode st
 	if err := json.Unmarshal([]byte(respBytes), &data); err == nil {
 		fmt.Println(fphm, "冲红返回值：", data)
 	}
-	util.Loger.Println("冲红:", "发票单号:", fpdm, "发票号码:", fphm, "结果:", data)
-	//data["returnCode"] = entity.LineUpCode
 	if data["returnCode"] == entity.LineUpCode || data["returnCode"] == entity.SealCode || data["returnCode"] == entity.SuccessCode || data["returnCode"] == entity.WaitCode {
 		pdfData, code, msg := u.InvoiceDownload(data["redSwno"].(string), data["saleTax"].(string), "true", int(0), int(0), changed, resType, orderCode)
 		if fmt.Sprint(code) == "0" {
@@ -293,9 +291,10 @@ func (u *InvoiceService) InvoiceRedSubmit(fpdm string, fphm string, orderCode st
 			}
 			return msg, code, data1
 		}
-	} else if data["returnCode"] == "3002" {
+	} else if data["returnCode"] == "3001" {
 		return "已经冲红", 4, data
 	} else {
+		util.SendPdf(nil, true, solgan.Swno, "发票退票失败"+fmt.Sprint(data))
 		return fmt.Sprintln(data["returnMsg"]), 1, data
 	}
 }
@@ -306,13 +305,16 @@ func (u *InvoiceService) InvoiceReplace(solgan *entity.Invoice, resType string)
 	solgan.Model = "2"
 	solgan.OrderCode = solgan.Swno
 	msg, code1, dataMap := invoiceService.InvoiceRedSubmit(solgan.Yfpdm, solgan.Yfphm, solgan.Swno, resType, solgan.Changed, 0, solgan)
-	util.Loger.Println("换票:", "发票单号:", solgan.Yfpdm, "发票号码:", solgan.Yfphm)
 	if code1 == 1 {
 		return msg, code1, dataMap
 	}
 	if code1 == 3 {
 		return msg, 2, dataMap
 	}
+	if code1 == 4 {
+		return msg, 1, dataMap
+	}
+	util.Loger.Println("换票:", "发票单号:", solgan.Yfpdm, "发票号码:", solgan.Yfphm)
 	solgan.Yfphm = ""
 	solgan.Yfpdm = ""
 	solgan.Model = "0"
@@ -444,7 +446,7 @@ func (u *InvoiceService) OpeningTimer(solgan *entity.Invoice) {
 	c := cron.New()
 	spec := entity.OpenTimingCron
 	c.AddFunc(spec, func() { // AddFunc 是添加任务的地方，此函数接收两个参数，第一个为表示定时任务的字符串，第二个为真正的真正的任务。
-		//util.Loger.Println("定时任务重新开票开始:", "流水号：", solgan.Swno)
+		util.Loger.Println("定时任务重新开票开始:", "流水号：", solgan.Swno)
 		swno := ""
 		if solgan.Model == "1" || solgan.Model == "2" {
 			util.Loger.Println("定时任务重新开票开始:", "发票号码：", solgan.Yfphm)