邮件区域显示

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

@@ -244,14 +244,17 @@ func SendMailToBJFinance(order *map[string]interface{}, pay_time, transaction_id
 			}
 			//超级搜索页面 筛选区域为 area           没有region    移动端数据导出改
 			regionArr := []string{}
-			region := ""
 			if sc.Region == nil {
 				regionArr = append(sc.Area, sc.City...)
 			} else {
 				regionArr = sc.Region
 			}
 			if len(sc.District) > 0 {
-				regionArr = append(regionArr, sc.District...)
+				for _, v := range sc.District {
+					district := strings.Split(v, "_")[1]
+					regionArr = append(regionArr, district)
+
+				}
 			}
 			region = strings.Join(regionArr, ",")
 			if region == "" {
@@ -635,14 +638,17 @@ func GetPackDataExportMailContent(filterId, download_url string) (content string
 		}
 		//超级搜索页面 筛选区域为 area           没有region    移动端数据导出改
 		regionArr := []string{}
-		region := ""
 		if sc.Region == nil {
 			regionArr = append(sc.Area, sc.City...)
 		} else {
 			regionArr = sc.Region
 		}
 		if len(sc.District) > 0 {
-			regionArr = append(regionArr, sc.District...)
+			for _, v := range sc.District {
+				district := strings.Split(v, "_")[1]
+				regionArr = append(regionArr, district)
+
+			}
 		}
 		region = strings.Join(regionArr, ",")
 		if region == "" {
@@ -777,14 +783,17 @@ func GetDataExportMailContent(orderCode string) (content string, err error) {
 		}
 		//超级搜索页面 筛选区域为 area           没有region    移动端数据导出改
 		regionArr := []string{}
-		region := ""
 		if sc.Region == nil {
 			regionArr = append(sc.Area, sc.City...)
 		} else {
 			regionArr = sc.Region
 		}
 		if len(sc.District) > 0 {
-			regionArr = append(regionArr, sc.District...)
+			for _, v := range sc.District {
+				district := strings.Split(v, "_")[1]
+				regionArr = append(regionArr, district)
+
+			}
 		}
 		region = strings.Join(regionArr, ",")
 		if region == "" {