@@ -45,6 +45,7 @@ type FinanceCenterDataData struct { | |||||
Id string `json:"id"` | Id string `json:"id"` | ||||
TimeStr string `json:"time_str" example:"业务时间"` | TimeStr string `json:"time_str" example:"业务时间"` | ||||
Name string `json:"name" example:"媒体名称"` | Name string `json:"name" example:"媒体名称"` | ||||
Account string `json:"account"` | |||||
SettleType string `json:"settle_type" example:"结算单类型(1:日结 2:周结 3:月结 4:预付)"` | SettleType string `json:"settle_type" example:"结算单类型(1:日结 2:周结 3:月结 4:预付)"` | ||||
AllIncome string `json:"all_income" example:"合计收益"` | AllIncome string `json:"all_income" example:"合计收益"` | ||||
TopIncome string `json:"top_income" example:"上游结算"` | TopIncome string `json:"top_income" example:"上游结算"` | ||||
@@ -70,6 +71,7 @@ type FinanceCenterDataAgentRes struct { | |||||
type FinanceCenterDataAgentData struct { | type FinanceCenterDataAgentData struct { | ||||
Id string `json:"id"` | Id string `json:"id"` | ||||
TimeStr string `json:"time_str" example:"业务时间"` | TimeStr string `json:"time_str" example:"业务时间"` | ||||
Account string `json:"account"` | |||||
Name string `json:"name" example:"媒体名称"` | Name string `json:"name" example:"媒体名称"` | ||||
SettleType string `json:"settle_type" example:"结算单类型(1:日结 2:周结 3:月结 4:预付)"` | SettleType string `json:"settle_type" example:"结算单类型(1:日结 2:周结 3:月结 4:预付)"` | ||||
AllIncome string `json:"all_income" example:"合计收益"` | AllIncome string `json:"all_income" example:"合计收益"` | ||||
@@ -174,6 +174,7 @@ func FinanceCenterAgentList(c *gin.Context, req md.FinanceCenterDataReq) md.Fina | |||||
var tmp = md.FinanceCenterDataAgentData{ | var tmp = md.FinanceCenterDataAgentData{ | ||||
Id: utils.IntToStr(v.Id), | Id: utils.IntToStr(v.Id), | ||||
Name: "", | Name: "", | ||||
Account: "", | |||||
AllIncome: utils.Float64ToStr(float64(v.OtherIncome+v.BasicIncome) / 100), | AllIncome: utils.Float64ToStr(float64(v.OtherIncome+v.BasicIncome) / 100), | ||||
Income: utils.Float64ToStr(float64(v.BasicIncome) / 100), | Income: utils.Float64ToStr(float64(v.BasicIncome) / 100), | ||||
OtherIncome: utils.Float64ToStr(float64(v.OtherIncome) / 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) | tmpAgent := GetAgentInfo(c, v.AgentId) | ||||
if tmpAgent["name"] != "" { | if tmpAgent["name"] != "" { | ||||
tmp.Name = tmpAgent["name"] | tmp.Name = tmpAgent["name"] | ||||
tmp.Account = tmpAgent["account"] | |||||
} | } | ||||
if v.EndDate != "" && v.EndDate != "0000-00-00" { | if v.EndDate != "" && v.EndDate != "0000-00-00" { | ||||
if v.EndDate != v.StartDate { | if v.EndDate != v.StartDate { | ||||
@@ -176,6 +176,7 @@ func FinanceCenterMediumList(c *gin.Context, req md.FinanceCenterDataReq) md.Fin | |||||
var tmp = md.FinanceCenterDataData{ | var tmp = md.FinanceCenterDataData{ | ||||
Id: utils.IntToStr(v.Id), | Id: utils.IntToStr(v.Id), | ||||
Name: "", | Name: "", | ||||
Account: "", | |||||
AllIncome: utils.Float64ToStr(float64(v.OtherIncome+v.BasicIncome) / 100), | AllIncome: utils.Float64ToStr(float64(v.OtherIncome+v.BasicIncome) / 100), | ||||
TopIncome: utils.Float64ToStr(float64(v.OriginalIncome) / 100), | TopIncome: utils.Float64ToStr(float64(v.OriginalIncome) / 100), | ||||
CommissionIncome: utils.Float64ToStr(float64(v.CommissionRetention) / 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) | tmpMedium := GetMediumInfo(c, v.MediumId) | ||||
if tmpMedium["name"] != "" { | if tmpMedium["name"] != "" { | ||||
tmp.Name = tmpMedium["name"] | tmp.Name = tmpMedium["name"] | ||||
tmp.Account = tmpMedium["account"] | |||||
} | } | ||||
if v.EndDate != "" && v.EndDate != "0000-00-00" { | if v.EndDate != "" && v.EndDate != "0000-00-00" { | ||||
if v.EndDate != v.StartDate { | if v.EndDate != v.StartDate { | ||||