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-- { for ; page > 0; page-- {
pages = append(pages, page) pages = append(pages, page)
} }
task := tasksch.NewParallelTask2("RefreshJDMembers", tasksch.NewParallelConfig().SetIsContinueWhenError(true), ctx, fmt.Println("RefreshJDMembers map 111111111111111111111111111111111", memberMap)
func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, successCount int, err error) { //task := tasksch.NewParallelTask2("RefreshJDMembers", tasksch.NewParallelConfig().SetIsContinueWhenError(true), ctx,
pageNo := batchItemList[0].(int) // func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, successCount int, err error) {
pageResult2, err := api.JdAPI.QueryMemberTransListByCondition("", "", pageNo, pageSize) // pageNo := batchItemList[0].(int)
if pageResult2 != nil { // pageResult2, err := api.JdAPI.QueryMemberTransListByCondition("", "", pageNo, pageSize)
for _, v := range pageResult2.Rows { // if pageResult2 != nil {
if utils.Str2Time(v.Endtimestr+" 23:59:59").Sub(time.Now()) >= 0 && v.Dealstatus == 0 { // for _, v := range pageResult2.Rows {
if memberMap[v.Merchantcardno] != nil { //库里有这个人的会员信息了 // if utils.Str2Time(v.Endtimestr+" 23:59:59").Sub(time.Now()) >= 0 && v.Dealstatus == 0 {
if utils.Time2Str(memberMap[v.Merchantcardno].EndAt) != v.Endtimestr+" 23:59:59" { //可能这个人续费了，续存了 // if memberMap[v.Merchantcardno] != nil { //库里有这个人的会员信息了
memberMap[v.Merchantcardno].EndAt = utils.Str2Time(v.Endtimestr + " 23:59:59") // if utils.Time2Str(memberMap[v.Merchantcardno].EndAt) != v.Endtimestr+" 23:59:59" { //可能这个人续费了，续存了
dao.UpdateEntity(db, memberMap[v.Merchantcardno], "EndAt") // memberMap[v.Merchantcardno].EndAt = utils.Str2Time(v.Endtimestr + " 23:59:59")
} // memberMap[v.Merchantcardno].DeletedAt = utils.DefaultTimeValue
} else { // dao.UpdateEntity(db, memberMap[v.Merchantcardno], "EndAt", "DeletedAt")
userMember := &model.UserMember{ // }
VendorOrderID: v.Orderid, // } else {
VendorID: model.VendorIDJD, // userMember := &model.UserMember{
Mobile: v.Merchantcardno, // VendorOrderID: v.Orderid,
MemberType: 1, // VendorID: model.VendorIDJD,
EndAt: utils.Str2Time(v.Endtimestr + " 23:59:59"), // Mobile: v.Merchantcardno,
} // MemberType: 1,
dao.WrapAddIDCULDEntity(userMember, "jxadmin") // EndAt: utils.Str2Time(v.Endtimestr + " 23:59:59"),
if v.Createtime != "" { // }
userMember.CreatedAt = utils.Str2Time(v.Createtime) // dao.WrapAddIDCULDEntity(userMember, "jxadmin")
} else { // if v.Createtime != "" {
userMember.CreatedAt = utils.Str2Time(v.Cardcreatetime) // userMember.CreatedAt = utils.Str2Time(v.Createtime)
} // } else {
if userMember.EndAt.Sub(time.Now()) <= 0 { // userMember.CreatedAt = utils.Str2Time(v.Cardcreatetime)
userMember.DeletedAt = time.Now() // }
} // if userMember.EndAt.Sub(time.Now()) <= 0 {
dao.CreateEntity(db, userMember) // userMember.DeletedAt = time.Now()
} // }
} // dao.CreateEntity(db, userMember)
} // }
} // }
return retVal, successCount, err // }
}, pages) // }
tasksch.HandleTask(task, nil, true).Run() // return retVal, successCount, err
task.GetID() // }, pages)
//tasksch.HandleTask(task, nil, true).Run()
//task.GetID()
return err return err
} }

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

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