正式环境发版代码修改

invoice/src/service/InvoiceService.go

@@ -45,46 +45,46 @@ func (u *InvoiceService) InvoiceAdd(solgan *entity.Invoice, resType string, isLo
 	solgan.Fhr = entity.Fhr
 	solgan.Sky = entity.Sky
 	//开启
-	/*now := time.Now()
-	        solgan.BillDate = now.Format("2006-01-02 15:04:05")
-	        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)
-	        //不成功时
-	        //var err error
-	        //err = nil
-	        //正常
-	        if err != nil {
-		      //if (err == nil) {
-		      util.Loger.Println("开票服有问题", err)
-		      if isLoop == 0 {
-			    arr := strings.Split(entity.WarningEmail, ",")
-			    util.SendPdf(arr, true, solgan.Swno, "发票开具时服务出现问题")
-			    solgan.ResType = resType
-			    solgan.IsRed = isRed
-			    u.OpeningTimer(solgan)
-		      }
-		      data1 := make(map[string]interface{})
-		      data1["fpdm"] = ""
-		      data1["fphm"] = ""
-		      data1["swno"] = solgan.Swno
-		      data1["path"] = ""
-		      return "剑鱼标讯订开票服务预警", 3, data1
-	        }
-	        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)
-	        }*/
-	//开具成功
+	now := time.Now()
+	solgan.BillDate = now.Format("2006-01-02 15:04:05")
+	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)
+	//不成功时
+	//var err error
+	//err = nil
+	//正常
+	if err != nil {
+		//if (err == nil) {
+		util.Loger.Println("开票服有问题", err)
+		if isLoop == 0 {
+			arr := strings.Split(entity.WarningEmail, ",")
+			util.SendPdf(arr, true, solgan.Swno, "发票开具时服务出现问题")
+			solgan.ResType = resType
+			solgan.IsRed = isRed
+			u.OpeningTimer(solgan)
+		}
+		data1 := make(map[string]interface{})
+		data1["fpdm"] = ""
+		data1["fphm"] = ""
+		data1["swno"] = solgan.Swno
+		data1["path"] = ""
+		return "剑鱼标讯订开票服务预警", 3, data1
+	}
+	respBytes, err := ioutil.ReadAll(resp.Body)
+	fmt.Sprint(err)
 	data := make(map[string]interface{})
-	data["returnCode"] = "0000"
+	if err := json.Unmarshal([]byte(respBytes), &data); err == nil {
+		fmt.Println(solgan.Swno, "开票返回值：", data)
+	}
+	//开具成功
+	/*data := make(map[string]interface{})
+	  data["returnCode"] = "0000"*/
 
 	//开具失败
 	//data["returnCode"]="100"
@@ -115,61 +115,61 @@ func (u *InvoiceService) InvoiceDownload(swno string, saleTax string, isRed stri
 	song["swno"] = swno
 	song["saleTax"] = saleTax
 	//开启
-	/* bytesData, _ := json.Marshal(song)
-	        fmt.Println("json", string(bytesData))
+	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
-	        //正常
-	        //if (err != nil) {
-	        if err != nil {
-		      data1 := make(map[string]interface{})
-		      data1["fpdm"] = ""
-		      data1["fphm"] = ""
-		      data1["swno"] = ""
-		      data1["path"] = ""
-		      starTime := time.Now().Unix()
-		      if isLoop == 0 {
-			    arr := strings.Split(entity.WarningEmail, ",")
-			    util.SendPdf(arr, true, swno, "发票下载时服务出现问题")
-			    solgan := entity.Invoice{
-				  Swno:    swno,
-				  SaleTax: saleTax,
-				  IsRed:   isRed,
-				  Changed: changed,
-				  ResType: resType,
-			    }
-			    u.OpeningTimer(&solgan)
-		      }
-		      fmt.Println("下载用时：", fmt.Sprint(time.Now().Unix()-starTime))
-		      return data1, 2, "剑鱼标讯订开票服务预警"
-	        }
-	        //正常
-	        respBytes, err := ioutil.ReadAll(resp.Body)
-	        var dat *entity.GetInvoice
-	        util.Loger.Println("发票下载:", "流水号：", swno, "结果:")
-	        if err := json.Unmarshal([]byte(respBytes), &dat); err == nil {
-		      fmt.Println(swno, "发票下载返回值：", dat)
-	        }*/
+	//不成功时
+	//var err error
+	//err = nil
+	//正常
+	//if (err != nil) {
+	if err != nil {
+		data1 := make(map[string]interface{})
+		data1["fpdm"] = ""
+		data1["fphm"] = ""
+		data1["swno"] = ""
+		data1["path"] = ""
+		starTime := time.Now().Unix()
+		if isLoop == 0 {
+			arr := strings.Split(entity.WarningEmail, ",")
+			util.SendPdf(arr, true, swno, "发票下载时服务出现问题")
+			solgan := entity.Invoice{
+				Swno:    swno,
+				SaleTax: saleTax,
+				IsRed:   isRed,
+				Changed: changed,
+				ResType: resType,
+			}
+			u.OpeningTimer(&solgan)
+		}
+		fmt.Println("下载用时：", fmt.Sprint(time.Now().Unix()-starTime))
+		return data1, 2, "剑鱼标讯订开票服务预警"
+	}
+	//正常
+	respBytes, err := ioutil.ReadAll(resp.Body)
+	var dat *entity.GetInvoice
+	util.Loger.Println("发票下载:", "流水号：", swno, "结果:")
+	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 = "22"
+	//dat.ReturnMsg.MsgCode = "22"
 	//失败
 	//dat.ReturnMsg.MsgCode = "1000"
 	util.Loger.Println("发票下载:", "流水号：", swno, "结果:", dat)