diff --git a/business/model/dao/report.go b/business/model/dao/report.go index be1a8ac12..d57afd754 100644 --- a/business/model/dao/report.go +++ b/business/model/dao/report.go @@ -85,8 +85,9 @@ func GetStatisticsReportForOrders(db *DaoDB, storeIDs, vendorIDs []int, fromDate JOIN ( SELECT ss.*, - ss.earning_price1 - IFNULL(ss.afs_price,0) earning_price, - ss.total_gross_profit1 - IFNULL(ss.afs_price,0) total_gross_profit + ss.earning_price1 - IFNULL(ss.afs_shop_price,0) earning_price, + ss.total_gross_profit1 - IFNULL(ss.afs_shop_price,0) total_gross_profit, + ss.total_shop_money1 - IFNULL(ss.afs_total_money,0) total_shop_money FROM ( SELECT IF(a.jx_store_id <> 0,a.jx_store_id,a.store_id) store_id, @@ -98,11 +99,12 @@ func GetStatisticsReportForOrders(db *DaoDB, storeIDs, vendorIDs []int, fromDate SUM(b.desired_fee) desired_fee, SUM(a.distance_freight_money) distance_freight_money, SUM(IF(a.vendor_id = a.waybill_vendor_id,a.waybill_tip_money,0)) waybill_tip_money, - SUM(a.total_shop_money) total_shop_money, + SUM(a.total_shop_money) total_shop_money1, 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_profit1, - SUM(d.shop_price) afs_price + SUM(d.shop_price) afs_shop_price, + SUM(d.refund_money_by_cal) afs_total_money 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 LEFT JOIN afs_order c ON c.vendor_order_id = a.vendor_order_id