From 9839e1ed91157c200eb3e149aee3603f57cf71c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Mon, 12 Apr 2021 10:41:26 +0800
Subject: [PATCH] aa

---
 business/jxstore/misc/misc.go     |  6 +++---
 business/jxstore/tempop/tempop.go | 33 +++++++++++++++++++++----------
 2 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go
index c337c2128..e7a6ac260 100644
--- a/business/jxstore/misc/misc.go
+++ b/business/jxstore/misc/misc.go
@@ -240,9 +240,9 @@ func Init() {
 		ScheduleTimerFunc("BackUpStoreSkuBind", func() {
 			cms.BackUpStoreSkuBind(jxcontext.AdminCtx, true, true)
 		}, backUpStoreSkuBindList)
-		ScheduleTimerFunc("SendNoCatSkusToOperater", func() {
-			cms.SendNoCatSkusToOperater(jxcontext.AdminCtx)
-		}, autoPayForPopluarManList)
+		// ScheduleTimerFunc("SendNoCatSkusToOperater", func() {
+		// 	cms.SendNoCatSkusToOperater(jxcontext.AdminCtx)
+		// }, autoPayForPopluarManList)
 		ScheduleTimerFunc("CleanStoreIsBoughtMatter", func() {
 			cms.CleanStoreIsBoughtMatter(jxcontext.AdminCtx)
 		}, priceReferTimeList)
diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go
index 62c4b486a..ce5140c75 100644
--- a/business/jxstore/tempop/tempop.go
+++ b/business/jxstore/tempop/tempop.go
@@ -1843,8 +1843,9 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) {
 	var (
 		db             = dao.GetDB()
 		vendorThingIDs []int64
+		result3        []int
 	)
-	storeMaps, _ := dao.GetStoresMapList(db, []int{model.VendorIDJD}, []int{103035}, nil, model.StoreStatusAll, model.StoreIsSyncAll, "", "", "320406")
+	storeMaps, _ := dao.GetStoresMapList(db, []int{model.VendorIDJD}, nil, nil, model.StoreStatusAll, model.StoreIsSyncAll, "", "", "320406")
 	things, _ := dao.GetThingMapList(db, model.ThingTypeSku, []int{model.VendorIDJD}, nil, []string{"320406"})
 	thingIDmap := make(map[int64]string)
 
@@ -1858,26 +1859,38 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) {
 	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)
-			FreeBatchInfo("uuuuu2", func(task tasksch.ITask, batchedStoreSkuList []int64) (result interface{}, successCount int, err error) {
+			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
+				// var list []*jdapi.SkuIdEntity
 				for _, vv := range priceInfo {
 					if vv.VipPrice != 0 {
-						list = append(list, &jdapi.SkuIdEntity{
-							OutSkuId: thingIDmap[vv.SkuID],
-						})
+						// 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)
-				}
+				// 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)
+	result2, err := task.GetResult(0)
+	for _, v := range result2 {
+		result3 = append(result3, v.(int))
+	}
+	fmt.Println("result3", result3)
 	//京东账号更新
 	// var (
 	// 	db = dao.GetDB()