diff --git a/business/jxstore/report/report.go b/business/jxstore/report/report.go index 31c891be0..ac00af658 100644 --- a/business/jxstore/report/report.go +++ b/business/jxstore/report/report.go @@ -666,31 +666,33 @@ func RefreshJDMembers(ctx *jxcontext.Context) (err error) { 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) - for _, v := range pageResult2.Rows { - if utils.Str2Time(v.Endtimestr+" 23:59:59").Sub(time.Now()) >= 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") - dao.UpdateEntity(db, memberMap[v.Merchantcardno], "EndAt") - } - } 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) + if pageResult2 != nil { + for _, v := range pageResult2.Rows { + if utils.Str2Time(v.Endtimestr+" 23:59:59").Sub(time.Now()) >= 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") + dao.UpdateEntity(db, memberMap[v.Merchantcardno], "EndAt") + } } else { - userMember.CreatedAt = utils.Str2Time(v.Cardcreatetime) + 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) } - if userMember.EndAt.Sub(time.Now()) <= 0 { - userMember.DeletedAt = time.Now() - } - dao.CreateEntity(db, userMember) } } }