From a353963998d6e5828ebbf2dd3f21c21f40b4dfd9 Mon Sep 17 00:00:00 2001
From: suyl <770236076@qq.com>
Date: Fri, 14 May 2021 11:17:42 +0800
Subject: [PATCH] aa

---
 business/jxstore/tempop/tempop.go | 55 +++++++++++++------------------
 1 file changed, 23 insertions(+), 32 deletions(-)

diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go
index eab4a8fe4..32529c0be 100644
--- a/business/jxstore/tempop/tempop.go
+++ b/business/jxstore/tempop/tempop.go
@@ -1911,43 +1911,34 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) {
 	var (
 		db       = dao.GetDB()
 		pageSize = 20
-		pages    []int
 	)
 	for page := 7697; page >= 1; page-- {
-		pages = append(pages, page)
-	}
-	task := tasksch.NewParallelTask2("京东会员", tasksch.NewParallelConfig().SetIsContinueWhenError(true).SetParallelCount(1), ctx,
-		func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, successCount int, err error) {
-			page := batchItemList[0].(int)
-			results, _ := api.JdAPI.QueryMemberTransListByCondition(page, pageSize)
-			for _, v := range results {
-				if utils.Str2Time(v.Endtimestr+" 23:59:59").Sub(time.Now()) >= 0 {
-					userMembers, _ := dao.GetUserMember(db, "", "", v.Merchantcardno, model.VendorIDJD, 0, -1)
-					if len(userMembers) == 0 {
-						userMember := &model.UserMember{
-							VendorOrderID: v.Orderid,
-							VendorID:      model.VendorIDJD,
-							Mobile:        v.Merchantcardno,
-							MemberType:    1,
-							EndAt:         utils.Str2Time(v.Endtimestr + " 23:59:59"),
-						}
-						dao.WrapAddIDCULDEntity(userMember, "jxadmin")
-						if v.Createtime != "" {
-							userMember.CreatedAt = utils.Str2Time(v.Createtime)
-						} else {
-							userMember.CreatedAt = utils.Str2Time(v.Cardcreatetime)
-						}
-						if userMember.EndAt.Sub(time.Now()) <= 0 {
-							userMember.DeletedAt = time.Now()
-						}
-						dao.CreateEntity(db, userMember)
+		results, _ := api.JdAPI.QueryMemberTransListByCondition(page, pageSize)
+		for _, v := range results {
+			if utils.Str2Time(v.Endtimestr+" 23:59:59").Sub(time.Now()) >= 0 {
+				userMembers, _ := dao.GetUserMember(db, "", "", v.Merchantcardno, model.VendorIDJD, 0, -1)
+				if len(userMembers) == 0 {
+					userMember := &model.UserMember{
+						VendorOrderID: v.Orderid,
+						VendorID:      model.VendorIDJD,
+						Mobile:        v.Merchantcardno,
+						MemberType:    1,
+						EndAt:         utils.Str2Time(v.Endtimestr + " 23:59:59"),
 					}
+					dao.WrapAddIDCULDEntity(userMember, "jxadmin")
+					if v.Createtime != "" {
+						userMember.CreatedAt = utils.Str2Time(v.Createtime)
+					} else {
+						userMember.CreatedAt = utils.Str2Time(v.Cardcreatetime)
+					}
+					if userMember.EndAt.Sub(time.Now()) <= 0 {
+						userMember.DeletedAt = time.Now()
+					}
+					dao.CreateEntity(db, userMember)
 				}
 			}
-			return retVal, successCount, err
-		}, pages)
-	tasksch.HandleTask(task, nil, true).Run()
-	task.GetID()
+		}
+	}
 	//刷新京东真实订单号
 	//var (
 	//	db    = dao.GetDB()