fix:昨日收益

@@ -92,51 +92,54 @@ func (dao *EmployeeDao) CalculatePersonUnReadNotification(uid int64) (map[string
 // 计算个人素币收益，昨日收益：做任务验收获得的素币+额外增加-扣除素币-兑换物资-兑换现金
 // 计算个人素币收益，昨日收益：做任务验收获得的素币+额外增加-扣除素币-兑换物资-兑换现金
 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 expendSuMoney float64
+	//var expendSuMoney float64
 	var incomeSuMoneyOfYesterday float64
 	var incomeSuMoneyOfYesterday float64
-	var expendSuMoneyOfYesterday float64
+	//var expendSuMoneyOfYesterday float64
 	tx := dao.transactionContext.PgTx
 	tx := dao.transactionContext.PgTx
 	suMoneyTransactionRecordModel := new(models.SuMoneyTransactionRecord)
 	suMoneyTransactionRecordModel := new(models.SuMoneyTransactionRecord)
 	yesterday := time.Now().Local().AddDate(0, 0, -1)
 	yesterday := time.Now().Local().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, 6})).
+		//Where(`su_money_transaction_record.record_type IN (?)`, pg.In([]int{2, 3})).
+		Where(`su_money_transaction_record.record_type = ?`, 2).
 		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).
+	//	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.record_type IN (?)`, pg.In([]int{1, 4, 5})).
+	//	Where(`su_money_transaction_record.record_type = ?`, 2).
+	//	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())).
+	//	Select(&expendSuMoneyOfYesterday); err != nil {
+	//	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).
-		Where(`su_money_transaction_record.record_type IN (?)`, pg.In([]int{1, 4, 5})).
-		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())).
-		Select(&expendSuMoneyOfYesterday); err != nil {
-		return nil, err
-	}
-	// 总收益
-	if err := tx.Model(suMoneyTransactionRecordModel).
-		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.record_type IN (?)`, pg.In([]int{2, 3, 6})).
+		//Where(`su_money_transaction_record.record_type IN (?)`, pg.In([]int{2, 3, 6})).
+		Where(`su_money_transaction_record.record_type = ?`, 2).
 		Select(&incomeSuMoney); err != nil {
 		Select(&incomeSuMoney); err != nil {
 		return nil, err
 		return nil, err
 	}
 	}
-	// 总支出
-	if err := tx.Model(suMoneyTransactionRecordModel).
-		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.record_type IN (?)`, pg.In([]int{1, 4, 5})).
-		Select(&expendSuMoney); err != nil {
-		return nil, err
-	}
+	//// 支出
+	//if err := tx.Model(suMoneyTransactionRecordModel).
+	//	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.record_type IN (?)`, pg.In([]int{1, 4, 5})).
+	//	Select(&expendSuMoney); err != nil {
+	//	return nil, err
+	//}
 	return map[string]interface{}{
 	return map[string]interface{}{
-		"incomeSuMoney":            incomeSuMoney - expendSuMoney,
-		"incomeSuMoneyOfYesterday": incomeSuMoneyOfYesterday - expendSuMoneyOfYesterday,
+		"incomeSuMoney":            incomeSuMoney,
+		"incomeSuMoneyOfYesterday": incomeSuMoneyOfYesterday,
 	}, nil
 	}, nil
 }
 }
 
 
@@ -216,9 +219,9 @@ func (dao *EmployeeDao) CalculateSystemCash(companyId int64) (map[string] interf
 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: 兑换素币撤回）
-		expendSuMoney float64  // 消耗的素币（1：兑换物资，4：扣除, 5: 兑换现金）
-		expendSuMoneyExchange float64
-		incomeSuMoneyExchangeRestore float64
+		expendSuMoney float64  // 消耗的素币（1：兑换物资，4：扣除, ）
+		expendSuMoneyExchange float64 // 5: 兑换现金
+		incomeSuMoneyExchangeRestore float64  // 6: 兑换素币撤回
 	)
 	)
 	tx := dao.transactionContext.PgTx
 	tx := dao.transactionContext.PgTx
 	suMoneyTransactionRecordModel := new(models.SuMoneyTransactionRecord)
 	suMoneyTransactionRecordModel := new(models.SuMoneyTransactionRecord)
@@ -236,7 +239,7 @@ func (dao *EmployeeDao) CalculateSuMoneyTransactionRecord(uid int64, transaction
 	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).
-		Where(`su_money_transaction_record.record_type IN (?)`, pg.In([]int{1, 4, 5})).
+		Where(`su_money_transaction_record.record_type IN (?)`, pg.In([]int{1, 4})).
 		Where(`su_money_transaction_record.create_time > ?`, transactionStartTime).
 		Where(`su_money_transaction_record.create_time > ?`, transactionStartTime).
 		Where(`su_money_transaction_record.create_time < ?`, transactionEndTime).
 		Where(`su_money_transaction_record.create_time < ?`, transactionEndTime).
 		Select(&expendSuMoney); err != nil {
 		Select(&expendSuMoney); err != nil {