From 3854d9c49a2fb75b96fab56979692ffc3b9a552c Mon Sep 17 00:00:00 2001
From: huangjiajun <582604932@qq.com>
Date: Wed, 30 Oct 2024 15:22:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/md/md_finance_center.go          | 2 ++
 app/svc/svc_finance_center_agent.go  | 2 ++
 app/svc/svc_finance_center_medium.go | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/app/md/md_finance_center.go b/app/md/md_finance_center.go
index f278bf4..437175b 100644
--- a/app/md/md_finance_center.go
+++ b/app/md/md_finance_center.go
@@ -45,6 +45,7 @@ type FinanceCenterDataData struct {
 	Id               string `json:"id"`
 	TimeStr          string `json:"time_str" example:"业务时间"`
 	Name             string `json:"name" example:"媒体名称"`
+	Account          string `json:"account"`
 	SettleType       string `json:"settle_type" example:"结算单类型(1:日结 2:周结 3:月结 4:预付)"`
 	AllIncome        string `json:"all_income" example:"合计收益"`
 	TopIncome        string `json:"top_income" example:"上游结算"`
@@ -70,6 +71,7 @@ type FinanceCenterDataAgentRes struct {
 type FinanceCenterDataAgentData struct {
 	Id          string `json:"id"`
 	TimeStr     string `json:"time_str" example:"业务时间"`
+	Account     string `json:"account"`
 	Name        string `json:"name" example:"媒体名称"`
 	SettleType  string `json:"settle_type" example:"结算单类型(1:日结 2:周结 3:月结 4:预付)"`
 	AllIncome   string `json:"all_income" example:"合计收益"`
diff --git a/app/svc/svc_finance_center_agent.go b/app/svc/svc_finance_center_agent.go
index f72ecae..38afba6 100644
--- a/app/svc/svc_finance_center_agent.go
+++ b/app/svc/svc_finance_center_agent.go
@@ -174,6 +174,7 @@ func FinanceCenterAgentList(c *gin.Context, req md.FinanceCenterDataReq) md.Fina
 			var tmp = md.FinanceCenterDataAgentData{
 				Id:          utils.IntToStr(v.Id),
 				Name:        "",
+				Account:     "",
 				AllIncome:   utils.Float64ToStr(float64(v.OtherIncome+v.BasicIncome) / 100),
 				Income:      utils.Float64ToStr(float64(v.BasicIncome) / 100),
 				OtherIncome: utils.Float64ToStr(float64(v.OtherIncome) / 100),
@@ -186,6 +187,7 @@ func FinanceCenterAgentList(c *gin.Context, req md.FinanceCenterDataReq) md.Fina
 			tmpAgent := GetAgentInfo(c, v.AgentId)
 			if tmpAgent["name"] != "" {
 				tmp.Name = tmpAgent["name"]
+				tmp.Account = tmpAgent["account"]
 			}
 			if v.EndDate != "" && v.EndDate != "0000-00-00" {
 				if v.EndDate != v.StartDate {
diff --git a/app/svc/svc_finance_center_medium.go b/app/svc/svc_finance_center_medium.go
index 3b85362..210f7ee 100644
--- a/app/svc/svc_finance_center_medium.go
+++ b/app/svc/svc_finance_center_medium.go
@@ -176,6 +176,7 @@ func FinanceCenterMediumList(c *gin.Context, req md.FinanceCenterDataReq) md.Fin
 			var tmp = md.FinanceCenterDataData{
 				Id:               utils.IntToStr(v.Id),
 				Name:             "",
+				Account:          "",
 				AllIncome:        utils.Float64ToStr(float64(v.OtherIncome+v.BasicIncome) / 100),
 				TopIncome:        utils.Float64ToStr(float64(v.OriginalIncome) / 100),
 				CommissionIncome: utils.Float64ToStr(float64(v.CommissionRetention) / 100),
@@ -192,6 +193,7 @@ func FinanceCenterMediumList(c *gin.Context, req md.FinanceCenterDataReq) md.Fin
 			tmpMedium := GetMediumInfo(c, v.MediumId)
 			if tmpMedium["name"] != "" {
 				tmp.Name = tmpMedium["name"]
+				tmp.Account = tmpMedium["account"]
 			}
 			if v.EndDate != "" && v.EndDate != "0000-00-00" {
 				if v.EndDate != v.StartDate {