liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aa

Browse Source
This commit is contained in:
suyl
2021-05-27 10:55:14 +08:00
parent 3dc1c1b4c9
commit 0dd82e1d7b
2 changed files with 42 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
business/jxstore/report/report.go
View File

@@ -662,44 +662,46 @@ func RefreshJDMembers(ctx *jxcontext.Context) (err error) {
for ; page > 0; page-- {
pages = append(pages, page)
}
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")
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)
} 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()
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()
return err
}

3
business/jxstore/tempop/tempop.go
View File

@@ -4,6 +4,7 @@ import (
"bytes"
"context"
"fmt"
"git.rosy.net.cn/jx-callback/business/jxstore/report"
"regexp"
"strings"
"time"
@@ -1923,7 +1924,7 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) {
// dao.UpdateEntity(db, v, "ConsigneeMobile2")
// }
//}
cms.SendQywxPeopleCount(jxcontext.AdminCtx)
report.RefreshJDMembers(jxcontext.AdminCtx)
return err
}