diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 036155d73..180ca58f1 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -4373,9 +4373,10 @@ func QueryPageSkus(ctx *jxcontext.Context, vendorID int, vendorStoreIDs []string results []*QueryPageSkusResult ) db.Db = orm.NewOrmUsingDB("c4beta") + sqlParams := []interface{}{} 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, - 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 LEFT JOIN jingdong_showd b ON a.wmpoiid = b.wmpoiid ` @@ -4384,7 +4385,7 @@ func QueryPageSkus(ctx *jxcontext.Context, vendorID int, vendorStoreIDs []string ` 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, - 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 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 += sqlMT //sql += sqlEbai + ` UNION` + sqlParams = append(sqlParams, lng, lat, lng, lat) } else { switch vendorID { case model.VendorIDJD: @@ -4406,13 +4408,13 @@ func QueryPageSkus(ctx *jxcontext.Context, vendorID int, vendorStoreIDs []string case model.VendorIDEBAI: sql += sqlEbai } + sqlParams = append(sqlParams, lng, lat) } sql += ` )t1 LEFT JOIN place t2 ON t2.name = t1.city_name WHERE 1 = 1 ` - sqlParams := []interface{}{} if keyword != "" { keywordLike := "%" + keyword + "%" sql += " AND t1.sku_name LIKE ?" @@ -4427,7 +4429,8 @@ func QueryPageSkus(ctx *jxcontext.Context, vendorID int, vendorStoreIDs []string sqlParams = append(sqlParams, cityCode) } if radius > 0 { - + sql += " AND ROUND(t1.distance * 1000) < ?" + sqlParams = append(sqlParams, radius) } if sortType != 0 { switch math.Abs(float64(sortType)) { diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go index a5f0908f3..4c7e26a79 100644 --- a/business/jxstore/tempop/tempop.go +++ b/business/jxstore/tempop/tempop.go @@ -4,6 +4,7 @@ import ( "bytes" "context" "fmt" + "git.rosy.net.cn/jx-callback/business/jxcallback/orderman" "git.rosy.net.cn/jx-callback/business/jxstore/report" "regexp" "strings" @@ -1841,54 +1842,54 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) { // tasksch.HandleTask(task, nil, true).Run() // task.GetID() //删京东会员价 - var ( - db = dao.GetDB() - vendorThingIDs []int64 - // result3 []int - ) - 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"}) - thingIDmap := make(map[int64]string) - - for _, v := range things { - if v.VendorThingID != "" { - vendorThingIDs = append(vendorThingIDs, utils.Str2Int64(v.VendorThingID)) - thingIDmap[utils.Str2Int64(v.VendorThingID)] = utils.Int64ToStr(v.ThingID) - } - } - - task := tasksch.NewParallelTask("uuuuu", tasksch.NewParallelConfig().SetIsContinueWhenError(true), ctx, - func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { - storeMap := batchItemList[0].(*model.StoreMap) - // result1, _ := - FreeBatchInfo("uuuuu2", func(task tasksch.ITask, batchedStoreSkuList []int64) (result interface{}, successCount int, err error) { - api := jd.GetAPI("320406") - priceInfo, _ := api.GetStationInfoList(storeMap.VendorStoreID, batchedStoreSkuList) - var list []*jdapi.SkuIdEntity - for _, vv := range priceInfo { - if vv.VipPrice != 0 { - list = append(list, &jdapi.SkuIdEntity{ - OutSkuId: thingIDmap[vv.SkuID], - }) - // result = []bool{true} - // return result, 0, err - } - } - if len(list) > 0 { - err = api.DelVipPrice(utils.Int2Str(storeMap.StoreID), list) - } - return result, 0, err - }, ctx, task, vendorThingIDs, 50, true) - // for _, v := range result1 { - // if v.(bool) { - // retVal = []int{storeMap.StoreID} - // return retVal, err - // } - // } - return retVal, err - }, storeMaps) - tasksch.HandleTask(task, nil, true).Run() - _, err = task.GetResult(0) + //var ( + // db = dao.GetDB() + // vendorThingIDs []int64 + // // result3 []int + //) + //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"}) + //thingIDmap := make(map[int64]string) + // + //for _, v := range things { + // if v.VendorThingID != "" { + // vendorThingIDs = append(vendorThingIDs, utils.Str2Int64(v.VendorThingID)) + // thingIDmap[utils.Str2Int64(v.VendorThingID)] = utils.Int64ToStr(v.ThingID) + // } + //} + // + //task := tasksch.NewParallelTask("uuuuu", tasksch.NewParallelConfig().SetIsContinueWhenError(true), ctx, + // func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { + // storeMap := batchItemList[0].(*model.StoreMap) + // // result1, _ := + // FreeBatchInfo("uuuuu2", func(task tasksch.ITask, batchedStoreSkuList []int64) (result interface{}, successCount int, err error) { + // api := jd.GetAPI("320406") + // priceInfo, _ := api.GetStationInfoList(storeMap.VendorStoreID, batchedStoreSkuList) + // var list []*jdapi.SkuIdEntity + // for _, vv := range priceInfo { + // if vv.VipPrice != 0 { + // list = append(list, &jdapi.SkuIdEntity{ + // OutSkuId: thingIDmap[vv.SkuID], + // }) + // // result = []bool{true} + // // return result, 0, err + // } + // } + // if len(list) > 0 { + // err = api.DelVipPrice(utils.Int2Str(storeMap.StoreID), list) + // } + // return result, 0, err + // }, ctx, task, vendorThingIDs, 50, true) + // // for _, v := range result1 { + // // if v.(bool) { + // // retVal = []int{storeMap.StoreID} + // // return retVal, err + // // } + // // } + // return retVal, err + // }, storeMaps) + //tasksch.HandleTask(task, nil, true).Run() + //_, err = task.GetResult(0) // for _, v := range result2 { // result3 = append(result3, v.(int)) // } @@ -1924,7 +1925,7 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) { // 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 }