fix:昨日收益修改

@@ -89,7 +89,7 @@ func (dao *EmployeeDao) CalculatePersonUnReadNotification(uid int64) (map[string
 	}, nil
 	}, nil
 }
 }
 
 
-// 计算个人素币收益，昨日收益：做任务验收获得的素币+额外增加-扣除素币-兑换物资-兑换现金 TODO
+// 计算个人素币收益，昨日收益：做任务验收获得的素币+额外增加-扣除素币-兑换物资-兑换现金
 func (dao *EmployeeDao) CalculatePersonSuMoney(uid int64) (map[string]interface{}, error) {
 func (dao *EmployeeDao) CalculatePersonSuMoney(uid int64) (map[string]interface{}, error) {
 	var incomeSuMoney float64
 	var incomeSuMoney float64
 	var incomeSuMoneyOfYesterday float64
 	var incomeSuMoneyOfYesterday float64
@@ -110,13 +110,13 @@ 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, 6})).
+		Where(`su_money_transaction_record.record_type IN (?)`, pg.In([]int{4, 1, 5})).
 		Where(`su_money_transaction_record.create_time > ?`, time.Date(yesterday.Year(), yesterday.Month(), yesterday.Day(), 0, 0, 0, 0, time.Local)).
 		Where(`su_money_transaction_record.create_time > ?`, time.Date(yesterday.Year(), yesterday.Month(), yesterday.Day(), 0, 0, 0, 0, time.Local)).
 		Where(`su_money_transaction_record.create_time < ?`, time.Date(yesterday.Year(), yesterday.Month(), yesterday.Day(), 23, 59, 59, 0, time.Local)).
 		Where(`su_money_transaction_record.create_time < ?`, time.Date(yesterday.Year(), yesterday.Month(), yesterday.Day(), 23, 59, 59, 0, time.Local)).
 		Select(&expendSuMoneyOfYesterday); err != nil {
 		Select(&expendSuMoneyOfYesterday); 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).
@@ -126,7 +126,7 @@ func (dao *EmployeeDao) CalculatePersonSuMoney(uid int64) (map[string]interface{
 	}
 	}
 	return map[string]interface{}{
 	return map[string]interface{}{
 		"incomeSuMoney":            incomeSuMoney,
 		"incomeSuMoney":            incomeSuMoney,
-		"incomeSuMoneyOfYesterday": incomeSuMoneyOfYesterday,
+		"incomeSuMoneyOfYesterday": incomeSuMoneyOfYesterday - expendSuMoneyOfYesterday,
 	}, nil
 	}, nil
 }
 }
 
 
@@ -202,7 +202,7 @@ func (dao *EmployeeDao) CalculateSystemCash(companyId int64) (map[string] interf
 	}, nil
 	}, nil
 }
 }
 
 
-// 计算个人素币收支
+// 计算个人素币收支（素币明细收支）
 func (dao *EmployeeDao) CalculateSuMoneyTransactionRecord(uid int64, transactionStartTime time.Time, transactionEndTime time.Time) (map[string]interface{}, error) {
 func (dao *EmployeeDao) CalculateSuMoneyTransactionRecord(uid int64, transactionStartTime time.Time, transactionEndTime time.Time) (map[string]interface{}, error) {
 	var (
 	var (
 		incomeSuMoney float64  // 收入的素币（2：任务奖励，3：增加 6: 兑换素币撤回）
 		incomeSuMoney float64  // 收入的素币（2：任务奖励，3：增加 6: 兑换素币撤回）
@@ -258,7 +258,7 @@ func (dao *EmployeeDao) CalculateSuMoneyTransactionRecord(uid int64, transaction
 	}, 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：增加）
 		incomeContributions float64  // 收入的贡献值（2：任务奖励，3：增加）