diff --git a/business/model/dao/store.go b/business/model/dao/store.go index d42b5f941..91bd30f86 100644 --- a/business/model/dao/store.go +++ b/business/model/dao/store.go @@ -1662,17 +1662,17 @@ func StatisticsAfsOrderInfo(db *DaoDB, startTime, endTime time.Time, storeId int // StatisticsIncome 统计平台和市场收入 func StatisticsIncome(db *DaoDB, startTime, endTime time.Time, storeId int, brandId, vendorId, storeList []int) ([]*StatisticsIncomeInfo, error) { parma := []interface{}{} + 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) * (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, 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 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 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 ` parma = append(parma, startTime, endTime) if storeId != model.NO { @@ -1692,15 +1692,15 @@ func StatisticsIncome(db *DaoDB, startTime, endTime time.Time, storeId int, bran 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, - 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 - FROM ( ` + sql + `) AS settle GROUP BY id ORDER BY order_count DESC` + //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.market_income) market_income, SUM(settle.order_sku_price) order_sku_price + // FROM ( ` + sql + `) AS settle GROUP BY id ORDER BY order_count DESC` 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 }