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-19 16:17:09 +08:00
parent ad74e90c19
commit be9c90488f
2 changed files with 57 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4373,9 +4373,10 @@ func QueryPageSkus(ctx *jxcontext.Context, vendorID int, vendorStoreIDs []string
results []*QueryPageSkusResult results []*QueryPageSkusResult
) )
db.Db = orm.NewOrmUsingDB("c4beta") db.Db = orm.NewOrmUsingDB("c4beta")
sqlParams := []interface{}{}
sqlJD := ` sqlJD := `
SELECT 0 vendor_id, b.orgcode org_code, a.wmpoiid store_id, b.name store_name, a.Base sku_id, a.name sku_name, a.month_saled month_sales, SELECT 0 vendor_id, b.orgcode org_code, a.wmpoiid store_id, b.name store_name, a.Base sku_id, a.name sku_name, a.month_saled month_sales,
a.basic_price, b.address, '' parameter, b.bak_info city_name a.basic_price, b.address, '' parameter, b.bak_info city_name, getDistance(?, ?,b.lng, b.lat) distance
FROM jingdong_foodlist a FROM jingdong_foodlist a
LEFT JOIN jingdong_showd b ON a.wmpoiid = b.wmpoiid LEFT JOIN jingdong_showd b ON a.wmpoiid = b.wmpoiid
` `
@@ -4384,7 +4385,7 @@ func QueryPageSkus(ctx *jxcontext.Context, vendorID int, vendorStoreIDs []string
` `
sqlMT := ` sqlMT := `
SELECT 1 vendor_id, '' org_code, a.wmpoiid store_id, b.name store_name, '' sku_id, a.name sku_name, a.month_saled month_sales, SELECT 1 vendor_id, '' org_code, a.wmpoiid store_id, b.name store_name, '' sku_id, a.name sku_name, a.month_saled month_sales,
a.min_price basic_price, b.address, a.unit parameter, a.city_name a.min_price basic_price, b.address, a.unit parameter, b.city_name, getDistance(?, ?, b.lng, b.lat) distance
FROM meituan_foodlist a FROM meituan_foodlist a
LEFT JOIN meituan_showd b ON a.wmpoiid = b.wmpoiid LEFT JOIN meituan_showd b ON a.wmpoiid = b.wmpoiid
` `
@@ -4397,6 +4398,7 @@ func QueryPageSkus(ctx *jxcontext.Context, vendorID int, vendorStoreIDs []string
sql += sqlJD + ` UNION` sql += sqlJD + ` UNION`
sql += sqlMT sql += sqlMT
//sql += sqlEbai + ` UNION` //sql += sqlEbai + ` UNION`
sqlParams = append(sqlParams, lng, lat, lng, lat)
} else { } else {
switch vendorID { switch vendorID {
case model.VendorIDJD: case model.VendorIDJD:
@@ -4406,13 +4408,13 @@ func QueryPageSkus(ctx *jxcontext.Context, vendorID int, vendorStoreIDs []string
case model.VendorIDEBAI: case model.VendorIDEBAI:
sql += sqlEbai sql += sqlEbai
} }
sqlParams = append(sqlParams, lng, lat)
} }
sql += ` sql += `
)t1 )t1
LEFT JOIN place t2 ON t2.name = t1.city_name LEFT JOIN place t2 ON t2.name = t1.city_name
WHERE 1 = 1 WHERE 1 = 1
` `
sqlParams := []interface{}{}
if keyword != "" { if keyword != "" {
keywordLike := "%" + keyword + "%" keywordLike := "%" + keyword + "%"
sql += " AND t1.sku_name LIKE ?" sql += " AND t1.sku_name LIKE ?"
@@ -4427,7 +4429,8 @@ func QueryPageSkus(ctx *jxcontext.Context, vendorID int, vendorStoreIDs []string
sqlParams = append(sqlParams, cityCode) sqlParams = append(sqlParams, cityCode)
} }
if radius > 0 { if radius > 0 {
sql += " AND ROUND(t1.distance * 1000) < ?"
sqlParams = append(sqlParams, radius)
} }
if sortType != 0 { if sortType != 0 {
switch math.Abs(float64(sortType)) { switch math.Abs(float64(sortType)) {

99
business/jxstore/tempop/tempop.go
View File

@@ -4,6 +4,7 @@ import (
"bytes" "bytes"
"context" "context"
"fmt" "fmt"
"git.rosy.net.cn/jx-callback/business/jxcallback/orderman"
"git.rosy.net.cn/jx-callback/business/jxstore/report" "git.rosy.net.cn/jx-callback/business/jxstore/report"
"regexp" "regexp"
"strings" "strings"
@@ -1841,54 +1842,54 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) {
// tasksch.HandleTask(task, nil, true).Run() // tasksch.HandleTask(task, nil, true).Run()
// task.GetID() // task.GetID()
//删京东会员价 //删京东会员价
var ( //var (
db = dao.GetDB() // db = dao.GetDB()
vendorThingIDs []int64 // vendorThingIDs []int64
// result3 []int // // result3 []int
) //)
storeMaps, _ := dao.GetStoresMapList(db, []int{model.VendorIDJD}, nil, nil, model.StoreStatusAll, model.StoreIsSyncAll, "", "", "320406") //storeMaps, _ := dao.GetStoresMapList(db, []int{model.VendorIDJD}, nil, nil, model.StoreStatusAll, model.StoreIsSyncAll, "", "", "320406")
things, _ := dao.GetThingMapList(db, model.ThingTypeSku, []int{model.VendorIDJD}, []int{34322, 24206, 24207}, []string{"320406"}) //things, _ := dao.GetThingMapList(db, model.ThingTypeSku, []int{model.VendorIDJD}, []int{34322, 24206, 24207}, []string{"320406"})
thingIDmap := make(map[int64]string) //thingIDmap := make(map[int64]string)
//
for _, v := range things { //for _, v := range things {
if v.VendorThingID != "" { // if v.VendorThingID != "" {
vendorThingIDs = append(vendorThingIDs, utils.Str2Int64(v.VendorThingID)) // vendorThingIDs = append(vendorThingIDs, utils.Str2Int64(v.VendorThingID))
thingIDmap[utils.Str2Int64(v.VendorThingID)] = utils.Int64ToStr(v.ThingID) // thingIDmap[utils.Str2Int64(v.VendorThingID)] = utils.Int64ToStr(v.ThingID)
} // }
} //}
//
task := tasksch.NewParallelTask("uuuuu", tasksch.NewParallelConfig().SetIsContinueWhenError(true), ctx, //task := tasksch.NewParallelTask("uuuuu", tasksch.NewParallelConfig().SetIsContinueWhenError(true), ctx,
func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { // func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
storeMap := batchItemList[0].(*model.StoreMap) // storeMap := batchItemList[0].(*model.StoreMap)
// result1, _ := // // result1, _ :=
FreeBatchInfo("uuuuu2", func(task tasksch.ITask, batchedStoreSkuList []int64) (result interface{}, successCount int, err error) { // FreeBatchInfo("uuuuu2", func(task tasksch.ITask, batchedStoreSkuList []int64) (result interface{}, successCount int, err error) {
api := jd.GetAPI("320406") // api := jd.GetAPI("320406")
priceInfo, _ := api.GetStationInfoList(storeMap.VendorStoreID, batchedStoreSkuList) // priceInfo, _ := api.GetStationInfoList(storeMap.VendorStoreID, batchedStoreSkuList)
var list []*jdapi.SkuIdEntity // var list []*jdapi.SkuIdEntity
for _, vv := range priceInfo { // for _, vv := range priceInfo {
if vv.VipPrice != 0 { // if vv.VipPrice != 0 {
list = append(list, &jdapi.SkuIdEntity{ // list = append(list, &jdapi.SkuIdEntity{
OutSkuId: thingIDmap[vv.SkuID], // OutSkuId: thingIDmap[vv.SkuID],
}) // })
// result = []bool{true} // // result = []bool{true}
// return result, 0, err // // return result, 0, err
} // }
} // }
if len(list) > 0 { // if len(list) > 0 {
err = api.DelVipPrice(utils.Int2Str(storeMap.StoreID), list) // err = api.DelVipPrice(utils.Int2Str(storeMap.StoreID), list)
} // }
return result, 0, err // return result, 0, err
}, ctx, task, vendorThingIDs, 50, true) // }, ctx, task, vendorThingIDs, 50, true)
// for _, v := range result1 { // // for _, v := range result1 {
// if v.(bool) { // // if v.(bool) {
// retVal = []int{storeMap.StoreID} // // retVal = []int{storeMap.StoreID}
// return retVal, err // // return retVal, err
// } // // }
// } // // }
return retVal, err // return retVal, err
}, storeMaps) // }, storeMaps)
tasksch.HandleTask(task, nil, true).Run() //tasksch.HandleTask(task, nil, true).Run()
_, err = task.GetResult(0) //_, err = task.GetResult(0)
// for _, v := range result2 { // for _, v := range result2 {
// result3 = append(result3, v.(int)) // result3 = append(result3, v.(int))
// } // }
@@ -1924,7 +1925,7 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) {
// dao.UpdateEntity(db, v, "ConsigneeMobile2") // dao.UpdateEntity(db, v, "ConsigneeMobile2")
// } // }
//} //}
report.RefreshJDMembers(jxcontext.AdminCtx) orderman.FixedOrderManager.AmendMissingOrders(ctx, []int{1}, 100920, time.Now().AddDate(0, 0, 18), time.Now(), true, true)
return err return err
} }