diff --git a/business/jxstore/common/common.go b/business/jxstore/common/common.go index 5da7ea492..88cfffaef 100644 --- a/business/jxstore/common/common.go +++ b/business/jxstore/common/common.go @@ -135,6 +135,12 @@ func GetStoreListByLocation(ctx *jxcontext.Context, lng, lat float64, maxRadius AND sm.is_order <> ? AND t1.id <> ? ` + sqlParams = append(sqlParams, + model.VendorIDJX, utils.DefaultTimeValue, model.StoreStatusDisabled, + utils.DefaultTimeValue, model.StoreStatusDisabled, jxutils.StandardCoordinate2Int(lng1), jxutils.StandardCoordinate2Int(lng2), jxutils.StandardCoordinate2Int(lat1), jxutils.StandardCoordinate2Int(lat2), + model.YES, + model.MatterStoreID, + ) if brandID != 0 { sql += " AND t1.brand_id = ?" sqlParams = append(sqlParams, brandID) @@ -142,12 +148,6 @@ func GetStoreListByLocation(ctx *jxcontext.Context, lng, lat float64, maxRadius sql += ` ORDER BY t1.id ` - sqlParams = append(sqlParams, - model.VendorIDJX, utils.DefaultTimeValue, model.StoreStatusDisabled, - utils.DefaultTimeValue, model.StoreStatusDisabled, jxutils.StandardCoordinate2Int(lng1), jxutils.StandardCoordinate2Int(lng2), jxutils.StandardCoordinate2Int(lat1), jxutils.StandardCoordinate2Int(lat2), - model.YES, - model.MatterStoreID, - ) } else { sql = ` SELECT t1.*, @@ -168,9 +168,6 @@ func GetStoreListByLocation(ctx *jxcontext.Context, lng, lat float64, maxRadius } } var storeList1 []*Store4User - fmt.Println(sql) - fmt.Println(sqlParams) - fmt.Println("aaaaaaaaaaaaaaaaaaaaaaaa") if err = dao.GetRows(dao.GetDB(), &storeList1, sql, sqlParams...); err == nil { var storeList2 []*Store4User for _, v := range storeList1 { diff --git a/business/model/store.go b/business/model/store.go index 8ecae6a5c..38aaf1b88 100644 --- a/business/model/store.go +++ b/business/model/store.go @@ -258,9 +258,9 @@ var ( StoreAuditStatusRejected: "拒绝", } StorePriceTypeName = map[int]string{ - StoreChangePriceTypeDirect: "普通门店", - StoreChangePriceTypeBossDisabled: "普通门店禁止改价", - StoreChangePriceTypeManagedStore: "直营门店禁止改价", + StoreChangePriceTypeDirect: "普通门店", + // StoreChangePriceTypeBossDisabled: "普通门店禁止改价", + // StoreChangePriceTypeManagedStore: "直营门店禁止改价", } AutoReplyTypeName = map[int]string{ AutoReplyAll: "全部自动回复",