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-03-17 14:52:46 +08:00
parent bb24236869
commit 9dc520daa3
2 changed files with 152 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
business/jxstore/report/report.go
View File

@@ -399,7 +399,7 @@ func RefreshStoreManageState(ctx *jxcontext.Context) {
var ( var (
db = dao.GetDB() db = dao.GetDB()
vendorIDs = []int{model.VendorIDJD, model.VendorIDMTWM, model.VendorIDEBAI} vendorIDs = []int{model.VendorIDJD, model.VendorIDMTWM, model.VendorIDEBAI}
messageFlag = time.Now().Hour() == 10 && time.Now().Minute() > 0 && time.Now().Minute() < 12 // messageFlag = time.Now().Hour() == 10 && time.Now().Minute() > 0 && time.Now().Minute() < 12
) )
task := tasksch.NewParallelTask("RefreshStoreManageState", tasksch.NewParallelConfig().SetParallelCount(3).SetIsContinueWhenError(true), ctx, task := tasksch.NewParallelTask("RefreshStoreManageState", tasksch.NewParallelConfig().SetParallelCount(3).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) {
@@ -429,44 +429,44 @@ func RefreshStoreManageState(ctx *jxcontext.Context) {
createList = append(createList, v) createList = append(createList, v)
} }
} }
task2 := tasksch.NewParallelTask("deleteList", tasksch.NewParallelConfig().SetIsContinueWhenError(true), ctx, // task2 := tasksch.NewParallelTask("deleteList", 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) {
storeID := batchItemList[0].(int) // storeID := batchItemList[0].(int)
storeManage := &model.StoreManageState{ // storeManage := &model.StoreManageState{
StoreID: storeID, // StoreID: storeID,
VendorID: vendorID, // VendorID: vendorID,
} // }
dao.DeleteEntity(db, storeManage, "StoreID", "VendorID") // dao.DeleteEntity(db, storeManage, "StoreID", "VendorID")
return retVal, err // return retVal, err
}, deleteList) // }, deleteList)
tasksch.HandleTask(task2, task, true).Run() // tasksch.HandleTask(task2, task, true).Run()
task2.GetResult(0) // task2.GetResult(0)
task3 := tasksch.NewParallelTask("createList", tasksch.NewParallelConfig().SetIsContinueWhenError(true), ctx, // task3 := tasksch.NewParallelTask("createList", 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)
if storeMap.VendorOrgCode == "" || storeMap.VendorStoreID == "" { // if storeMap.VendorOrgCode == "" || storeMap.VendorStoreID == "" {
return retVal, err // return retVal, err
} // }
storeDetail, _ := dao.GetStoreDetail(db, storeMap.StoreID, vendorID, storeMap.VendorOrgCode) // storeDetail, _ := dao.GetStoreDetail(db, storeMap.StoreID, vendorID, storeMap.VendorOrgCode)
storeManage := buildStoreManageState(ctx, db, storeMap, storeDetail, messageFlag) // storeManage := buildStoreManageState(ctx, db, storeMap, storeDetail, messageFlag)
dao.CreateEntity(db, storeManage) // dao.CreateEntity(db, storeManage)
return retVal, err // return retVal, err
}, createList) // }, createList)
tasksch.HandleTask(task3, task, true).Run() // tasksch.HandleTask(task3, task, true).Run()
task3.GetResult(0) // task3.GetResult(0)
task4 := tasksch.NewParallelTask("updateList", tasksch.NewParallelConfig().SetIsContinueWhenError(true), ctx, // task4 := tasksch.NewParallelTask("updateList", 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)
if storeMap.VendorOrgCode == "" || storeMap.VendorStoreID == "" { // if storeMap.VendorOrgCode == "" || storeMap.VendorStoreID == "" {
return retVal, err // return retVal, err
} // }
storeDetail, _ := dao.GetStoreDetail(db, storeMap.StoreID, vendorID, storeMap.VendorOrgCode) // storeDetail, _ := dao.GetStoreDetail(db, storeMap.StoreID, vendorID, storeMap.VendorOrgCode)
storeManage := buildStoreManageState(ctx, db, storeMap, storeDetail, messageFlag) // storeManage := buildStoreManageState(ctx, db, storeMap, storeDetail, messageFlag)
dao.UpdateEntity(db, storeManage) // dao.UpdateEntity(db, storeManage)
return retVal, err // return retVal, err
}, updateList) // }, updateList)
tasksch.HandleTask(task4, task, true).Run() // tasksch.HandleTask(task4, task, true).Run()
task4.GetResult(0) // task4.GetResult(0)
return retVal, err return retVal, err
}, vendorIDs) }, vendorIDs)
tasksch.HandleTask(task, nil, true).Run() tasksch.HandleTask(task, nil, true).Run()

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

