提交代码。

Signed-off-by: zouap <zouap@pcl.ac.cn>

models/user_business_analysis.go

@@ -1028,12 +1028,12 @@ func CounDataByDateAndReCount(wikiCountMap map[string]int, startTime time.Time,
 			setUserMetrics(userMetrics, userRecord, start_unix, end_unix, dateRecord)
 			if getUserActivate(dateRecord) > 0 {
 				log.Info("has activity." + userRecord.Name)
-				addUserToMap(userNewAddActivity, userRecord.CreatedUnix, dateRecord.ID)
+				addUserToMap(userNewAddActivity, userRecord.CreatedUnix, dateRecord.ID, currentTimeNow)
 			}
 			if userRecord.IsActive {
-				addUserToMap(userAcitvateJsonMap, userRecord.CreatedUnix, dateRecord.ID)
+				addUserToMap(userAcitvateJsonMap, userRecord.CreatedUnix, dateRecord.ID, currentTimeNow)
 			}
-			addUserToMap(userCurrentDayRegistMap, userRecord.CreatedUnix, dateRecord.ID)
+			addUserToMap(userCurrentDayRegistMap, userRecord.CreatedUnix, dateRecord.ID, currentTimeNow)
 		}
 
 		indexTotal += PAGE_SIZE
@@ -1056,7 +1056,7 @@ func CounDataByDateAndReCount(wikiCountMap map[string]int, startTime time.Time,
 	useMetrics.NotActivateRegistUser = getMapKeyStringValue("NotActivateRegistUser", userMetrics)
 	useMetrics.TotalActivateRegistUser = getMapKeyStringValue("TotalActivateRegistUser", userMetrics)
 	useMetrics.TotalHasActivityUser = getMapKeyStringValue("TotalHasActivityUser", userMetrics)
-
+	useMetrics.CurrentDayRegistUser = getMapKeyStringValue("CurrentDayRegistUser", userMetrics)
 	count, err = sess.Where("type=0").Count(new(User))
 	if err != nil {
 		log.Info("query user error. return.")
@@ -1124,8 +1124,9 @@ func setUniqueUserId(jsonString string, value map[int64]int64) (string, int) {
 	return userIdArray, len(value)
 }
 
-func addUserToMap(currentUserActivity map[int64]map[int64]int64, registDate timeutil.TimeStamp, userId int64) {
-	CountDateTime := time.Date(registDate.Year(), registDate.AsTime().Month(), registDate.AsTime().Day(), 0, 1, 0, 0, registDate.AsTime().Location())
+func addUserToMap(currentUserActivity map[int64]map[int64]int64, registDate timeutil.TimeStamp, userId int64, currentTimeNow time.Time) {
+	registTime := registDate.AsTimeInLocation(currentTimeNow.Location())
+	CountDateTime := time.Date(registDate.Year(), registTime.Month(), registTime.Day(), 0, 1, 0, 0, currentTimeNow.Location())
 	CountDate := CountDateTime.Unix()
 	if _, ok := currentUserActivity[CountDate]; !ok {
 		userIdMap := make(map[int64]int64, 0)
@@ -1149,6 +1150,7 @@ func setUserMetrics(userMetrics map[string]int, user *User, start_time int64, en
 		} else {
 			userMetrics["NotActivateRegistUser"] = getMapKeyStringValue("NotActivateRegistUser", userMetrics) + 1
 		}
+		userMetrics["CurrentDayRegistUser"] = getMapKeyStringValue("CurrentDayRegistUser", userMetrics) + 1
 	}
 	if user.IsActive {
 		userMetrics["TotalActivateRegistUser"] = getMapKeyStringValue("TotalActivateRegistUser", userMetrics) + 1