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

addata

This commit is contained in:
jiangyong27 2025-04-01 21:32:18 +08:00
parent 4a0e2e052c
commit 95503ee529
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/dao/external_unify_ad_data.go
View File

@ -21,7 +21,6 @@ func (d *UnifyAdData) QueryOwnerData(owner, startDay, endDay string) ([]*model.E
var o []*model.ExternalUnifyAdData
tx = tx.Where("data_type = ?", "account_report")
tx = tx.Where("owner = ?", owner)
if startDay != "" {
tx = tx.Where("day >= ?", startDay)

3
common/model/external_unify.go
View File

@ -9,9 +9,6 @@ type ExternalUnifyAdData struct {
AccountId string `json:"accountId"`
Owner string `json:"owner"`
Balance int64 `json:"balance"`
DataType string `json:"dataType"`
DataName string `json:"dataName"`
DataId string `json:"dataId"`
Cost int64 `json:"cost"`
PayAmount int64 `json:"payAmount"`
Impression int64 `json:"impression"`

8
service/salary_calculator/salary_calculator_1000.go
View File

@ -32,8 +32,8 @@ func (s *SalaryCalculator1000) Calculate(salary *model.StaffSalary) map[string]i
data := make(map[string]interface{})
data["adProfit"] = s.getAdOwnerProfit(salary)
data["app10024Profit"] = s.getAppProfit(10024, salary.Month)
data["app10024Profit2"] = s.getAppProfit(10024, monthTime.AddDate(0, -1, 0).Format("200601"))
data["app10024Profit"] = s.getKctAppProfit(salary.Month)
data["app10024Profit2"] = s.getKctAppProfit(monthTime.AddDate(0, -1, 0).Format("200601"))
return data
}
@ -55,7 +55,7 @@ func (s *SalaryCalculator1000) getAdOwnerProfit(salary *model.StaffSalary) float
return totalProfit
}
func (s *SalaryCalculator1000) getAppProfit(appid int64, month string) float64 {
func (s *SalaryCalculator1000) getKctAppProfit(month string) float64 {
monthTime, _ := time.ParseInLocation("200601", month, time.Local)
@ -69,7 +69,7 @@ func (s *SalaryCalculator1000) getAppProfit(appid int64, month string) float64 {
}
for _, data := range datas {
sumProfitAmount += data.PayAmount - data.RefundAmount - data.Cost
sumProfitAmount += data.PayAmount - data.RefundAmount - data.AdCost
}
return float64(sumProfitAmount) / 100
}