diff --git a/business/jxstore/report/report.go b/business/jxstore/report/report.go index 8a8447d48..ce39cecde 100644 --- a/business/jxstore/report/report.go +++ b/business/jxstore/report/report.go @@ -662,46 +662,45 @@ func RefreshJDMembers(ctx *jxcontext.Context) (err error) { for ; page > 0; page-- { pages = append(pages, page) } - fmt.Println("RefreshJDMembers map 111111111111111111111111111111111", memberMap) - //task := tasksch.NewParallelTask2("RefreshJDMembers", tasksch.NewParallelConfig().SetIsContinueWhenError(true), ctx, - // func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, successCount int, err error) { - // pageNo := batchItemList[0].(int) - // pageResult2, err := api.JdAPI.QueryMemberTransListByCondition("", "", pageNo, pageSize) - // if pageResult2 != nil { - // for _, v := range pageResult2.Rows { - // if utils.Str2Time(v.Endtimestr+" 23:59:59").Sub(time.Now()) >= 0 && v.Dealstatus == 0 { - // if memberMap[v.Merchantcardno] != nil { //库里有这个人的会员信息了 - // if utils.Time2Str(memberMap[v.Merchantcardno].EndAt) != v.Endtimestr+" 23:59:59" { //可能这个人续费了,续存了 - // memberMap[v.Merchantcardno].EndAt = utils.Str2Time(v.Endtimestr + " 23:59:59") - // memberMap[v.Merchantcardno].DeletedAt = utils.DefaultTimeValue - // dao.UpdateEntity(db, memberMap[v.Merchantcardno], "EndAt", "DeletedAt") - // } - // } else { - // 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() + task := tasksch.NewParallelTask2("RefreshJDMembers", tasksch.NewParallelConfig().SetIsContinueWhenError(true), ctx, + func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, successCount int, err error) { + pageNo := batchItemList[0].(int) + pageResult2, err := api.JdAPI.QueryMemberTransListByCondition("", "", pageNo, pageSize) + if pageResult2 != nil { + for _, v := range pageResult2.Rows { + if utils.Str2Time(v.Endtimestr+" 23:59:59").Sub(time.Now()) >= 0 && v.Dealstatus == 0 { + if memberMap[v.Merchantcardno] != nil { //库里有这个人的会员信息了 + if utils.Time2Str(memberMap[v.Merchantcardno].EndAt) != v.Endtimestr+" 23:59:59" { //可能这个人续费了,续存了 + memberMap[v.Merchantcardno].EndAt = utils.Str2Time(v.Endtimestr + " 23:59:59") + memberMap[v.Merchantcardno].DeletedAt = utils.DefaultTimeValue + dao.UpdateEntity(db, memberMap[v.Merchantcardno], "EndAt", "DeletedAt") + } + } else { + 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() return err }