From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/job/team/TeamStatisticJob.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/job/team/TeamStatisticJob.java b/fanli/src/main/java/com/yeshi/fanli/job/team/TeamStatisticJob.java
index ee696d4..c07342a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/job/team/TeamStatisticJob.java
+++ b/fanli/src/main/java/com/yeshi/fanli/job/team/TeamStatisticJob.java
@@ -9,6 +9,7 @@
import com.xxl.job.core.biz.model.ReturnT;
import com.xxl.job.core.handler.annotation.XxlJob;
import com.yeshi.fanli.service.manger.user.UserTeamStatisticManager;
+import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TimeUtil;
/**
@@ -35,10 +36,13 @@
@XxlJob("updateTeamStatisticLevelCount")
public ReturnT<String> updatePDDOrder(String param) throws Exception {
long now = System.currentTimeMillis();
+ if (!StringUtil.isNullOrEmpty(param)) {
+ now = TimeUtil.convertToTimeTemp(param, "yyyy-MM-dd");
+ }
Date minTime = new Date(TimeUtil.convertToTimeTemp(TimeUtil.getGernalTime(now, "yyyy-MM-dd"), "yyyy-MM-dd"));
Date maxTime = new Date(TimeUtil
.convertToTimeTemp(TimeUtil.getGernalTime(now + 1000 * 60 * 60 * 24L, "yyyy-MM-dd"), "yyyy-MM-dd"));
- userTeamStatisticManager.syncInviteData(minTime, maxTime);
+ userTeamStatisticManager.syncInviteAndTotalData(minTime, maxTime);
userTeamStatisticManager.syncVIPData(minTime, maxTime);
return ReturnT.SUCCESS;
}
--
Gitblit v1.8.0