Merge remote-tracking branch 'origin/mark' into su

business/jxstore/cms/store.go

@@ -2398,20 +2398,28 @@ func GetStoreListByLocation(ctx *jxcontext.Context, lng, lat float64, needWalkDi
 
 		// 为了审核用
 		if len(storeList2) == 0 {
+			sql2 := `
+				SELECT t1.*,
+				city.name city_name
+				FROM store t1
+				JOIN place city ON city.code = t1.city_code
+				WHERE t1.deleted_at = ? AND t1.status <> ?  AND t1.id = ?
+			`
 			sqlParams2 := []interface{}{
-				model.VendorIDJX, utils.DefaultTimeValue, model.StoreStatusDisabled,
+				// model.VendorIDJX, utils.DefaultTimeValue, model.StoreStatusDisabled,
 				utils.DefaultTimeValue,
 				model.StoreStatusDisabled,
-				jxutils.StandardCoordinate2Int(0),
-				jxutils.StandardCoordinate2Int(10000),
-				jxutils.StandardCoordinate2Int(0),
-				jxutils.StandardCoordinate2Int(10000),
-				model.YES,
-			}
-			dao.GetRows(dao.GetDB(), &storeList2, sql, sqlParams2...)
-			if len(storeList2) > 1 {
-				storeList2 = storeList2[:1]
+				// jxutils.StandardCoordinate2Int(0),
+				// jxutils.StandardCoordinate2Int(10000),
+				// jxutils.StandardCoordinate2Int(0),
+				// jxutils.StandardCoordinate2Int(10000),
+				// model.YES,
+				102919, //商城模板店
 			}
+			dao.GetRows(dao.GetDB(), &storeList2, sql2, sqlParams2...)
+			// if len(storeList2) > 1 {
+			// 	storeList2 = storeList2[:1]
+			// }
 		}
 
 		// 如果要求以步行距离来算