邮件区域显示

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

@@ -243,12 +243,17 @@ func SendMailToBJFinance(order *map[string]interface{}, pay_time, transaction_id
 				}
 			}
 			//超级搜索页面 筛选区域为 area           没有region    移动端数据导出改
+			regionArr := []string{}
+			region := ""
 			if sc.Region == nil {
-				showAll := append(sc.Area, sc.City...)
-				region = strings.Join(showAll, " ")
+				regionArr = append(sc.Area, sc.City...)
 			} else {
-				region = strings.Join(sc.Region, " ")
+				regionArr = sc.Region
 			}
+			if len(sc.District) > 0 {
+				regionArr = append(regionArr, sc.District...)
+			}
+			region = strings.Join(regionArr, ",")
 			if region == "" {
 				region = "全国"
 			}
@@ -629,15 +634,21 @@ func GetPackDataExportMailContent(filterId, download_url string) (content string
 			}
 		}
 		//超级搜索页面 筛选区域为 area           没有region    移动端数据导出改
+		regionArr := []string{}
+		region := ""
 		if sc.Region == nil {
-			showAll := append(sc.Area, sc.City...)
-			region = strings.Join(showAll, " ")
+			regionArr = append(sc.Area, sc.City...)
 		} else {
-			region = strings.Join(sc.Region, " ")
+			regionArr = sc.Region
+		}
+		if len(sc.District) > 0 {
+			regionArr = append(regionArr, sc.District...)
 		}
+		region = strings.Join(regionArr, ",")
 		if region == "" {
 			region = "全国"
 		}
+
 		var industryBuffer bytes.Buffer
 		for k, v := range sc.Industry {
 			if k > 0 {
@@ -765,12 +776,17 @@ func GetDataExportMailContent(orderCode string) (content string, err error) {
 			}
 		}
 		//超级搜索页面 筛选区域为 area           没有region    移动端数据导出改
+		regionArr := []string{}
+		region := ""
 		if sc.Region == nil {
-			showAll := append(sc.Area, sc.City...)
-			region = strings.Join(showAll, " ")
+			regionArr = append(sc.Area, sc.City...)
 		} else {
-			region = strings.Join(sc.Region, " ")
+			regionArr = sc.Region
+		}
+		if len(sc.District) > 0 {
+			regionArr = append(regionArr, sc.District...)
 		}
+		region = strings.Join(regionArr, ",")
 		if region == "" {
 			region = "全国"
 		}