|
|
@@ -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 { |
|
|
|