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

10008

This commit is contained in:
jiangyong27 2025-05-29 15:47:14 +08:00
parent 00fd66ae53
commit 0eaa0fc13e
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/dao/external_corp_order.go
View File

@ -17,7 +17,7 @@ func (d *ExternalCorpOrder) TableName() string {
return "cp_order"
}
func (d *ExternalCorpOrder) QueryOwnerOrder(owner string, startTime, endTime int64) ([]*model.ExternalCorpOrder, error) {
func (d *ExternalCorpOrder) QueryOwnerOrder(owner string, corpId int64, startTime, endTime int64) ([]*model.ExternalCorpOrder, error) {
orderTable := d.TableName()
tx := corpDB.Table(orderTable)
@ -26,6 +26,9 @@ func (d *ExternalCorpOrder) QueryOwnerOrder(owner string, startTime, endTime int
if owner != "" {
tx.Where("cp_user.username = ?", owner)
}
if corpId != 0 {
tx.Where(orderTable+".corp_id = ?", corpId)
}
if startTime > 0 {
tx.Where(orderTable+".pay_time >= ?", startTime)

4
plugin/salary_1002.go
View File

@ -32,11 +32,11 @@ func (s *Salary1002) Calculate(salary *model.StaffSalary) map[string]interface{}
monthTime, _ := time.ParseInLocation("200601", salary.Month, time.Local)
startTime := monthTime.Unix()
endTime := monthTime.AddDate(0, 1, 0).Unix() - 1
orders, err := dao.NewExternalCorpOrder().QueryOwnerOrder(s.user.Username, startTime, endTime)
orders, err := dao.NewExternalCorpOrder().QueryOwnerOrder(s.user.Username, 10008, startTime, endTime)
if err != nil {
log.Errorf("db error:%s", err.Error())
}
totalOrders, err := dao.NewExternalCorpOrder().QueryOwnerOrder("", startTime, endTime)
totalOrders, err := dao.NewExternalCorpOrder().QueryOwnerOrder("", 10008, startTime, endTime)
if err != nil {
log.Errorf("db error:%s", err.Error())
}

2
plugin/staff_1002.go
View File

@ -33,7 +33,7 @@ func (s *Staff1002) Monitor(user *model.StaffUser) {
}
// 1.订单
orders, err := dao.NewExternalCorpOrder().QueryOwnerOrder(user.Username, 0, 0)
orders, err := dao.NewExternalCorpOrder().QueryOwnerOrder(user.Username, 10008, 0, 0)
if err != nil {
log.Errorf("db error:%s", err.Error())
return