diff --git a/business/jxstore/report/report.go b/business/jxstore/report/report.go index fb3ed46a1..eeddde1f8 100644 --- a/business/jxstore/report/report.go +++ b/business/jxstore/report/report.go @@ -429,56 +429,44 @@ func RefreshStoreManageState(ctx *jxcontext.Context) { createList = append(createList, v) } } - task2 := tasksch.NewParallelTask("GetStoreManageState2", tasksch.NewParallelConfig().SetParallelCount(50).SetIsContinueWhenError(true), ctx, + task2 := tasksch.NewParallelTask("deleteList", tasksch.NewParallelConfig().SetParallelCount(50).SetIsContinueWhenError(true), ctx, func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { - step := batchItemList[0].(int) - switch step { - case 0: - task3 := tasksch.NewParallelTask("deleteList", tasksch.NewParallelConfig().SetParallelCount(50).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(task3, nil, true).Run() - task3.GetResult(0) - case 1: - task3 := tasksch.NewParallelTask("createList", tasksch.NewParallelConfig().SetParallelCount(50).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 - }, createList) - tasksch.HandleTask(task3, nil, true).Run() - task3.GetResult(0) - case 2: - task3 := tasksch.NewParallelTask("updateList", tasksch.NewParallelConfig().SetParallelCount(50).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 - }, updateList) - tasksch.HandleTask(task3, nil, true).Run() - task3.GetResult(0) + storeID := batchItemList[0].(int) + storeManage := &model.StoreManageState{ + StoreID: storeID, + VendorID: vendorID, } + dao.DeleteEntity(db, storeManage, "StoreID", "VendorID") return retVal, err - }, []int{0, 1, 2}) - tasksch.HandleTask(task2, nil, true).Run() + }, deleteList) + tasksch.HandleTask(task2, task, true).Run() task2.GetResult(0) + task3 := tasksch.NewParallelTask("createList", tasksch.NewParallelConfig().SetParallelCount(50).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 + }, createList) + tasksch.HandleTask(task3, task, true).Run() + task3.GetResult(0) + task4 := tasksch.NewParallelTask("updateList", tasksch.NewParallelConfig().SetParallelCount(50).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 + }, updateList) + tasksch.HandleTask(task4, task, true).Run() + task4.GetResult(0) return retVal, err }, vendorIDs) tasksch.HandleTask(task, nil, true).Run()