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

aa

Browse Source
This commit is contained in:
苏尹岚
2021-01-14 09:20:29 +08:00
parent e488701115
commit d3d3fe0a7c
2 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
business/jxstore/common/common.go
View File

@@ -135,6 +135,12 @@ func GetStoreListByLocation(ctx *jxcontext.Context, lng, lat float64, maxRadius
AND sm.is_order <> ? AND sm.is_order <> ?
AND t1.id <> ? 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 { if brandID != 0 {
sql += " AND t1.brand_id = ?" sql += " AND t1.brand_id = ?"
sqlParams = append(sqlParams, brandID) sqlParams = append(sqlParams, brandID)
@@ -142,12 +148,6 @@ func GetStoreListByLocation(ctx *jxcontext.Context, lng, lat float64, maxRadius
sql += ` sql += `
ORDER BY t1.id 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 { } else {
sql = ` sql = `
SELECT t1.*, SELECT t1.*,
@@ -168,9 +168,6 @@ func GetStoreListByLocation(ctx *jxcontext.Context, lng, lat float64, maxRadius
} }
} }
var storeList1 []*Store4User var storeList1 []*Store4User
fmt.Println(sql)
fmt.Println(sqlParams)
fmt.Println("aaaaaaaaaaaaaaaaaaaaaaaa")
if err = dao.GetRows(dao.GetDB(), &storeList1, sql, sqlParams...); err == nil { if err = dao.GetRows(dao.GetDB(), &storeList1, sql, sqlParams...); err == nil {
var storeList2 []*Store4User var storeList2 []*Store4User
for _, v := range storeList1 { for _, v := range storeList1 {

4
business/model/store.go
View File

@@ -259,8 +259,8 @@ var (
} }
StorePriceTypeName = map[int]string{ StorePriceTypeName = map[int]string{
StoreChangePriceTypeDirect: "普通门店", StoreChangePriceTypeDirect: "普通门店",
StoreChangePriceTypeBossDisabled: "普通门店禁止改价", // StoreChangePriceTypeBossDisabled: "普通门店禁止改价",
StoreChangePriceTypeManagedStore: "直营门店禁止改价", // StoreChangePriceTypeManagedStore: "直营门店禁止改价",
} }
AutoReplyTypeName = map[int]string{ AutoReplyTypeName = map[int]string{
AutoReplyAll: "全部自动回复", AutoReplyAll: "全部自动回复",