diff --git a/business/model/dao/report.go b/business/model/dao/report.go index 0167eb309..be1a8ac12 100644 --- a/business/model/dao/report.go +++ b/business/model/dao/report.go @@ -85,7 +85,8 @@ func GetStatisticsReportForOrders(db *DaoDB, storeIDs, vendorIDs []int, fromDate JOIN ( SELECT ss.*, - ss.earning_price1 - ss.afs_price earning_price + ss.earning_price1 - IFNULL(ss.afs_price,0) earning_price, + ss.total_gross_profit1 - IFNULL(ss.afs_price,0) total_gross_profit FROM ( SELECT IF(a.jx_store_id <> 0,a.jx_store_id,a.store_id) store_id, @@ -100,7 +101,7 @@ func GetStatisticsReportForOrders(db *DaoDB, storeIDs, vendorIDs []int, fromDate SUM(a.total_shop_money) total_shop_money, SUM(a.pm_subsidy_money) pm_subsidy_money, SUM(IF(a.earning_type = 1, a.earning_price, a.new_earning_price)) earning_price1, - SUM(IF(a.order_type = 0,a.total_shop_money-IF(a.earning_type = 1, a.earning_price, a.new_earning_price)-b.desired_fee-a.distance_freight_money-a.waybill_tip_money, 80)) total_gross_profit, + SUM(IF(a.order_type = 0,a.total_shop_money-IF(a.earning_type = 1, a.earning_price, a.new_earning_price)-b.desired_fee-a.distance_freight_money-a.waybill_tip_money, 80)) total_gross_profit1, SUM(d.shop_price) afs_price FROM goods_order a LEFT JOIN waybill b ON IF(a.waybill_vendor_id = -1,a.vendor_order_id,a.vendor_waybill_id) = b.vendor_waybill_id