Merge branch 'dev_v4.8.87_wh' of qmx/jy into hotfix/v4.8.87.1

src/jfw/modules/subscribepay/src/service/invoice.go

@@ -1301,6 +1301,9 @@ func htjs(body map[string]interface{}, orderCode []string, invoiceType, companyN
 			}
 			defer response.Body.Close()
 			resData := (*resMap)["data"].(map[string]interface{})
+			if invoice_status == 1 {
+				sendMail(invoiceType, strings.Join(orderCode, ","), companyName, taxpayerIdentnum, mail, phone, qutil.InterfaceToStr(resData["path"]))
+			}
 			for _, v := range orderCode {
 				util.Mysql.Update(dbname, map[string]interface{}{"order_code": v, "invoice_status": 0}, map[string]interface{}{
 					"invoice_serialnum": resData["swno"],
@@ -1320,7 +1323,6 @@ func htjs(body map[string]interface{}, orderCode []string, invoiceType, companyN
 					"order_code": v,
 				}, updateData)
 			}
-			sendMail(invoiceType, strings.Join(orderCode, ","), companyName, taxpayerIdentnum, mail, phone, qutil.InterfaceToStr(resData["path"]))
 		}
 	}
 }