Merge branch 'jdshop' of e.coding.net:rosydev/jx-callback/jx-callback into jdshop

# Conflicts:
#	business/jxstore/cms/store_test.go
#	tests/default_test.go
This commit is contained in:
rosydev
2022-01-27 14:47:31 +08:00

View File

@@ -4736,10 +4736,11 @@ func QueryPageStores2(db *dao.DaoDB, pageSize, offset int, keyword, vendorStoreI
FROM meituan_showd
`
sqlGD := `
SELECT name, 10 vendor_id, wmpoiid vendor_store_id,'' org_code,1 vendor_status,address, phone tel1,pj shop_score,month_sales_tip recent_order_num,
city_name,goods_number sku_count,lat, lng, district_name, brand_name, third_category category, shipping_time
SELECT name, 10 vendor_id, wmpoiid vendor_store_id, '' org_code, 1 vendor_status, address, phone tel1, pj shop_score, month_sales_tip recent_order_num,
city_name, goods_number sku_count, lat, lng, district_name, brand_name, third_category category, shipping_time
FROM gaode_showd
`
//lat, lng,
//sqlCLB := `
// SELECT name ,20 vendor_id, wmpoiid vendor_store_id,'' org_code,1 vendor_status,address, phone tel1,pj shop_score,month_sales_tip recent_order_num,
// city_name,goods_number sku_count,lat, lng, district_name, brand_name, third_category category , shipping_time