merge

invoice/src/service/InvoiceService.go

@@ -38,14 +38,29 @@ func (u *InvoiceService) InvoiceAdd(solgan *entity.Invoice) (string, int, interf
 	util.Loger.Println("开具发票:数据", solgan)
 	util.Loger.Println("开具发票:结果", data)
 	if (data["returnCode"] == entity.SuccessCode) {
-		pdfData,_,_:=u.InvoiceDownload(solgan.Swno, solgan.SaleTax,0)
-		data["fpdm"]=pdfData["fpdm"]
-		data["fphm"]=pdfData["fphm"]
+		pdfData,code,msg:=u.InvoiceDownload(solgan.Swno, solgan.SaleTax,0)
+		if(code==0){
+			data["fpdm"]=pdfData["fpdm"]
+			data["fphm"]=pdfData["fphm"]
+			return fmt.Sprintln(data["returnMsg"]), 0, data
+		}else if(code==1){
+			return msg, 1, data
+		}else{
+			return msg, 2, data
+		}
 		return fmt.Sprintln(data["returnMsg"]), 0, data
 	} else if (data["returnCode"] == entity.LineUpCode || data["returnCode"] == entity.SealCode) {
-		u.InvoiceDownload(solgan.Swno, solgan.SaleTax,0)
-		fmt.Println("完成")
-		return fmt.Sprintln(data["returnMsg"]), 2, data
+		pdfData,code,msg:=u.InvoiceDownload(solgan.Swno, solgan.SaleTax,0)
+		if(code==0){
+			data["fpdm"]=pdfData["fpdm"]
+			data["fphm"]=pdfData["fphm"]
+			return fmt.Sprintln(data["returnMsg"]), 0, data
+		}else if(code==1){
+			return msg, 1, data
+		}else{
+			return msg, 2, data
+		}
+
 	} else {
 		return fmt.Sprintln(data["returnMsg"]), 1, data
 	}
@@ -77,7 +92,7 @@ func (u *InvoiceService) InvoiceDownload(swno string, saleTax string,model int)
 			swno=swno[4 : len(swno)]
 		}
 		pdfData := make(map[string]interface{})
-		path := util.ImgHandle(dat.FpMsgs[0].PdfContent, swno)
+		path := util.ImgHandle(dat.FpMsgs[0].PdfContent, swno,saleTax)
 		pdfData["path"] = path
 		pdfData["fpdm"] = dat.FpMsgs[0].Fpdm
 		pdfData["fphm"] = dat.FpMsgs[0].Fphm
@@ -101,11 +116,11 @@ func (u *InvoiceService) InvoiceDownload(swno string, saleTax string,model int)
 // 发票是否存在
 //noinspection ALL
 func (u *InvoiceService) InvoiceSee(swno string, saleTax string) (int, interface{}, string) {
-	fool := util.Exists("./static/res/" + swno + "/")
+	fool := util.Exists("./static/res/" + saleTax + "/")
 	msg := "发票地址"
 	if fool {
 		pdfData:=make(map[string]interface{})
-		pdfData["path"] = entity.PdfUrl+"/static/res/" + swno + "/" + swno + ".pdf"
+		pdfData["path"] = entity.PdfUrl+"/static/res/" +saleTax+"/" + swno + ".pdf"
 		return 0, pdfData, msg
 	} else {
 		path, numb, _ := u.InvoiceDownload(swno, saleTax,0)

invoice/src/util/push.go

@@ -25,15 +25,15 @@ func Exists(path string) (bool) {
 }
 
 //base64转pdf存本地
-func ImgHandle(imgBase64 string, swno string) string {
+func ImgHandle(imgBase64 string, swno string,saleTax string) string {
 	imgs, err := base64.StdEncoding.DecodeString(imgBase64)
 	if err != nil {
 		fmt.Println(err)
 	}
 	imgname := swno  + ".pdf"
-	exPath := "./static/res/" + swno + "/"
-	exPath1 := "/static/res/" + swno + "/"
-	os.MkdirAll("./static/res/"+swno, os.ModePerm)
+	exPath := "./static/res/" + saleTax + "/"
+	exPath1 := "/static/res/" + saleTax + "/"
+	os.MkdirAll("./static/res/"+saleTax, os.ModePerm)
 	file, err := os.OpenFile(exPath+imgname, os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0644)
 	if err != nil {
 		fmt.Println(err)