diff --git a/service/salary_calculator/salary_calculator_1002.go b/service/salary_calculator/salary_calculator_1002.go index 5f65ccc..25e502b 100644 --- a/service/salary_calculator/salary_calculator_1002.go +++ b/service/salary_calculator/salary_calculator_1002.go @@ -72,7 +72,7 @@ func (s *SalaryCalculator1002) Calculate(salary *model.StaffSalary) { childOrderNum := 0 if corpUser != nil { - childOrders, err := dao.NewExternalCorpOrder().QueryChildOrder(corpUser.CorpId, startTime, endTime) + childOrders, err := dao.NewExternalCorpOrder().QueryChildOrder(corpUser.Id, startTime, endTime) if err != nil { log.Errorf("db error:%s", err.Error()) return @@ -86,11 +86,11 @@ func (s *SalaryCalculator1002) Calculate(salary *model.StaffSalary) { if orderNum >= 40 { salary.TargetSalary = cast.ToFloat64(userSlary.Target) if orderNum <= 60 { - salary.AwardSalary = float64((orderNum - 40) * 80) + salary.TargetSalary += float64((orderNum - 40) * 80) } else if orderNum <= 80 { - salary.AwardSalary = 1600 + float64((orderNum-60)*100) + salary.TargetSalary += 1600 + float64((orderNum-60)*100) } else { - salary.AwardSalary = 3600 + float64((orderNum-80)*120) + salary.TargetSalary += 3600 + float64((orderNum-80)*120) } } else { salary.TargetSalary = float64(60 * orderNum)