diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go index e986cd649..0fbe2d9ef 100644 --- a/business/jxstore/tempop/tempop.go +++ b/business/jxstore/tempop/tempop.go @@ -1910,10 +1910,10 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) { //京东会员数据 var ( db = dao.GetDB() - pageSize = 20 + pageSize = 50 pages []int ) - for page := 1; page < 7678; page++ { + for page := 1; page < 3079; page++ { pages = append(pages, page) } task := tasksch.NewParallelTask2("京东会员", tasksch.NewParallelConfig().SetIsContinueWhenError(true).SetParallelCount(1), ctx, @@ -1921,25 +1921,27 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) { page := batchItemList[0].(int) results, _ := api.JdAPI.QueryMemberTransListByCondition(page, pageSize) for _, v := range results { - 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"), + 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) } - 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