@@ -1888,44 +1888,121 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) {
// }, storeMaps) // }, storeMaps)
// tasksch.HandleTask(task, nil, true).Run() // tasksch.HandleTask(task, nil, true).Run()
// _, err = task.GetResult(0) // _, err = task.GetResult(0)
// var (
// db = dao.GetDB()
// skuNames []*model.SkuName
// failedSku []string
// )
// sql := `
// SELECT * FROM sku_name WHERE deleted_at = ? AND img = ?
// `
// sqlParams := []interface{}{
// utils.DefaultTimeValue, model.NOSkuNameImg,
// }
// dao.GetRows(db, &skuNames, sql, sqlParams)
// for _, v := range skuNames {
// if v.Upc != nil {
// result, _ := api.MtwmAPI.GetStandardProductListWithCond(*v.Upc)
// if result != nil {
// if v.Img == model.NOSkuNameImg {
// imgs := strings.Split(result.Pic, ",")
// if len(imgs) == 1 {
// v.Img = imgs[0]
// }
// if len(imgs) == 2 {
// v.Img = imgs[0]
// v.Img2 = imgs[1]
// }
// if len(imgs) >= 3 {
// v.Img = imgs[0]
// v.Img2 = imgs[1]
// v.Img3 = imgs[2]
// }
// dao.UpdateEntity(db, v, "Img", "Img2", "Img3")
// }
// } else {
// failedSku = append(failedSku, *v.Upc)
// }
// }
// }
var ( var (
db = dao.GetDB() db = dao.GetDB()
skuNames []*model.SkuName vendorIDs = []int{model.VendorIDJD, model.VendorIDMTWM, model.VendorIDEBAI}
failedSku []string // messageFlag = time.Now().Hour() == 10 && time.Now().Minute() > 0 && time.Now().Minute() < 12
) )
sql := ` task := tasksch.NewParallelTask("RefreshStoreManageState", tasksch.NewParallelConfig().SetParallelCount(3).SetIsContinueWhenError(true), ctx,
SELECT * FROM sku_name WHERE deleted_at = ? AND img = ? func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
` vendorID := batchItemList[0].(int)
sqlParams := []interface{}{ storeMaps, err := dao.GetStoresMapList(db, []int{vendorID}, nil, nil, model.StoreStatusAll, model.StoreIsSyncAll, "", "", "")
utils.DefaultTimeValue, model.NOSkuNameImg, paged, err := dao.GetStoreManageState(db, nil, nil, vendorID, 0, 0, model.UnlimitedPageSize)
} var (
dao.GetRows(db, &skuNames, sql, sqlParams) storeManageStates = paged.Data.([]*dao.GetStoreManageStateResult)
for _, v := range skuNames { storeMapsMap = make(map[int]*model.StoreMap)
if v.Upc != nil { storeManagesMap = make(map[int]*dao.GetStoreManageStateResult)
result, _ := api.MtwmAPI.GetStandardProductListWithCond(*v.Upc) deleteList []int
if result != nil { createList, updateList []*model.StoreMap
if v.Img == model.NOSkuNameImg { )
imgs := strings.Split(result.Pic, ",") for _, v := range storeMaps {
if len(imgs) == 1 { storeMapsMap[v.StoreID] = v
v.Img = imgs[0]
}
if len(imgs) == 2 {
v.Img = imgs[0]
v.Img2 = imgs[1]
}
if len(imgs) >= 3 {
v.Img = imgs[0]
v.Img2 = imgs[1]
v.Img3 = imgs[2]
}
dao.UpdateEntity(db, v, "Img", "Img2", "Img3")
} }
for _, v := range storeManageStates {
storeManagesMap[v.StoreID] = v
if storeMapsMap[v.StoreID] != nil {
updateList = append(updateList, storeMapsMap[v.StoreID])
} else { } else {
failedSku = append(failedSku, *v.Upc) deleteList = append(deleteList, v.StoreID)
} }
} }
for _, v := range storeMapsMap {
if storeManagesMap[v.StoreID] == nil {
createList = append(createList, v)
} }
fmt.Println("failedSku11111111111111111111111111111111", failedSku) }
fmt.Println("aaaaaaaaaaaaaaaaa", len(updateList))
fmt.Println("bbbbbbbbbbbbbbbbbbbbb", utils.Format4Output(deleteList, false))
fmt.Println("ccccccccccccccccccccccccc", utils.Format4Output(createList, false))
// task2 := tasksch.NewParallelTask("deleteList", tasksch.NewParallelConfig().SetIsContinueWhenError(true), ctx,
// func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
// storeID := batchItemList[0].(int)
// storeManage := &model.StoreManageState{
// StoreID: storeID,
// VendorID: vendorID,
// }
// dao.DeleteEntity(db, storeManage, "StoreID", "VendorID")
// return retVal, err
// }, deleteList)
// tasksch.HandleTask(task2, task, true).Run()
// task2.GetResult(0)
// task3 := tasksch.NewParallelTask("createList", tasksch.NewParallelConfig().SetIsContinueWhenError(true), ctx,
// func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
// storeMap := batchItemList[0].(*model.StoreMap)
// if storeMap.VendorOrgCode == "" || storeMap.VendorStoreID == "" {
// return retVal, err
// }
// storeDetail, _ := dao.GetStoreDetail(db, storeMap.StoreID, vendorID, storeMap.VendorOrgCode)
// storeManage := buildStoreManageState(ctx, db, storeMap, storeDetail, messageFlag)
// dao.CreateEntity(db, storeManage)
// return retVal, err
// }, createList)
// tasksch.HandleTask(task3, task, true).Run()
// task3.GetResult(0)
// task4 := tasksch.NewParallelTask("updateList", tasksch.NewParallelConfig().SetIsContinueWhenError(true), ctx,
// func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
// storeMap := batchItemList[0].(*model.StoreMap)
// if storeMap.VendorOrgCode == "" || storeMap.VendorStoreID == "" {
// return retVal, err
// }
// storeDetail, _ := dao.GetStoreDetail(db, storeMap.StoreID, vendorID, storeMap.VendorOrgCode)
// storeManage := buildStoreManageState(ctx, db, storeMap, storeDetail, messageFlag)
// dao.UpdateEntity(db, storeManage)
// return retVal, err
// }, updateList)
// tasksch.HandleTask(task4, task, true).Run()
// task4.GetResult(0)
return retVal, err
}, vendorIDs)
tasksch.HandleTask(task, nil, true).Run()
task.GetID()
return err return err
} }