From 8a68945b5c62c4ef4917b525fba6107a2b6aeb13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Fri, 15 Apr 2022 09:42:20 +0800
Subject: [PATCH] 1

---
 business/jxstore/cms/store.go | 60 +++++++----------------------------
 1 file changed, 11 insertions(+), 49 deletions(-)

diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go
index f058943b2..227281d9d 100644
--- a/business/jxstore/cms/store.go
+++ b/business/jxstore/cms/store.go
@@ -523,65 +523,27 @@ func GetStores(ctx *jxcontext.Context, keyword string, params map[string]interfa
 					}
 				}
 				if len(storeIDs2) == 0 {
-					//storeIDs2 = append(storeIDs2, -1)
-					storeIDs2 = append(storeIDs2, storeIDs...)
+					storeIDs2 = append(storeIDs2, -1)
 				}
 			} else {
-				if len(storeIDsMap) > 0 {
-					for k, _ := range storeIDsMap {
-						storeIDs2 = append(storeIDs2, k)
+				if params["storeID"] != nil {
+					if storeIDsMap[int(utils.Interface2Int64WithDefault(params["storeID"], 0))] == 0 {
+						params["storeID"] = nil
 					}
 				} else {
-					storeIDs2 = append(storeIDs2, -1)
+					if len(storeIDsMap) > 0 {
+						for k, _ := range storeIDsMap {
+							storeIDs2 = append(storeIDs2, k)
+						}
+					} else {
+						storeIDs2 = append(storeIDs2, -1)
+					}
 				}
 			}
 			if data, err := json.Marshal(storeIDs2); err == nil {
 				params["storeIDs"] = string(data)
 			}
 		}
-		// 查询用户门店
-		//configs, _ := dao.QueryConfigs(dao.GetDB(), "checkversion", model.ConfigTypeSys, "")
-		//storeIdInterface, _, err := GetMyStoreListNew(ctx, configs[0].Value)
-		//if err != nil {
-		//	return nil, err
-		//}
-		//
-		//storeIDsMap := storeIdInterface.([]map[string]interface{})
-		//var storeIDs2 []int
-		//if params["storeIDs"] != nil {
-		//	var storeIDs []int
-		//	if err = utils.UnmarshalUseNumber([]byte(params["storeIDs"].(string)), &storeIDs); err == nil {
-		//		for _, v := range storeIDs {
-		//			for _, s := range storeIDsMap {
-		//				if s["id"].(int) != 0 && s["id"].(int) == v {
-		//					storeIDs2 = append(storeIDs2, v)
-		//				}
-		//			}
-		//		}
-		//	}
-		//} else {
-		//	if params["storeID"] != nil {
-		//		intStoreId := int(utils.Interface2Int64WithDefault(params["storeID"], 0))
-		//		for _, v := range storeIDsMap {
-		//			if v["id"].(int) == intStoreId && intStoreId != 0 {
-		//				storeIDs2 = append(storeIDs2, intStoreId)
-		//			}
-		//		}
-		//	} else {
-		//		if len(storeIDsMap) > 0 {
-		//			for _, v := range storeIDsMap {
-		//				storeIDs2 = append(storeIDs2, v["id"].(int))
-		//			}
-		//		}
-		//	}
-		//}
-		//if len(storeIDs2) == 0 {
-		//	storeIDs2 = append(storeIDs2, -1)
-		//}
-		//
-		//if data, err := json.Marshal(storeIDs2); err == nil {
-		//	params["storeIDs"] = string(data)
-		//}
 	}
 	sql, sqlParams, _, _, err := getStoresSql(ctx, keyword, params, orderTimeFrom, orderTimeTo)
 	if err != nil {