tijiao

invoice/src/service/InvoiceService.go

@@ -45,17 +45,17 @@ func (u *InvoiceService) InvoiceAdd(solgan *entity.Invoice, resType string, isLo
 	solgan.Sky = entity.Sky
 	now := time.Now()
 	solgan.BillDate = now.Format("2006-01-02 15:04:05")
-	/*url := entity.Url + "?build_invoice"
+	url := entity.Url + "?build_invoice"
 	util.Loger.Println("流水号：", solgan.Swno, "开具发票:数据", solgan)
 	bytesData, _ := json.Marshal(solgan)
 	reader := bytes.NewReader(bytesData)
 	request, _ := http.NewRequest("POST", url, reader)
 	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
 	client := http.Client{}
-	resp, err := client.Do(request)*/
+	resp, err := client.Do(request)
 	//不成功时
-	var err error
-	err = nil
+	//var err error
+	//err = nil
 	//正常
 	if (err != nil) {
 		//if (err == nil) {
@@ -74,15 +74,15 @@ func (u *InvoiceService) InvoiceAdd(solgan *entity.Invoice, resType string, isLo
 		data1["path"] = ""
 		return "剑鱼标讯订开票服务预警", 3, data1
 	}
-	/*respBytes, err := ioutil.ReadAll(resp.Body)
+	respBytes, err := ioutil.ReadAll(resp.Body)
 	fmt.Sprint(err)
 	data := make(map[string]interface{})
 	if err := json.Unmarshal([]byte(respBytes), &data); err == nil {
 		fmt.Println(solgan.Swno, "开票返回值：", data)
-	}*/
+	}
 	//开具成功
-	data := make(map[string]interface{})
-	data["returnCode"] = "0000"
+	//data := make(map[string]interface{})
+	//data["returnCode"] = "0000"
 
 	//开具失败
 	//data["returnCode"]="100"
@@ -114,21 +114,21 @@ func (u *InvoiceService) InvoiceDownload(swno string, saleTax string, isRed stri
 	song["saleTax"] = saleTax
 	bytesData, _ := json.Marshal(song)
 	fmt.Println("json", string(bytesData))
-	/*
-		url := entity.Url + "?get_invoice"
-		reader := bytes.NewReader(bytesData)
-		request, err := http.NewRequest("POST", url, reader)
-		fmt.Println(err)
-		request.Header.Set("Content-Type", "application/json;charset=UTF-8")
-		client := http.Client{}
-		resp, err := client.Do(request)*/
+
+	url := entity.Url + "?get_invoice"
+	reader := bytes.NewReader(bytesData)
+	request, err := http.NewRequest("POST", url, reader)
+	fmt.Println(err)
+	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+	client := http.Client{}
+	resp, err := client.Do(request)
 
 	//不成功时
-	var err error
-	err = nil
+	//var err error
+	//err = nil
 	//正常
 	//if (err != nil) {
-	if (err == nil) {
+	if (err != nil) {
 		data1 := make(map[string]interface{})
 		data1["fpdm"] = ""
 		data1["fphm"] = ""
@@ -151,23 +151,22 @@ func (u *InvoiceService) InvoiceDownload(swno string, saleTax string, isRed stri
 		return data1, 2, "剑鱼标讯订开票服务预警"
 	}
 	//正常
-	/*respBytes, err := ioutil.ReadAll(resp.Body)
+	respBytes, err := ioutil.ReadAll(resp.Body)
 	var dat *entity.GetInvoice
 	util.Loger.Println("发票下载:", "流水号：", swno, "结果:", respBytes)
 	if err := json.Unmarshal([]byte(respBytes), &dat); err == nil {
 		fmt.Println(swno, "发票下载返回值：", dat)
-	}*/
+	}
 
 	//异常
-	dat := entity.GetInvoice{}
+	//dat := entity.GetInvoice{}
 	//dat.ReturnMsg.MsgCode = "0000"
 
 	//排队中
-	dat.ReturnMsg.MsgCode="1089"
+	//dat.ReturnMsg.MsgCode="1089"
 
 	//失败
-	dat.ReturnMsg.MsgCode = "1000"
-
+	//dat.ReturnMsg.MsgCode = "1000"
 	util.Loger.Println("发票下载:", "流水号：", swno, "结果:", dat)
 	//dat.ReturnMsg.MsgCode = entity.LineUpCode
 	if (dat.ReturnMsg.MsgCode == entity.SuccessCode) {
@@ -179,13 +178,13 @@ 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"
+		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["fpdm"] = "Fpdm"
-		pdfData["fphm"] = "Fphm"
+		pdfData["fpdm"] = dat.FpMsgs[0].Fpdm
+		pdfData["fphm"] = dat.FpMsgs[0].Fphm
+		/*pdfData["fpdm"] = "Fpdm"
+		pdfData["fphm"] = "Fphm"*/
 		pdfData["swno"] = swno
 		return pdfData, 0, dat.ReturnMsg.Msg
 	} else if (dat.ReturnMsg.MsgCode == entity.LineUpCode || dat.ReturnMsg.MsgCode == entity.SealCode) {