From 00fd66ae53a63ec45d81481ea82e5d953989fbc6 Mon Sep 17 00:00:00 2001
From: jiangyong27 <yong27@163.com>
Date: Thu, 29 May 2025 15:11:13 +0800
Subject: [PATCH] cp_user2

---
 common/dao/external_corp_order.go | 5 +----
 plugin/salary_1002.go             | 4 ++--
 plugin/staff_1002.go              | 2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/common/dao/external_corp_order.go b/common/dao/external_corp_order.go
index 60a87c0..defa49f 100644
--- a/common/dao/external_corp_order.go
+++ b/common/dao/external_corp_order.go
@@ -17,7 +17,7 @@ func (d *ExternalCorpOrder) TableName() string {
 	return "cp_order"
 }
 
-func (d *ExternalCorpOrder) QueryOwnerOrder(owner string, corpId int64, startTime, endTime int64) ([]*model.ExternalCorpOrder, error) {
+func (d *ExternalCorpOrder) QueryOwnerOrder(owner string, startTime, endTime int64) ([]*model.ExternalCorpOrder, error) {
 	orderTable := d.TableName()
 	tx := corpDB.Table(orderTable)
 
@@ -26,9 +26,6 @@ func (d *ExternalCorpOrder) QueryOwnerOrder(owner string, corpId int64, startTim
 	if owner != "" {
 		tx.Where("cp_user.username = ?", owner)
 	}
-	if corpId != 0 {
-		tx.Where("cp_user.corp_id = ?", corpId)
-	}
 
 	if startTime > 0 {
 		tx.Where(orderTable+".pay_time >= ?", startTime)
diff --git a/plugin/salary_1002.go b/plugin/salary_1002.go
index ca0785a..6457d9d 100644
--- a/plugin/salary_1002.go
+++ b/plugin/salary_1002.go
@@ -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, s.user.CorpId, startTime, endTime)
+	orders, err := dao.NewExternalCorpOrder().QueryOwnerOrder(s.user.Username, startTime, endTime)
 	if err != nil {
 		log.Errorf("db error:%s", err.Error())
 	}
-	totalOrders, err := dao.NewExternalCorpOrder().QueryOwnerOrder("", s.user.CorpId, startTime, endTime)
+	totalOrders, err := dao.NewExternalCorpOrder().QueryOwnerOrder("", startTime, endTime)
 	if err != nil {
 		log.Errorf("db error:%s", err.Error())
 	}
diff --git a/plugin/staff_1002.go b/plugin/staff_1002.go
index af45ee0..828de51 100644
--- a/plugin/staff_1002.go
+++ b/plugin/staff_1002.go
@@ -33,7 +33,7 @@ func (s *Staff1002) Monitor(user *model.StaffUser) {
 	}
 
 	// 1.订单
-	orders, err := dao.NewExternalCorpOrder().QueryOwnerOrder(user.Username, user.CorpId, 0, 0)
+	orders, err := dao.NewExternalCorpOrder().QueryOwnerOrder(user.Username, 0, 0)
 	if err != nil {
 		log.Errorf("db error:%s", err.Error())
 		return