From 1ae86dcdf59b33af8099193a41edb407776a27bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Wed, 17 Mar 2021 15:08:48 +0800
Subject: [PATCH] aa

---
 business/jxstore/report/report.go | 89 +++++++++++++++----------------
 business/jxstore/tempop/tempop.go |  3 --
 2 files changed, 44 insertions(+), 48 deletions(-)

diff --git a/business/jxstore/report/report.go b/business/jxstore/report/report.go
index b45b708f9..6f7c7f6aa 100644
--- a/business/jxstore/report/report.go
+++ b/business/jxstore/report/report.go
@@ -397,19 +397,18 @@ func GetManageState(ctx *jxcontext.Context, cityCodes []int, vendorID int) (getM
 
 func RefreshStoreManageState(ctx *jxcontext.Context) {
 	var (
-		db        = dao.GetDB()
-		vendorIDs = []int{model.VendorIDJD, model.VendorIDMTWM, model.VendorIDEBAI}
-		// messageFlag = time.Now().Hour() == 10 && time.Now().Minute() > 0 && time.Now().Minute() < 12
+		db          = dao.GetDB()
+		vendorIDs   = []int{model.VendorIDJD, model.VendorIDMTWM, model.VendorIDEBAI}
+		messageFlag = time.Now().Hour() == 10 && time.Now().Minute() > 0 && time.Now().Minute() < 12
 	)
 	task := tasksch.NewParallelTask("RefreshStoreManageState", tasksch.NewParallelConfig().SetParallelCount(3).SetIsContinueWhenError(true), ctx,
 		func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
 			vendorID := batchItemList[0].(int)
-			storeMaps, err := dao.GetStoresMapList(db, []int{vendorID}, nil, nil, model.StoreStatusAll, model.StoreIsSyncAll, "", "", "")
-			paged, err := dao.GetStoreManageState(db, nil, nil, vendorID, 0, 0, model.UnlimitedPageSize)
+			storeMaps, err := dao.GetStoresMapList(db, []int{vendorID}, nil, []int{model.StoreStatusOpened, model.StoreStatusClosed, model.StoreStatusHaveRest}, model.StoreStatusAll, model.StoreIsSyncAll, "", "", "")
+			storeManageStates, err := dao.GetStoreManageStateSimple(db, nil, nil, vendorID)
 			var (
-				storeManageStates      = paged.Data.([]*dao.GetStoreManageStateResult)
 				storeMapsMap           = make(map[int]*model.StoreMap)
-				storeManagesMap        = make(map[int]*dao.GetStoreManageStateResult)
+				storeManagesMap        = make(map[int]*model.StoreManageState)
 				deleteList             []int
 				createList, updateList []*model.StoreMap
 			)
@@ -429,44 +428,44 @@ func RefreshStoreManageState(ctx *jxcontext.Context) {
 					createList = append(createList, v)
 				}
 			}
-			// 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)
+			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()
diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go
index 4a70b3813..8cb7121b8 100644
--- a/business/jxstore/tempop/tempop.go
+++ b/business/jxstore/tempop/tempop.go
@@ -1957,9 +1957,6 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) {
 					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,
 			// 	func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
 			// 		storeID := batchItemList[0].(int)