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 15:08:48 +08:00
parent d40a381552
commit 1ae86dcdf5
2 changed files with 44 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -397,19 +397,18 @@ func GetManageState(ctx *jxcontext.Context, cityCodes []int, vendorID int) (getM
func RefreshStoreManageState(ctx *jxcontext.Context) { 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) {
vendorID := batchItemList[0].(int) vendorID := batchItemList[0].(int)
storeMaps, err := dao.GetStoresMapList(db, []int{vendorID}, nil, nil, model.StoreStatusAll, model.StoreIsSyncAll, "", "", "") storeMaps, err := dao.GetStoresMapList(db, []int{vendorID}, nil, []int{model.StoreStatusOpened, model.StoreStatusClosed, model.StoreStatusHaveRest}, model.StoreStatusAll, model.StoreIsSyncAll, "", "", "")
paged, err := dao.GetStoreManageState(db, nil, nil, vendorID, 0, 0, model.UnlimitedPageSize) storeManageStates, err := dao.GetStoreManageStateSimple(db, nil, nil, vendorID)
var ( var (
storeManageStates = paged.Data.([]*dao.GetStoreManageStateResult)
storeMapsMap = make(map[int]*model.StoreMap) storeMapsMap = make(map[int]*model.StoreMap)
storeManagesMap = make(map[int]*dao.GetStoreManageStateResult) storeManagesMap = make(map[int]*model.StoreManageState)
deleteList []int deleteList []int
createList, updateList []*model.StoreMap createList, updateList []*model.StoreMap
) )
@@ -429,44 +428,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()

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

@@ -1957,9 +1957,6 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) {
createList = append(createList, v) createList = append(createList, v)
} }
} }
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, // 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)