订单显示问题

src/jfw/front/dataExport.go

@@ -516,11 +516,10 @@ func (d *DataExport) SuperSearchExport() error {
 	saveData["comeinfrom"] = "supersearchPage"
 	//是否开启 正文 标题同时搜索只搜正文的开关
 	saveData["searchTypeSwitch"], _ = config.Sysconfig["searchTypeSwitch"].(bool)
-
 	region := util.If(reqData.Area == "全国", "", reqData.Area).(string)
 	if region != "" && reqData.City != "" {
 		region += "," + reqData.City
-	} else {
+	} else if region == "" {
 		region = reqData.City
 	}
 	if reqData.District != "" {

src/jfw/modules/app/src/app/front/ws_dataExport.go

@@ -382,7 +382,7 @@ func (wd *WsDataExport) SearchExport() error {
 	region := util.If(reqData.Area == "全国", "", reqData.Area).(string)
 	if region != "" && reqData.City != "" {
 		region += "," + reqData.City
-	} else {
+	} else if region == "" {
 		region = reqData.City
 	}
 	if reqData.District != "" {

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

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