From e1a26c1444c6adecd2990a37bb5efe8879e41c64 Mon Sep 17 00:00:00 2001
From: suyl <770236076@qq.com>
Date: Tue, 8 Jun 2021 11:19:31 +0800
Subject: [PATCH] aa

---
 business/jxstore/tempop/tempop.go | 130 +++++++++++++++---------------
 1 file changed, 67 insertions(+), 63 deletions(-)

diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go
index f28e3262d..88595d474 100644
--- a/business/jxstore/tempop/tempop.go
+++ b/business/jxstore/tempop/tempop.go
@@ -1840,58 +1840,62 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) {
 	// tasksch.HandleTask(task, nil, true).Run()
 	// task.GetID()
 	//删京东会员价
-	//var (
-	//	db             = dao.GetDB()
-	//	vendorThingIDs []int64
-	//	// result3        []int
-	//)
-	//storeMaps, _ := dao.GetStoresMapList(db, []int{model.VendorIDJD}, nil, nil, model.StoreStatusAll, model.StoreIsSyncAll, "", "", "320406")
-	//things, _ := dao.GetThingMapList(db, model.ThingTypeSku, []int{model.VendorIDJD}, []int{34322, 24206, 24207}, []string{"320406"})
-	//thingIDmap := make(map[int64]string)
+	var (
+		db = dao.GetDB()
+		//vendorThingIDs []int64
+		// result3        []int
+	)
+	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)
 	//
-	//for _, v := range things {
-	//	if v.VendorThingID != "" {
-	//		vendorThingIDs = append(vendorThingIDs, utils.Str2Int64(v.VendorThingID))
-	//		thingIDmap[utils.Str2Int64(v.VendorThingID)] = utils.Int64ToStr(v.ThingID)
-	//	}
+	for _, v := range things {
+		if v.VendorThingID != "" {
+			//vendorThingIDs = append(vendorThingIDs, utils.Str2Int64(v.VendorThingID))
+			thingIDmap[v.ThingID] = v.VendorThingID
+		}
+	}
+	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)
+			storeSkus, _ := dao.GetStoresSkusInfo(db, []int{storeMap.StoreID}, nil)
+			// result1, _ :=
+			FreeBatchInfo("uuuuu2", func(task tasksch.ITask, batchedStoreSkuList []*model.StoreSkuBind) (result interface{}, successCount int, err error) {
+				api := jd.GetAPI("320406")
+				var ids []int64
+				for _, v := range batchedStoreSkuList {
+					ids = append(ids, utils.Str2Int64(thingIDmap[int64(v.SkuID)]))
+				}
+				priceInfo, _ := api.GetStationInfoList(storeMap.VendorStoreID, ids)
+				var list []*jdapi.SkuIdEntity
+				for _, vv := range priceInfo {
+					if vv.VipPrice != 0 {
+						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)
+				}
+				return result, 0, err
+			}, ctx, task, storeSkus, 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)
+	//for _, v := range result2 {
+	//	result3 = append(result3, v.(int))
 	//}
-	//
-	//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)
-	//		// 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
-	//			for _, vv := range priceInfo {
-	//				if vv.VipPrice != 0 {
-	//					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)
-	//			}
-	//			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)
-	// for _, v := range result2 {
-	// 	result3 = append(result3, v.(int))
-	// }
-	// fmt.Println("result3", result3)
+	//fmt.Println("result3", result3)
 	//京东账号更新
 	// var (
 	// 	db = dao.GetDB()
@@ -1923,16 +1927,16 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) {
 	//		dao.UpdateEntity(db, v, "ConsigneeMobile2")
 	//	}
 	//}
-	order, _ := partner.CurOrderManager.LoadOrder("2113480902000652", model.VendorIDJD)
-	handler := partner.GetPurchaseOrderHandlerFromVendorID(model.VendorIDJD)
-	order2, _ := handler.GetOrder(order.VendorOrgCode, order.VendorOrderID, "")
-	if len(order.Skus) == 0 {
-		if len(order2.Skus) > 0 {
-			for _, v := range order2.Skus {
-				dao.CreateEntity(dao.GetDB(), v)
-			}
-		}
-	}
+	//order, _ := partner.CurOrderManager.LoadOrder("2113480902000652", model.VendorIDJD)
+	//handler := partner.GetPurchaseOrderHandlerFromVendorID(model.VendorIDJD)
+	//order2, _ := handler.GetOrder(order.VendorOrgCode, order.VendorOrderID, "")
+	//if len(order.Skus) == 0 {
+	//	if len(order2.Skus) > 0 {
+	//		for _, v := range order2.Skus {
+	//			dao.CreateEntity(dao.GetDB(), v)
+	//		}
+	//	}
+	//}
 
 	return err
 }
@@ -1955,12 +1959,12 @@ func FreeBatchInfo2(name string, handler func(tasksch.ITask, []*jdapi.SkuIdEntit
 	return resultList, err
 }
 
-func FreeBatchInfo(name string, handler func(tasksch.ITask, []int64) (interface{}, int, error), ctx *jxcontext.Context, parentTask tasksch.ITask, storeSkuList []int64, batchSize int, isContinueWhenError bool) (resultList []interface{}, err error) {
+func FreeBatchInfo(name string, handler func(tasksch.ITask, []*model.StoreSkuBind) (interface{}, int, error), ctx *jxcontext.Context, parentTask tasksch.ITask, storeSkuList []*model.StoreSkuBind, batchSize int, isContinueWhenError bool) (resultList []interface{}, err error) {
 	task := tasksch.NewParallelTask2(fmt.Sprintf("FreeBatchInfo:%s", name), tasksch.NewParallelConfig().SetParallelCount(1).SetBatchSize(batchSize).SetIsContinueWhenError(isContinueWhenError), ctx,
 		func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, successCount int, err error) {
-			batchStoreSkuList := make([]int64, len(batchItemList))
+			batchStoreSkuList := make([]*model.StoreSkuBind, len(batchItemList))
 			for k, v := range batchItemList {
-				batchStoreSkuList[k] = v.(int64)
+				batchStoreSkuList[k] = v.(*model.StoreSkuBind)
 			}
 			retVal, successCount, err = handler(task, batchStoreSkuList)
 			if err != nil {