From 1e0f5a0513df5e9758c4bacefde687c0bc41dde0 Mon Sep 17 00:00:00 2001
From: suyl <770236076@qq.com>
Date: Tue, 11 May 2021 15:25:48 +0800
Subject: [PATCH] aa

---
 business/model/dao/page_store.go | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/business/model/dao/page_store.go b/business/model/dao/page_store.go
index 8ca887ce8..5c953ca73 100644
--- a/business/model/dao/page_store.go
+++ b/business/model/dao/page_store.go
@@ -105,7 +105,7 @@ func QueryPageStores(db *DaoDB, pageSize, offset int, keyword string, vendorStor
 func QueryPageStores2(db *DaoDB, pageSize, offset int, keyword string, vendorStoreID string, vendorID, cityCode, districtCode int, tel string,
 	minShopScore float32, minRecentOrderNum, minSkuCount int, lng1, lat1, lng2, lat2 float64) (pagedInfo *model.PagedInfo, err error) {
 	sqlJD := `
-		SELECT name, 0 vendor_id, wmpoiid vendor_store_id, orgcode org_code, set vendor_status, address, phone tel1, pj shop_score, month_sales_tip recent_order_num,
+		SELECT name, 0 vendor_id, wmpoiid vendor_store_id, orgcode org_code, 1 vendor_status, address, phone tel1, pj shop_score, month_sales_tip recent_order_num,
 		bak_info city_name
 		FROM jingdong_showd
 	`
@@ -121,9 +121,10 @@ func QueryPageStores2(db *DaoDB, pageSize, offset int, keyword string, vendorSto
 				FROM (
 	`
 	if vendorID == -1 {
-		sql += sqlJD + ` UNION`
-		sql += sqlEbai + ` UNION`
-		sql += sqlMT
+		sql += sqlJD
+		//+ ` UNION`
+		//sql += sqlEbai + ` UNION`
+		//sql += sqlMT
 	} else {
 		switch vendorID {
 		case model.VendorIDJD:
@@ -209,6 +210,9 @@ func QueryPageStores2(db *DaoDB, pageSize, offset int, keyword string, vendorSto
 			if v.Address != "" && v.CityName != "" {
 				if city, _ := GetPlaceByName(db, v.CityName, 2, 0); city != nil {
 					lng, lat, _ := api.AutonaviAPI.GetCoordinateFromAddressByPage(v.Address, city.Code)
+					v.CityCode = city.Code
+					v.Lng = lng
+					v.Lat = lat
 					if lng1 > 0 {
 						if !(lng >= lng1 && lat >= lat1 && lng <= lng2 && lat <= lat2) {
 							newShopList = append(newShopList, v)