liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
邹宗楠
2025-05-08 10:19:43 +08:00
parent 8b40ee93c1
commit 782baf4d13
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
business/model/dao/store.go
View File

@@ -1662,17 +1662,17 @@ func StatisticsAfsOrderInfo(db *DaoDB, startTime, endTime time.Time, storeId int
// StatisticsIncome 统计平台和市场收入 // StatisticsIncome 统计平台和市场收入
func StatisticsIncome(db *DaoDB, startTime, endTime time.Time, storeId int, brandId, vendorId, storeList []int) ([]*StatisticsIncomeInfo, error) { func StatisticsIncome(db *DaoDB, startTime, endTime time.Time, storeId int, brandId, vendorId, storeList []int) ([]*StatisticsIncomeInfo, error) {
parma := []interface{}{} parma := []interface{}{}
sql := ` sql := `
SELECT t1.jx_store_id id,t1.vendor_order_id,t3.name, SELECT t1.jx_store_id id,t3.name,
SUM(ROUND(IF(t1.earning_type = 1, t1.total_shop_money-t1.earning_price-IFNULL(t2.desired_fee,0), t1.total_shop_money *(t1.order_pay_percentage/2)/100),3)) total_income, SUM(ROUND(IF(t1.earning_type = 1, t1.total_shop_money-t1.earning_price-IFNULL(t2.desired_fee,0), t1.total_shop_money *(t1.order_pay_percentage/2)/100),3)) total_income,
SUM(ROUND(IF(t1.earning_type = 1, t1.total_shop_money-t1.earning_price-IFNULL(t2.desired_fee,0), t1.total_shop_money *(t1.order_pay_percentage/2)/100) * (t3.jx_brand_fee_factor/10),3)) jx_income, SUM(ROUND(IF(t1.earning_type = 1, t1.total_shop_money-t1.earning_price-IFNULL(t2.desired_fee,0), t1.total_shop_money *(t1.order_pay_percentage/2)/100) * (t3.jx_brand_fee_factor/10),3)) jx_income,
SUM(ROUND(IF(t1.earning_type = 1, t1.total_shop_money-t1.earning_price-IFNULL(t2.desired_fee,0), t1.total_shop_money *(t1.order_pay_percentage/2)/100) * (t3.market_add_fee_factor/10),3)) market_income, SUM(ROUND(IF(t1.earning_type = 1, t1.total_shop_money-t1.earning_price-IFNULL(t2.desired_fee,0), t1.total_shop_money *(t1.order_pay_percentage/2)/100) * (t3.market_add_fee_factor/10),3)) market_income,
count(t1.vendor_order_id) order_count, count(t1.vendor_order_id) order_count,
sum(os.sale_price *os.count) order_sku_price sum(t1.vendor_price) order_sku_price
FROM goods_order t1 FROM goods_order t1
LEFT JOIN waybill t2 ON t1.vendor_waybill_id = t2.vendor_waybill_id AND t1.waybill_vendor_id = t2.waybill_vendor_id AND t1.vendor_order_id = t2.vendor_order_id LEFT JOIN waybill t2 ON t1.vendor_waybill_id = t2.vendor_waybill_id AND t1.waybill_vendor_id = t2.waybill_vendor_id AND t1.vendor_order_id = t2.vendor_order_id
LEFT JOIN store t3 ON t1.jx_store_id = t3.id LEFT JOIN store t3 ON t1.jx_store_id = t3.id
LEFT JOIN order_sku os ON t1.vendor_order_id = os.vendor_order_id
WHERE t1.order_created_at >= ? AND t1.order_created_at <= ? AND t1.status = 110 ` WHERE t1.order_created_at >= ? AND t1.order_created_at <= ? AND t1.status = 110 `
parma = append(parma, startTime, endTime) parma = append(parma, startTime, endTime)
if storeId != model.NO { if storeId != model.NO {
@@ -1692,15 +1692,15 @@ func StatisticsIncome(db *DaoDB, startTime, endTime time.Time, storeId int, bran
parma = append(parma, vendorId) parma = append(parma, vendorId)
} }
sql += ` GROUP BY t1.jx_store_id,t1.vendor_order_id` sql += ` GROUP BY t1.jx_store_id`
sql2 := ` SELECT settle.id,COUNT(settle.vendor_order_id) order_count,settle.name name, //sql2 := ` SELECT settle.id,COUNT(settle.vendor_order_id) order_count,settle.name name,
SUM(settle.total_income) total_income,SUM(settle.jx_income) jx_income, // SUM(settle.total_income) total_income,SUM(settle.jx_income) jx_income,
SUM(settle.market_income) market_income, SUM(settle.order_sku_price) order_sku_price // SUM(settle.market_income) market_income, SUM(settle.order_sku_price) order_sku_price
FROM ( ` + sql + `) AS settle GROUP BY id ORDER BY order_count DESC` // FROM ( ` + sql + `) AS settle GROUP BY id ORDER BY order_count DESC`
incomeInfo := make([]*StatisticsIncomeInfo, 0, 0) incomeInfo := make([]*StatisticsIncomeInfo, 0, 0)
if err := GetRows(db, &incomeInfo, sql2, parma...); err != nil { if err := GetRows(db, &incomeInfo, sql, parma...); err != nil {
return nil, err return nil, err
} }