Merge branch 'dev/4.9.36_fu' of https://jygit.jydev.jianyu360.cn/qmx/jy into dev/4.9.36_fu

src/jfw/modules/subscribepay/src/entity/dataexport.go

@@ -262,16 +262,27 @@ func SendMailToBJFinance(order *map[string]interface{}, pay_time, transaction_id
 			if region == "" {
 				region = "全国"
 			}
-			var industryBuffer bytes.Buffer
-			for k, v := range sc.Industry {
-				if k > 0 {
+			var (
+				industryBuffer bytes.Buffer
+				ii             int
+			)
+			for _, v := range sc.Industry {
+				if ii > 0 {
 					industryBuffer.WriteString(" ")
 				}
+				if strings.Contains(v, "其它") {
+					continue
+				}
+				ii++
 				vs := strings.Split(v, "_")
 				if len(vs) == 1 {
 					industryBuffer.WriteString(vs[0])
 				} else {
-					industryBuffer.WriteString(vs[1])
+					if vs[1] == "其他" {
+						industryBuffer.WriteString(v)
+					} else {
+						industryBuffer.WriteString(vs[1])
+					}
 				}
 			}
 			if len(sc.Industry) > 0 {
@@ -661,19 +672,29 @@ func GetPackDataExportMailContent(filterId, download_url string) (content string
 			region = "全国"
 		}
 
-		var industryBuffer bytes.Buffer
-		for k, v := range sc.Industry {
-			if k > 0 {
+		var (
+			industryBuffer bytes.Buffer
+			ii             int
+		)
+		for _, v := range sc.Industry {
+			if ii > 0 {
 				industryBuffer.WriteString(" ")
 			}
+			if strings.Contains(v, "其它") {
+				continue
+			}
+			ii++
 			vs := strings.Split(v, "_")
 			if len(vs) == 1 {
 				industryBuffer.WriteString(vs[0])
 			} else {
-				industryBuffer.WriteString(vs[1])
+				if vs[1] == "其他" {
+					industryBuffer.WriteString(v)
+				} else {
+					industryBuffer.WriteString(vs[1])
+				}
 			}
 		}
-		// industry = industryBuffer.String()
 		if len(sc.Industry) > 0 {
 			industry = industryBuffer.String()
 		}