diff --git a/common/dao/external_corp_order.go b/common/dao/external_corp_order.go index 149816f..7450bfe 100644 --- a/common/dao/external_corp_order.go +++ b/common/dao/external_corp_order.go @@ -75,7 +75,7 @@ func (d *ExternalCorpOrder) QueryChildOrder(ownerId int64, startTime, endTime in tx.Where(orderTable+".pay_time >= ?", startTime) tx.Where(orderTable+".pay_time <= ?", endTime) - tx.Joins(fmt.Sprintf("LEFT JOIN cp_user ON %s.process_id=cp_user.id", orderTable)) + tx.Joins(fmt.Sprintf("LEFT JOIN cp_user ON %s.admin_id=cp_user.id", orderTable)) tx.Where("cp_user.pid = ?", ownerId) tx = tx.Find(&o) if tx.Error == gorm.ErrRecordNotFound { diff --git a/service/salary_calculator/salary_calculator_1002.go b/service/salary_calculator/salary_calculator_1002.go index dfd2aa5..bd30a4d 100644 --- a/service/salary_calculator/salary_calculator_1002.go +++ b/service/salary_calculator/salary_calculator_1002.go @@ -83,6 +83,7 @@ func (s *SalaryCalculator1002) Calculate(salary *model.StaffSalary) { } childOrderNum = len(childOrders) } + salary.SetExtra("corp_child_order_num", cast.ToString(childOrderNum)) processOrderNum := len(processOrders) salary.SetExtra("corp_process_order_num", cast.ToString(processOrderNum))