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

childorder

This commit is contained in:
jiangyong 2025-03-06 01:18:53 +08:00
parent 84b54b6495
commit 8de8d23b88
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/dao/external_corp_order.go
View File

@ -75,7 +75,7 @@ func (d *ExternalCorpOrder) QueryChildOrder(ownerId int64, startTime, endTime in
tx.Where(orderTable+".pay_time >= ?", startTime) tx.Where(orderTable+".pay_time >= ?", startTime)
tx.Where(orderTable+".pay_time <= ?", endTime) 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.Where("cp_user.pid = ?", ownerId)
tx = tx.Find(&o) tx = tx.Find(&o)
if tx.Error == gorm.ErrRecordNotFound { if tx.Error == gorm.ErrRecordNotFound {

1
service/salary_calculator/salary_calculator_1002.go
View File

@ -83,6 +83,7 @@ func (s *SalaryCalculator1002) Calculate(salary *model.StaffSalary) {
} }
childOrderNum = len(childOrders) childOrderNum = len(childOrders)
} }
salary.SetExtra("corp_child_order_num", cast.ToString(childOrderNum))
processOrderNum := len(processOrders) processOrderNum := len(processOrders)
salary.SetExtra("corp_process_order_num", cast.ToString(processOrderNum)) salary.SetExtra("corp_process_order_num", cast.ToString(processOrderNum))