From 5a3e680fc98b8e781f69237a15350ca25a0a2e7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Tue, 25 Feb 2020 16:37:41 +0800
Subject: [PATCH] =?UTF-8?q?GetStoreListByLocation=E6=8E=92=E9=99=A4?=
 =?UTF-8?q?=E5=8F=AA=E8=83=BD=E9=A2=84=E8=AE=A2=E5=8D=95=E5=BA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/store.go           |  2 ++
 business/jxstore/cms/store_sku_check.go |  2 +-
 business/jxstore/cms/user2.go           | 28 +++++++++++++++++++++++++
 controllers/cms_user2.go                | 14 +++++++++++++
 routers/commentsRouter_controllers.go   |  9 ++++++++
 5 files changed, 54 insertions(+), 1 deletion(-)

diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go
index 6eeb5c828..20d593071 100644
--- a/business/jxstore/cms/store.go
+++ b/business/jxstore/cms/store.go
@@ -2369,11 +2369,13 @@ func GetStoreListByLocation(ctx *jxcontext.Context, lng, lat float64, needWalkDi
 	JOIN place city ON city.code = t1.city_code
 	JOIN store_map sm ON sm.store_id = t1.id AND sm.vendor_id = ? AND sm.deleted_at = ? AND sm.status <> ?
 	WHERE t1.deleted_at = ? AND t1.status <> ? AND t1.lng > ? AND t1.lng < ? AND t1.lat > ? AND t1.lat < ?
+	AND sm.is_order <> ?
 	ORDER BY t1.id
 	`
 	sqlParams := []interface{}{
 		model.VendorIDJX, utils.DefaultTimeValue, model.StoreStatusDisabled,
 		utils.DefaultTimeValue, model.StoreStatusDisabled, jxutils.StandardCoordinate2Int(lng1), jxutils.StandardCoordinate2Int(lng2), jxutils.StandardCoordinate2Int(lat1), jxutils.StandardCoordinate2Int(lat2),
+		model.YES,
 	}
 
 	var storeList1 []*Store4User
diff --git a/business/jxstore/cms/store_sku_check.go b/business/jxstore/cms/store_sku_check.go
index 6268288ef..03347715a 100644
--- a/business/jxstore/cms/store_sku_check.go
+++ b/business/jxstore/cms/store_sku_check.go
@@ -571,7 +571,7 @@ func CheckSkuDiffBetweenJxAndVendor(ctx *jxcontext.Context, vendorIDList []int,
 								}
 							} else {
 								if singleFlag == false {
-									jxSkuInfoDataSingle, _ = GetStoreSkus(ctx, storeID, []int{}, true, "", true, false, map[string]interface{}{}, 0, -1)
+									jxSkuInfoDataSingle, _ = GetStoreSkus(ctx, storeID, nil, true, "", true, false, map[string]interface{}{}, 0, -1)
 									filterJxSkuInfoMapSingle = GetFilterJxSkuInfoMap(jxSkuInfoDataSingle.SkuNames) //map[京西商品ID:StoreSkuNameExt]
 									singleFlag = true
 								}
diff --git a/business/jxstore/cms/user2.go b/business/jxstore/cms/user2.go
index 7c94c70ac..a3d5bc7e6 100644
--- a/business/jxstore/cms/user2.go
+++ b/business/jxstore/cms/user2.go
@@ -1054,3 +1054,31 @@ func DeleteUserInfo(ctx *jxcontext.Context, userID string) (err error) {
 	}
 	return err
 }
+
+func GetMyJxStoreList(ctx *jxcontext.Context, mobile string) (storesInfo interface{}, err error) {
+	db := dao.GetDB()
+	user, err := dao.GetUserByID(db, "mobile", mobile)
+	if err != nil {
+		return nil, err
+	}
+	userID := user.UserID
+	var storeList []*dao.StoreWithCityName
+	if storeList, err = GetStoreList4User(ctx, mobile, userID); err == nil && len(storeList) > 0 {
+		// todo，应该用通用方法
+		mapDataList := make([]map[string]interface{}, len(storeList))
+		for k, v := range storeList {
+			mapDataList[k] = map[string]interface{}{
+				"id":        v.ID,
+				"address":   v.Address,
+				"cityName":  v.CityName,
+				"name":      v.Name,
+				"tel1":      v.Tel1,
+				"tel2":      v.Tel2,
+				"payeeName": v.PayeeName,
+				"status":    v.Status,
+			}
+		}
+		storesInfo = mapDataList
+	}
+	return storesInfo, err
+}
diff --git a/controllers/cms_user2.go b/controllers/cms_user2.go
index ca2608ef5..a7a55f81c 100644
--- a/controllers/cms_user2.go
+++ b/controllers/cms_user2.go
@@ -485,3 +485,17 @@ func (c *User2Controller) DeleteUserInfo() {
 		return retVal, "", err
 	})
 }
+
+// @Title 得到用户自己的门店列表（商城用）
+// @Description 得到用户自己的门店列表（商城用）
+// @Param	token			header		string	false	"认证token"
+// @Param	mobile			query		string	true	"电话"
+// @Success 200 {object} controllers.CallResult
+// @Failure 200 {object} controllers.CallResult
+// @router /GetMyJxStoreList [get]
+func (c *User2Controller) GetMyJxStoreList() {
+	c.callGetMyJxStoreList(func(params *tUser2GetMyJxStoreListParams) (retVal interface{}, errCode string, err error) {
+		retVal, err = cms.GetMyJxStoreList(params.Ctx, params.Mobile)
+		return retVal, "", err
+	})
+}
diff --git a/routers/commentsRouter_controllers.go b/routers/commentsRouter_controllers.go
index 30349e707..bceb9d400 100644
--- a/routers/commentsRouter_controllers.go
+++ b/routers/commentsRouter_controllers.go
@@ -2385,6 +2385,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:User2Controller"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:User2Controller"],
+        beego.ControllerComments{
+            Method: "GetMyJxStoreList",
+            Router: `/GetMyJxStoreList`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:User2Controller"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:User2Controller"],
         beego.ControllerComments{
             Method: "GetMyStoreList",