jiangyong
/
enterprise
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: jiangyong:b8ad3d364acee7d3ad06c3e9ca534c9b059a42a9
Branches Tags
jiangyong:master
jiangyong:new
jiangyong:old
..
compare: jiangyong:d49ef6979bfc435b5964d8bd0d92e8e8da3306d7
Branches Tags
jiangyong:master
jiangyong:new
jiangyong:old

No commits in common. "b8ad3d364acee7d3ad06c3e9ca534c9b059a42a9" and "d49ef6979bfc435b5964d8bd0d92e8e8da3306d7" have entirely different histories.
b8ad3d364a ... d49ef6979b

1 changed files with 2 additions and 2 deletions
Show Stats Expand all files Collapse all files

4
service/salary_calculator/salary_calculator_1000.go
View File

@ -32,8 +32,8 @@ func (s *SalaryCalculator1000) Calculate(salary *model.StaffSalary) map[string]i
data := make(map[string]interface{}) data := make(map[string]interface{})
data["adProfit"] = s.getAdOwnerProfit(salary) data["adProfit"] = s.getAdOwnerProfit(salary)
data["app10024Profit"] = s.getAppProfit(10024, salary.Month) data["appProfit1024"] = s.getAppProfit(10024, salary.Month)
data["app10024Profit2"] = s.getAppProfit(10024, monthTime.AddDate(0, -1, 0).Format("200601")) data["appProfit1024Previous "] = s.getAppProfit(10024, monthTime.AddDate(0, -1, 0).Format("200601"))
return data return data
} }