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

process

This commit is contained in:
jiangyong 2025-03-05 23:38:56 +08:00
parent 4735b65cd3
commit 17e2f347cb
2 changed files with 40 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
common/dao/external_corp_order.go
View File

@ -17,15 +17,39 @@ func (d *ExternalCorpOrder) TableName() string {
return "cp_order"
}
func (d *ExternalCorpOrder) QueryOwnerData(owner string, startTime, endTime int64, status int) ([]*model.ExternalCorpOrder, error) {
func (d *ExternalCorpOrder) QueryOwnerOrder(owner string, startTime, endTime int64) ([]*model.ExternalCorpOrder, error) {
orderTable := d.TableName()
tx := corpDB.Table(orderTable)
var o []*model.ExternalCorpOrder
if status != 0 {
tx.Where(orderTable+".status = ?", status)
}
tx.Where(orderTable+".status = ?", 2)
tx.Where("cp_user.username = ?", owner)
tx.Where(orderTable+".pay_time >= ?", startTime)
tx.Where(orderTable+".pay_time <= ?", endTime)
tx.Joins(fmt.Sprintf("LEFT JOIN cp_user ON %s.admin_id=cp_user.id", orderTable))
tx.Where("cp_user.username = ?", owner)
tx = tx.Find(&o)
if tx.Error == gorm.ErrRecordNotFound {
return o, nil
}
if tx.Error != nil {
return nil, tx.Error
}
return o, nil
}
func (d *ExternalCorpOrder) QueryProcessOrder(owner string, startTime, endTime int64) ([]*model.ExternalCorpOrder, error) {
orderTable := d.TableName()
tx := corpDB.Table(orderTable)
var o []*model.ExternalCorpOrder
tx.Where(orderTable+".process_status = ?", 2)
tx.Where("cp_user.username = ?", owner)
tx.Where(orderTable+".pay_time >= ?", startTime)
tx.Where(orderTable+".pay_time <= ?", endTime)

14
service/salary_calculator/salary_calculator_1002.go
View File

@ -35,13 +35,22 @@ func (s *SalaryCalculator1002) Calculate(salary *model.StaffSalary) {
monthTime, _ := time.ParseInLocation("200601", salary.Month, time.Local)
startTime := monthTime.Unix()
endTime := monthTime.AddDate(0, 1, 0).Unix() - 1
orders, err := dao.NewExternalCorpOrder().QueryOwnerData(s.user.Username, startTime, endTime, 2)
orders, err := dao.NewExternalCorpOrder().QueryOwnerOrder(s.user.Username, startTime, endTime)
if err != nil {
log.Errorf("db error:%s", err.Error())
return
}
orderNum := len(orders)
salary.SetExtra("corp_order_num", cast.ToString(len(orders)))
salary.SetExtra("corp_order_num", cast.ToString(orderNum))
processOrders, err := dao.NewExternalCorpOrder().QueryProcessOrder(s.user.Username, startTime, endTime)
if err != nil {
log.Errorf("db error:%s", err.Error())
return
}
processOrderNum := len(processOrders)
salary.SetExtra("corp_process_order_num", cast.ToString(processOrderNum))
if orderNum >= 40 {
salary.TargetSalary = cast.ToFloat64(userSlary.Target)
@ -55,4 +64,5 @@ func (s *SalaryCalculator1002) Calculate(salary *model.StaffSalary) {
} else {
salary.TargetSalary = float64(60 * orderNum)
}
salary.AwardSalary += float64(processOrderNum * 5)
}