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-19 10:25:12 +08:00
parent ec0df984ab
commit 83bd9726ac
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -179,7 +179,6 @@ func Init() {
defsch.FixedScheduler.ConfirmSelfTakeOrders(jxcontext.AdminCtx, []int{model.VendorIDJD}, time.Now().Add(-48*time.Hour), time.Now().Add(-30*time.Minute), true, true) defsch.FixedScheduler.ConfirmSelfTakeOrders(jxcontext.AdminCtx, []int{model.VendorIDJD}, time.Now().Add(-48*time.Hour), time.Now().Add(-30*time.Minute), true, true)
}, 5*time.Second, 10*time.Minute) }, 5*time.Second, 10*time.Minute)
//20分钟一次，两个统计
ScheduleTimerFuncByInterval(func() { ScheduleTimerFuncByInterval(func() {
report.RefreshStoreManageState(jxcontext.AdminCtx) report.RefreshStoreManageState(jxcontext.AdminCtx)
}, 5*time.Second, 20*time.Minute) }, 5*time.Second, 20*time.Minute)
@@ -356,6 +355,8 @@ func syncStoreSku() {
if true { if true {
syncFlag |= model.SyncFlagSaleMask syncFlag |= model.SyncFlagSaleMask
} }
} else {
syncFlag |= model.SyncFlagSaleMask
} }
task := tasksch.NewParallelTask("同步京西与平台数据", nil, jxcontext.AdminCtx, task := tasksch.NewParallelTask("同步京西与平台数据", nil, jxcontext.AdminCtx,
func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {

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

@@ -668,7 +668,7 @@ func RefreshJDMembers(ctx *jxcontext.Context) (err error) {
pageResult2, err := api.JdAPI.QueryMemberTransListByCondition("", "", pageNo, pageSize) pageResult2, err := api.JdAPI.QueryMemberTransListByCondition("", "", pageNo, pageSize)
if pageResult2 != nil { if pageResult2 != nil {
for _, v := range pageResult2.Rows { for _, v := range pageResult2.Rows {
if utils.Str2Time(v.Endtimestr+" 23:59:59").Sub(time.Now()) >= 0 { if utils.Str2Time(v.Endtimestr+" 23:59:59").Sub(time.Now()) >= 0 && v.Dealstatus == 0 {
if memberMap[v.Merchantcardno] != nil { //库里有这个人的会员信息了 if memberMap[v.Merchantcardno] != nil { //库里有这个人的会员信息了
if utils.Time2Str(memberMap[v.Merchantcardno].EndAt) != v.Endtimestr+" 23:59:59" { //可能这个人续费了，续存了 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].EndAt = utils.Str2Time(v.Endtimestr + " 23:59:59")

4
business/model/dao/report.go
View File

@@ -377,11 +377,11 @@ func DeletePriceReferHistory(db *DaoDB, snapDate time.Time) (num int64, err erro
func UserMemberReport(db *DaoDB, vendorID int, keyword string, offset, pageSize int) (page *model.PagedInfo, err error) { func UserMemberReport(db *DaoDB, vendorID int, keyword string, offset, pageSize int) (page *model.PagedInfo, err error) {
sql := ` sql := `
SELECT SQL_CALC_FOUND_ROWS DISTINCT a.mobile, IF(a.vendor_id = ?, c.name, b.consignee_name) name SELECT SQL_CALC_FOUND_ROWS DISTINCT a.mobile, IF(a.vendor_id = ?, c.name, b.consignee_name) name,
FROM user_member a FROM user_member a
LEFT JOIN goods_order b ON a.mobile = b.consignee_mobile2 AND b.status <> ? LEFT JOIN goods_order b ON a.mobile = b.consignee_mobile2 AND b.status <> ?
LEFT JOIN user c ON c.mobile = a.mobile LEFT JOIN user c ON c.mobile = a.mobile
GROUP BY GROUP BY 1, 2
` `
sqlParams := []interface{}{ sqlParams := []interface{}{
model.VendorIDJX, model.OrderStatusCanceled, model.VendorIDJX, model.OrderStatusCanceled,