Merge branch 'fix-activity' into dev

@@ -384,46 +384,6 @@ func (statisticsService *StatisticsService) EmployeesContributionsStatistics(emp
 	}
 	}
 }
 }
 
 
-// 员工排行榜统计 (弃用)
-//func (statisticsService *StatisticsService) EmployeesRankingListStatistics(employeesRankingListStatisticsCommand *command.EmployeesRankingListStatisticsCommand) (interface{}, error) {
-//	if err := employeesRankingListStatisticsCommand.ValidateCommand(); err != nil {
-//		return nil, application.ThrowError(application.ARG_ERROR, err.Error())
-//	}
-//	transactionContext, err := factory.CreateTransactionContext(nil)
-//	if err != nil {
-//		return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
-//	}
-//	if err := transactionContext.StartTransaction(); err != nil {
-//		return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
-//	}
-//	defer func() {
-//		transactionContext.RollbackTransaction()
-//	}()
-//
-//	var employeeDao *dao.EmployeeDao
-//	if value, err := factory.CreateEmployeeDao(map[string]interface{}{
-//		"transactionContext": transactionContext,
-//	}); err != nil {
-//		return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
-//	} else {
-//		employeeDao = value
-//	}
-//
-//	if employeesRankingListStatisticsCommand.StartTime.IsZero() && employeesRankingListStatisticsCommand.EndTime.IsZero() {
-//		employeesRankingListStatisticsCommand.StartTime = time.Date(1971, time.Month(1), 1, 0, 0, 0, 0, time.Now().Location())
-//		employeesRankingListStatisticsCommand.EndTime = time.Now().Local()
-//	}
-//
-//	if employeesRankingListStatistics, err := employeeDao.CalculateEmployeesRankingList(employeesRankingListStatisticsCommand.CompanyId, employeesRankingListStatisticsCommand.StartTime, employeesRankingListStatisticsCommand.EndTime, employeesRankingListStatisticsCommand.Offset, employeesRankingListStatisticsCommand.Limit); err != nil {
-//		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
-//	} else {
-//		if err := transactionContext.CommitTransaction(); err != nil {
-//			return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
-//		}
-//		return employeesRankingListStatistics, nil
-//	}
-//}
-
 // 贡献值、财富值榜单
 // 贡献值、财富值榜单
 func (statisticsService *StatisticsService) ContributionsWealthRanking(contributionsWealthRankingQuery *query.ContributionsWealthRankingQuery) (interface{}, error) {
 func (statisticsService *StatisticsService) ContributionsWealthRanking(contributionsWealthRankingQuery *query.ContributionsWealthRankingQuery) (interface{}, error) {
 	if err := contributionsWealthRankingQuery.ValidateQuery(); err != nil {
 	if err := contributionsWealthRankingQuery.ValidateQuery(); err != nil {
@@ -449,8 +409,10 @@ func (statisticsService *StatisticsService) ContributionsWealthRanking(contribut
 		employeeDao = value
 		employeeDao = value
 	}
 	}
 
 
-	// 返回年榜开始时间、结束时间
-	if contributionsWealthRankingQuery.RankingType == 2 {
+	if contributionsWealthRankingQuery.RankingType == 1 {  // 返回总榜
+		contributionsWealthRankingQuery.StartTime = time.Date(1971, time.Month(1), 1, 0, 0, 0, 0, time.Now().Location())
+		contributionsWealthRankingQuery.EndTime = time.Now()
+	} else if contributionsWealthRankingQuery.RankingType == 2 {  // 返回年榜
 		// 获取公司最新年榜
 		// 获取公司最新年榜
 		var listIntervalRepository domain.ListIntervalRepository
 		var listIntervalRepository domain.ListIntervalRepository
 		if value, err := factory.CreateListIntervalRepository(map[string]interface{}{
 		if value, err := factory.CreateListIntervalRepository(map[string]interface{}{
@@ -470,22 +432,36 @@ func (statisticsService *StatisticsService) ContributionsWealthRanking(contribut
 		if _, listIntervals, err := listIntervalRepository.Find(listListIntervalQuery); err != nil {
 		if _, listIntervals, err := listIntervalRepository.Find(listListIntervalQuery); err != nil {
 			return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
 			return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
 		} else {
 		} else {
-			if len(listIntervals) == 0 {
-				contributionsWealthRankingQuery.StartTime = time.Date(1971, time.Month(1), 1, 0, 0, 0, 0, time.Now().Location())
-				contributionsWealthRankingQuery.EndTime = time.Now()
-			} else {
-				contributionsWealthRankingQuery.StartTime = listIntervals[0].IntervalStartTime
-				contributionsWealthRankingQuery.EndTime = listIntervals[0].IntervalEndTime
+			if len(listIntervals) == 0 {  // 未配置年榜
+				contributionsWealthRankingQuery.StartTime = time.Date(time.Now().Year(), time.Now().Month(), time.Now().Day(), 0, 0, 0, 0, time.UTC)
+				contributionsWealthRankingQuery.EndTime = time.Date(time.Now().Year(), time.Now().Month(), time.Now().Day(), 0, 0, 0, 0, time.UTC)
+			} else if len(listIntervals) == 1 {  // 只配置了一个年榜
+				currentTime := time.Date(time.Now().Year(), time.Now().Month(), time.Now().Day(), 0, 0, 0, 0, time.UTC)
+				if currentTime.Before(listIntervals[0].IntervalStartTime) && currentTime.After(listIntervals[0].IntervalEndTime) || currentTime.Equal(listIntervals[0].IntervalStartTime) || currentTime.Equal(listIntervals[0].IntervalEndTime) {   // 当前时间在榜单内
+					contributionsWealthRankingQuery.StartTime = listIntervals[0].IntervalStartTime
+					contributionsWealthRankingQuery.EndTime = listIntervals[0].IntervalEndTime
+				}  else {  // 当前时间处于空档期
+					contributionsWealthRankingQuery.StartTime = time.Date(time.Now().Year(), time.Now().Month(), time.Now().Day(), 0, 0, 0, 0, time.UTC)
+					contributionsWealthRankingQuery.EndTime = time.Date(time.Now().Year(), time.Now().Month(), time.Now().Day(), 0, 0, 0, 0, time.UTC)
+				}
+			} else {  // 配置了多个年榜
+				// 判断当前时间是否在榜单里
+				currentTime := time.Date(time.Now().Year(), time.Now().Month(), time.Now().Day(), 0, 0, 0, 0, time.UTC)
+				for _, listInterval := range listIntervals {
+					if currentTime.Before(listInterval.IntervalStartTime) && currentTime.After(listInterval.IntervalEndTime) || currentTime.Equal(listInterval.IntervalStartTime) || currentTime.Equal(listInterval.IntervalEndTime) {   // 当前时间在榜单内
+						contributionsWealthRankingQuery.StartTime = listInterval.IntervalStartTime
+						contributionsWealthRankingQuery.EndTime = listInterval.IntervalEndTime
+						break
+					}  else {  // 当前时间处于空档期
+						contributionsWealthRankingQuery.StartTime = time.Date(time.Now().Year(), time.Now().Month(), time.Now().Day(), 0, 0, 0, 0, time.UTC)
+						contributionsWealthRankingQuery.EndTime = time.Date(time.Now().Year(), time.Now().Month(), time.Now().Day(), 0, 0, 0, 0, time.UTC)
+						break
+					}
+				}
 			}
 			}
 		}
 		}
 	}
 	}
 
 
-	// 返回总榜
-	if contributionsWealthRankingQuery.RankingType == 1 {
-		contributionsWealthRankingQuery.StartTime = time.Date(1971, time.Month(1), 1, 0, 0, 0, 0, time.Now().Location())
-		contributionsWealthRankingQuery.EndTime = time.Now()
-	}
-
 	// 默认返回总榜
 	// 默认返回总榜
 	if contributionsWealthRankingStatistics, err := employeeDao.ContributionsWealthRanking(tool_funs.SimpleStructToMap(contributionsWealthRankingQuery)); err != nil {
 	if contributionsWealthRankingStatistics, err := employeeDao.ContributionsWealthRanking(tool_funs.SimpleStructToMap(contributionsWealthRankingQuery)); err != nil {
 		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
 		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())

@@ -190,7 +190,7 @@ func (suMoneyService *SuMoneyService) SearchSuMoneyTransactionRecord(searchSuMon
 	}
 	}
 }
 }
 
 
-// 素币事务记录统计
+// 素币事务记录统计（个人素币）
 func (suMoneyService *SuMoneyService) SuMoneyTransactionRecordStatistics(suMoneyTransactionRecordStatisticsCommand *command.SuMoneyTransactionRecordStatisticsCommand) (interface{}, error) {
 func (suMoneyService *SuMoneyService) SuMoneyTransactionRecordStatistics(suMoneyTransactionRecordStatisticsCommand *command.SuMoneyTransactionRecordStatisticsCommand) (interface{}, error) {
 	if err := suMoneyTransactionRecordStatisticsCommand.ValidateCommand(); err != nil {
 	if err := suMoneyTransactionRecordStatisticsCommand.ValidateCommand(); err != nil {
 		return nil, application.ThrowError(application.ARG_ERROR, err.Error())
 		return nil, application.ThrowError(application.ARG_ERROR, err.Error())
@@ -226,7 +226,7 @@ func (suMoneyService *SuMoneyService) SuMoneyTransactionRecordStatistics(suMoney
 	}
 	}
 }
 }
 
 
-// 贡献值事务记录统计
+// 贡献值事务记录统计（个人贡献值）
 func (suMoneyService *SuMoneyService) ContributionsTransactionRecordStatistics(contributionsTransactionRecordStatisticsCommand *command.ContributionsTransactionRecordStatisticsCommand) (interface{}, error) {
 func (suMoneyService *SuMoneyService) ContributionsTransactionRecordStatistics(contributionsTransactionRecordStatisticsCommand *command.ContributionsTransactionRecordStatisticsCommand) (interface{}, error) {
 	if err := contributionsTransactionRecordStatisticsCommand.ValidateCommand(); err != nil {
 	if err := contributionsTransactionRecordStatisticsCommand.ValidateCommand(); err != nil {
 		return nil, application.ThrowError(application.ARG_ERROR, err.Error())
 		return nil, application.ThrowError(application.ARG_ERROR, err.Error())

@@ -98,17 +98,17 @@ func (dao *EmployeeDao) CalculatePersonSuMoney(uid int64) (map[string]interface{
 	tx := dao.transactionContext.PgTx
 	tx := dao.transactionContext.PgTx
 	suMoneyTransactionRecordModel := new(models.SuMoneyTransactionRecord)
 	suMoneyTransactionRecordModel := new(models.SuMoneyTransactionRecord)
 	yesterday := time.Now().AddDate(0, 0, -1)
 	yesterday := time.Now().AddDate(0, 0, -1)
-	// 昨日收益
+	// 昨日总收益
 	if err := tx.Model(suMoneyTransactionRecordModel).
 	if err := tx.Model(suMoneyTransactionRecordModel).
 		ColumnExpr("sum(su_money_transaction_record.su_money) AS income_su_money").
 		ColumnExpr("sum(su_money_transaction_record.su_money) AS income_su_money").
 		Where(`su_money_transaction_record.employee @> '{"uid":?}'`, uid).
 		Where(`su_money_transaction_record.employee @> '{"uid":?}'`, uid).
-		Where(`su_money_transaction_record.record_type IN (?)`, pg.In([]int{2, 3})).
+		Where(`su_money_transaction_record.record_type IN (?)`, pg.In([]int{2, 3, 6})).
 		Where(`su_money_transaction_record.create_time > ?`, time.Date(yesterday.Year(), yesterday.Month(), yesterday.Day(), 0, 0, 0, 0, yesterday.Location())).
 		Where(`su_money_transaction_record.create_time > ?`, time.Date(yesterday.Year(), yesterday.Month(), yesterday.Day(), 0, 0, 0, 0, yesterday.Location())).
 		Where(`su_money_transaction_record.create_time < ?`, time.Date(yesterday.Year(), yesterday.Month(), yesterday.Day(), 23, 59, 59, 0, yesterday.Location())).
 		Where(`su_money_transaction_record.create_time < ?`, time.Date(yesterday.Year(), yesterday.Month(), yesterday.Day(), 23, 59, 59, 0, yesterday.Location())).
 		Select(&incomeSuMoneyOfYesterday); err != nil {
 		Select(&incomeSuMoneyOfYesterday); err != nil {
 		return nil, err
 		return nil, err
 	}
 	}
-	// 昨日支出
+	// 昨日总支出
 	if err := tx.Model(suMoneyTransactionRecordModel).
 	if err := tx.Model(suMoneyTransactionRecordModel).
 		ColumnExpr("sum(su_money_transaction_record.su_money) AS income_su_money").
 		ColumnExpr("sum(su_money_transaction_record.su_money) AS income_su_money").
 		Where(`su_money_transaction_record.employee @> '{"uid":?}'`, uid).
 		Where(`su_money_transaction_record.employee @> '{"uid":?}'`, uid).
@@ -122,7 +122,7 @@ func (dao *EmployeeDao) CalculatePersonSuMoney(uid int64) (map[string]interface{
 	if err := tx.Model(suMoneyTransactionRecordModel).
 	if err := tx.Model(suMoneyTransactionRecordModel).
 		ColumnExpr("sum(su_money_transaction_record.su_money) AS income_su_money").
 		ColumnExpr("sum(su_money_transaction_record.su_money) AS income_su_money").
 		Where(`su_money_transaction_record.employee @> '{"uid":?}'`, uid).
 		Where(`su_money_transaction_record.employee @> '{"uid":?}'`, uid).
-		Where(`su_money_transaction_record.record_type IN (?)`, pg.In([]int{2, 3})).
+		Where(`su_money_transaction_record.record_type IN (?)`, pg.In([]int{2, 3, 6})).
 		Select(&incomeSuMoney); err != nil {
 		Select(&incomeSuMoney); err != nil {
 		return nil, err
 		return nil, err
 	}
 	}
@@ -180,7 +180,7 @@ func (dao *EmployeeDao) CalculateSystemSuMoney(companyId int64) (map[string] int
 	},nil
 	},nil
 }
 }
 
 
-// 计算系统已兑换现金、未兑换现金
+// 计算现金池已兑换现金、未兑换现金
 func (dao *EmployeeDao) CalculateSystemCash(companyId int64) (map[string] interface{}, error) {
 func (dao *EmployeeDao) CalculateSystemCash(companyId int64) (map[string] interface{}, error) {
 	tx := dao.transactionContext.PgTx
 	tx := dao.transactionContext.PgTx
 	var (
 	var (
@@ -220,7 +220,7 @@ func (dao *EmployeeDao) CalculateSuMoneyTransactionRecord(uid int64, transaction
 	)
 	)
 	tx := dao.transactionContext.PgTx
 	tx := dao.transactionContext.PgTx
 	suMoneyTransactionRecordModel := new(models.SuMoneyTransactionRecord)
 	suMoneyTransactionRecordModel := new(models.SuMoneyTransactionRecord)
-	// 收入素币
+	// 总收入素币
 	if err := tx.Model(suMoneyTransactionRecordModel).
 	if err := tx.Model(suMoneyTransactionRecordModel).
 		ColumnExpr("sum(su_money_transaction_record.su_money) AS income_su_money").
 		ColumnExpr("sum(su_money_transaction_record.su_money) AS income_su_money").
 		Where(`su_money_transaction_record.employee @> '{"uid":?}'`, uid).
 		Where(`su_money_transaction_record.employee @> '{"uid":?}'`, uid).
@@ -230,7 +230,7 @@ func (dao *EmployeeDao) CalculateSuMoneyTransactionRecord(uid int64, transaction
 		Select(&incomeSuMoney); err != nil {
 		Select(&incomeSuMoney); err != nil {
 		return nil, err
 		return nil, err
 	}
 	}
-	// 支出素币
+	// 总支出素币
 	if err := tx.Model(suMoneyTransactionRecordModel).
 	if err := tx.Model(suMoneyTransactionRecordModel).
 		ColumnExpr("sum(su_money_transaction_record.su_money) AS expend_su_money").
 		ColumnExpr("sum(su_money_transaction_record.su_money) AS expend_su_money").
 		Where(`su_money_transaction_record.employee @> '{"uid":?}'`, uid).
 		Where(`su_money_transaction_record.employee @> '{"uid":?}'`, uid).
@@ -241,20 +241,20 @@ func (dao *EmployeeDao) CalculateSuMoneyTransactionRecord(uid int64, transaction
 		return nil, err
 		return nil, err
 	}
 	}
 	return map[string]interface{}{
 	return map[string]interface{}{
-		"incomeSuMoney": incomeSuMoney,
-		"expendSuMoney": expendSuMoney,
+		"incomeSuMoney": incomeSuMoney - expendSuMoney,  // 个人素币盈利
+		"expendSuMoney": expendSuMoney, // 个人素币支出
 	}, nil
 	}, nil
 }
 }
 
 
 // 计算个人贡献值收支
 // 计算个人贡献值收支
 func (dao *EmployeeDao) CalculateContributionsTransactionRecord(uid int64, transactionStartTime time.Time, transactionEndTime time.Time) (map[string]interface{}, error) {
 func (dao *EmployeeDao) CalculateContributionsTransactionRecord(uid int64, transactionStartTime time.Time, transactionEndTime time.Time) (map[string]interface{}, error) {
 	var (
 	var (
-		incomeContributions float64  // 增加的贡献值（2：任务奖励，3：增加）
-		expendContributions float64  // 扣除的贡献值 (4: 扣除)
+		incomeContributions float64  // 收入的贡献值（2：任务奖励，3：增加）
+		expendContributions float64  // 支出的贡献值 (4: 扣除)
 	)
 	)
 	tx := dao.transactionContext.PgTx
 	tx := dao.transactionContext.PgTx
 	suMoneyTransactionRecordModel := new(models.SuMoneyTransactionRecord)
 	suMoneyTransactionRecordModel := new(models.SuMoneyTransactionRecord)
-	// 增加的贡献值
+	// 总收入的贡献值
 	if err := tx.Model(suMoneyTransactionRecordModel).
 	if err := tx.Model(suMoneyTransactionRecordModel).
 		ColumnExpr("sum(su_money_transaction_record.su_money) AS income_su_money").
 		ColumnExpr("sum(su_money_transaction_record.su_money) AS income_su_money").
 		Where(`su_money_transaction_record.employee @> '{"uid":?}'`, uid).
 		Where(`su_money_transaction_record.employee @> '{"uid":?}'`, uid).
@@ -264,7 +264,7 @@ func (dao *EmployeeDao) CalculateContributionsTransactionRecord(uid int64, trans
 		Select(&incomeContributions); err != nil {
 		Select(&incomeContributions); err != nil {
 		return nil, err
 		return nil, err
 	}
 	}
-	// 扣除的贡献值
+	// 总支出的贡献值
 	if err := tx.Model(suMoneyTransactionRecordModel).
 	if err := tx.Model(suMoneyTransactionRecordModel).
 		ColumnExpr("sum(su_money_transaction_record.su_money) AS expend_su_money").
 		ColumnExpr("sum(su_money_transaction_record.su_money) AS expend_su_money").
 		Where(`su_money_transaction_record.employee @> '{"uid":?}'`, uid).
 		Where(`su_money_transaction_record.employee @> '{"uid":?}'`, uid).
@@ -275,8 +275,8 @@ func (dao *EmployeeDao) CalculateContributionsTransactionRecord(uid int64, trans
 		return nil, err
 		return nil, err
 	}
 	}
 	return map[string]interface{}{
 	return map[string]interface{}{
-		"incomeContributions": incomeContributions,
-		"expendContributions": expendContributions,
+		"incomeContributions": incomeContributions - expendContributions,  // 个人贡献值盈利
+		"expendContributions": expendContributions,  // 个人贡献支出
 	}, nil
 	}, nil
 }
 }