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:
suyl
2021-05-20 18:10:46 +08:00
parent 80e08d5b18
commit 20e61f1317
6 changed files with 113 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4348,50 +4348,86 @@ func RefreshPageStore() {
}
}
}
//商品表合并
sql3 := ` TRUNCATE page_sku`
dao.ExecuteSQL(db, sql3)
sql4 := `
INSERT INTO page_sku (created_at,updated_at,last_operator,vendor_id,vendor_store_id,vendor_sku_id,vendor_sku_name,month_saled,act_price,sale_price,unit)
SELECT NOW(),NOW(),'jxadmin',t1.* FROM (
(
SELECT 0, a.wmpoiid, a.Base, a.name, a.month_saled, ISNULL(a.min_price) *100, a.basic_price*100, ''
FROM jingdong_foodlist a
)
UNION ALL
(
SELECT 1, a.wmpoiid, '', a.name, a.month_saled, 0, a.min_price*100, a.unit
FROM meituan_foodlist a
)
)t1
////商品表合并
//sql3 := ` TRUNCATE page_sku`
//dao.ExecuteSQL(db, sql3)
//sql4 := `
// INSERT INTO page_sku (created_at,updated_at,last_operator,vendor_id,vendor_store_id,vendor_sku_id,vendor_sku_name,month_saled,act_price,sale_price,unit)
// SELECT NOW(),NOW(),'jxadmin',t1.* FROM (
// (
// SELECT 0, a.wmpoiid, a.Base, a.name, a.month_saled, ISNULL(a.min_price) *100, a.basic_price*100, ''
// FROM jingdong_foodlist a
// )
// UNION ALL
// (
// SELECT 1, a.wmpoiid, '', a.name, a.month_saled, 0, a.min_price*100, a.unit
// FROM meituan_foodlist a
// )
// )t1
//`
//dao.ExecuteSQL(db, sql4)
////门店表合并
//sql5 := ` TRUNCATE page_store`
//dao.ExecuteSQL(db, sql5)
//sql6 := `
// INSERT INTO page_store (created_at,updated_at,last_operator,vendor_id,vendor_store_id,vendor_store_name,address,city_name,org_code,lng,lat)
// SELECT NOW(),NOW(),'jxadmin',t1.* FROM (
// (
// SELECT 0, a.wmpoiid, a.name, a.address, a.bak_info, a.orgcode, a.lng, a.lat
// FROM jingdong_showd a
// )
// UNION ALL
// (
// SELECT 1, a.wmpoiid, a.name, a.address, a.city_name, '', a.lng, a.lat
// FROM meituan_showd a
// )
// )t1
//`
//dao.ExecuteSQL(db, sql6)
var (
jds2 []*JdPage
mts2 []*MtPage
)
sql7 := `
SELECT * FROM jingdong_showd WHERE brand_name = '' OR brand_name IS NULL OR brand_name = '无'
`
dao.ExecuteSQL(db, sql4)
//门店表合并
sql5 := ` TRUNCATE page_store`
dao.ExecuteSQL(db, sql5)
sql6 := `
INSERT INTO page_store (created_at,updated_at,last_operator,vendor_id,vendor_store_id,vendor_store_name,address,city_name,org_code,lng,lat)
SELECT NOW(),NOW(),'jxadmin',t1.* FROM (
dao.GetRows(db, &jds2, sql7)
if len(jds2) > 0 {
}
sql8 := `
SELECT * FROM meituan_showd WHERE brand_name = '' OR brand_name IS NULL OR brand_name = '无'
`
dao.GetRows(db, &mts2, sql8)
if len(mts2) > 0 {
}
sql9 := ` TRUNCATE page_brand`
dao.ExecuteSQL(db, sql9)
sql10 := `
INSERT INTO page_brand (created_at,update_at,last_operator,brand_name)
SELECT NOW(),NOW(),'jxadmin', t1.* FROM (
(
SELECT 0, a.wmpoiid, a.name, a.address, a.bak_info, a.orgcode, a.lng, a.lat
SELECT DISTINCT a.brand_name
FROM jingdong_showd a
)
UNION ALL
UNION
(
SELECT 1, a.wmpoiid, a.name, a.address, a.city_name, '', a.lng, a.lat
SELECT DISTINCT a.brand_name
FROM meituan_showd a
)
)t1
`
dao.ExecuteSQL(db, sql6)
dao.ExecuteSQL(db, sql10)
}
func QueryPageStores2(db *dao.DaoDB, pageSize, offset int, keyword string, vendorStoreID 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) (pagedInfo *model.PagedInfo, err error) {
db.Db = orm.NewOrmUsingDB("c4beta")
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,
bak_info city_name, goods_number sku_count, lat, lng, district_name
bak_info city_name, goods_number sku_count, lat, lng, district_name, brand_name
FROM jingdong_showd
`
sqlEbai := `
@@ -4399,7 +4435,7 @@ func QueryPageStores2(db *dao.DaoDB, pageSize, offset int, keyword string, vendo
`
sqlMT := `
SELECT name, 1 vendor_id, wmpoiid vendor_store_id, '' org_code, 1 vendor_status, address, phone tel1, pj shop_score, REPLACE(REPLACE(month_sales_tip,'月售',''),'+','') recent_order_num,
city_name, goods_number sku_count, lat, lng, district_name
city_name, goods_number sku_count, lat, lng, district_name, brand_name
FROM meituan_showd
`
sql := `
@@ -4439,6 +4475,10 @@ func QueryPageStores2(db *dao.DaoDB, pageSize, offset int, keyword string, vendo
sql += " AND t1.tel1 = ?"
sqlParams = append(sqlParams, tel)
}
if brandName != "" {
sql += " AND t1.brand_name = ?"
sqlParams = append(sqlParams, brandName)
}
if minShopScore > 0 {
sql += " AND t1.shop_score >= ?"
sqlParams = append(sqlParams, minShopScore)
@@ -4682,3 +4722,8 @@ func QueryPageSkus(ctx *jxcontext.Context, vendorID int, vendorStoreIDs []string
}
return pagedInfo, err
}
func GetPageBrands(ctx *jxcontext.Context) (brands []*model.PageBrand, err error) {
return brands, err
}

1
business/model/dao/page_store.go
View File

@@ -11,6 +11,7 @@ type PageShopWithPlaceName struct {
CityName string `json:"cityName"`
DistrictName string `json:"districtName"`
Distance int `json:"distance"`
BrandName string `json:"brandName"`
}
func QueryPageStores(db *DaoDB, pageSize, offset int, keyword string, vendorStoreID string, vendorID int, orgCode string,

12
business/model/net_spider.go
View File

@@ -79,3 +79,15 @@ func (*PageStore) TableIndex() [][]string {
[]string{"VendorID", "VendorStoreID"},
}
}
type PageBrand struct {
ModelIDCUL
BrandName string `json:"brandName"`
}
func (*PageBrand) TableIndex() [][]string {
return [][]string{
[]string{"BrandName"},
}
}

16
controllers/net_spider.go
View File

@@ -51,6 +51,7 @@ func (c *NetSpiderController) GetAndStoreCitiesShops() {
// @Param cityCode query int false "城市代码"
// @Param districtCode query int false "行政区代码"
// @Param tel query string false "手机号"
// @Param brandName query string false "品牌名"
// @Param minShopScore query float64 false "门店分值最小值"
// @Param minRecentOrderNum query int false "最近单量最小值"
// @Param minSkuCount query int false "SKU数量最小值"
@@ -83,7 +84,7 @@ func (c *NetSpiderController) QueryPageStores() {
offset = 0
pageSize = model.UnlimitedPageSize
}
pagedInfo, err := cms.QueryPageStores2(dao.GetDB(), pageSize, offset, params.Keyword, params.VendorStoreID, params.VendorID,
pagedInfo, err := cms.QueryPageStores2(dao.GetDB(), pageSize, offset, params.Keyword, params.VendorStoreID, params.BrandName, params.VendorID,
params.CityCode, params.DistrictCode, params.Tel, float32(params.MinShopScore), params.MinRecentOrderNum, params.MinSkuCount,
lng1, lat1, lng2, lat2)
if err == nil {
@@ -190,3 +191,16 @@ func (c *NetSpiderController) QueryPageSkus() {
return retVal, "", err
})
}
// @Title 查询page品牌
// @Description 查询page品牌
// @Param token header string true "认证token"
// @Success 200 {object} controllers.CallResult
// @Failure 200 {object} controllers.CallResult
// @router /GetPageBrands [get]
func (c *NetSpiderController) GetPageBrands() {
c.callGetPageBrands(func(params *tNetspiderGetPageBrandsParams) (retVal interface{}, errCode string, err error) {
retVal, err = cms.GetPageBrands(params.Ctx)
return retVal, "", err
})
}

1
globals/beegodb/beegodb.go
View File

@@ -51,6 +51,7 @@ func Init() {
orm.RegisterModel(&model.PageShop{})
orm.RegisterModel(&model.PageSku{})
orm.RegisterModel(&model.PageStore{})
orm.RegisterModel(&model.PageBrand{})
orm.RegisterModel(&model.VendorStoreSnapshot{})
orm.RegisterModel(&model.PriceReferSnapshot{})
orm.RegisterModel(&model.StoreManageState{})

9
routers/commentsRouter_controllers.go
View File

@@ -990,6 +990,15 @@ func init() {
Filters: nil,
Params: nil})
web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:NetSpiderController"] = append(web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:NetSpiderController"],
web.ControllerComments{
Method: "GetPageBrands",
Router: `/GetPageBrands`,
AllowHTTPMethods: []string{"get"},
MethodParams: param.Make(),
Filters: nil,
Params: nil})
web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:OrderController"] = append(web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:OrderController"],
web.ControllerComments{
Method: "AcceptOrRefuseFailedGetOrder",