From 08ebdfe26d72422cbfe539112f0bf06311888fd4 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Sat, 1 Feb 2020 15:51:17 +0800
Subject: [PATCH] =?UTF-8?q?GetStoreListByLocation=E5=B0=86=E8=90=A5?=
 =?UTF-8?q?=E4=B8=9A=E9=97=A8=E5=BA=97=E6=8E=92=E5=9C=A8=E5=89=8D=E9=9D=A2?=
 =?UTF-8?q?=EF=BC=8C=E7=BC=BA=E7=9C=81=E8=87=B3=E5=B0=91=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AA=E9=97=A8=E5=BA=97=EF=BC=88=E4=B8=BA=E4=BA=86?=
 =?UTF-8?q?=E8=85=BE=E8=AE=AF=E5=AE=A1=E6=A0=B8=E7=94=A8=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/store.go | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go
index 71b2f7e7c..8be4eedba 100644
--- a/business/jxstore/cms/store.go
+++ b/business/jxstore/cms/store.go
@@ -110,6 +110,9 @@ func (x Store4UserList) Len() int {
 }
 
 func (x Store4UserList) Less(i, j int) bool {
+	if x[i].Status != x[j].Status {
+		return x[i].Status > x[j].Status
+	}
 	if x[i].WalkDistance != x[j].WalkDistance {
 		return x[i].WalkDistance < x[j].WalkDistance
 	}
@@ -2324,6 +2327,7 @@ func GetStoreListByLocation(ctx *jxcontext.Context, lng, lat float64, needWalkDi
 	FROM store t1
 	JOIN place city ON city.code = t1.city_code
 	WHERE t1.deleted_at = ? AND t1.status <> ? AND t1.lng > ? AND t1.lng < ? AND t1.lat > ? AND t1.lat < ?
+	ORDER BY t1.id
 	`
 	sqlParams := []interface{}{
 		utils.DefaultTimeValue,
@@ -2344,6 +2348,22 @@ func GetStoreListByLocation(ctx *jxcontext.Context, lng, lat float64, needWalkDi
 			}
 		}
 
+		// 为了审核用
+		if len(storeList2) == 0 {
+			sqlParams = []interface{}{
+				utils.DefaultTimeValue,
+				model.StoreStatusDisabled,
+				jxutils.StandardCoordinate2Int(0),
+				jxutils.StandardCoordinate2Int(10000),
+				jxutils.StandardCoordinate2Int(0),
+				jxutils.StandardCoordinate2Int(10000),
+			}
+			dao.GetRows(dao.GetDB(), &storeList2, sql, sqlParams...)
+			if len(storeList2) > 1 {
+				storeList2 = storeList2[:1]
+			}
+		}
+
 		// 如果要求以步行距离来算
 		if needWalkDistance {
 			var coordList []*autonavi.Coordinate