liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改商户端用户商户登录,进店错误"

Browse Source
This commit is contained in:
邹宗楠
2022-04-12 15:55:28 +08:00
parent 7e318ca948
commit ec0bfd4707
2 changed files with 34 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
business/jxstore/cms/store.go
View File

@@ -511,38 +511,48 @@ func GetStores(ctx *jxcontext.Context, keyword string, params map[string]interfa
briefLevel := int(utils.ForceInterface2Int64(params["briefLevel"])) briefLevel := int(utils.ForceInterface2Int64(params["briefLevel"]))
//权限 //权限
if permission.IsRoled(ctx) { if permission.IsRoled(ctx) {
if storeIDsMap, err := permission.GetUserStoresResultMap(ctx.GetUserID()); err == nil { // 查询用户门店
var storeIDs2 []int configs, _ := dao.QueryConfigs(dao.GetDB(), "checkversion", model.ConfigTypeSys, "")
if params["storeIDs"] != nil { storeIdInterface, _, err := GetMyStoreListNew(ctx, configs[0].Value)
var storeIDs []int if err != nil {
if err = utils.UnmarshalUseNumber([]byte(params["storeIDs"].(string)), &storeIDs); err == nil { return nil, err
for _, v := range storeIDs { }
if storeIDsMap[v] != 0 {
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) storeIDs2 = append(storeIDs2, v)
} }
} }
} }
if len(storeIDs2) == 0 { }
storeIDs2 = append(storeIDs2, -1) } 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 { } else {
if params["storeID"] != nil { if len(storeIDsMap) > 0 {
if storeIDsMap[int(utils.Interface2Int64WithDefault(params["storeID"], 0))] == 0 { for _, v := range storeIDsMap {
params["storeID"] = nil storeIDs2 = append(storeIDs2, v["id"].(int))
}
} else {
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) 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) sql, sqlParams, _, _, err := getStoresSql(ctx, keyword, params, orderTimeFrom, orderTimeTo)
@@ -4735,7 +4745,7 @@ func RefreshPageStore() {
func QueryPageStores2(db *dao.DaoDB, pageSize, offset int, keyword, vendorStoreID, brandName string, vendorID, cityCode, districtCode int, tel string, func QueryPageStores2(db *dao.DaoDB, pageSize, offset int, keyword, vendorStoreID, brandName string, vendorID, cityCode, districtCode int, tel string,
minShopScore float32, minRecentOrderNum, minSkuCount int, lng1, lat1, lng2, lat2 float64, cat string) (pagedInfo *model.PagedInfo, err error) { minShopScore float32, minRecentOrderNum, minSkuCount int, lng1, lat1, lng2, lat2 float64, cat string) (pagedInfo *model.PagedInfo, err error) {
// db.Db = orm.NewOrmUsingDB("c4beta") // db.Db = orm.NewOrmUsingDB("c4beta")
sqlJD := ` sqlJD := `
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, 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, goods_number sku_count, lat, lng, district_name, brand_name, third_category category, shipping_time bak_info city_name, goods_number sku_count, lat, lng, district_name, brand_name, third_category category, shipping_time

6
business/jxstore/cms/user2.go
View File

@@ -1255,12 +1255,6 @@ func GetUserStoreAuth(ctx *jxcontext.Context, storeID int) (outStoreID int, err
} }
return storeID, nil return storeID, nil
} }
//storeMap, _ := permission.GetUserStoresResultMap(ctx.GetUserID())
//if storeMap[storeID] != 0 {
// return storeID, err
//} else {
// return 0, err
//}
} }
return storeID, err return storeID, err
} }