diff --git a/business/model/dao/report.go b/business/model/dao/report.go index b1f3c7ddb..4b0835328 100644 --- a/business/model/dao/report.go +++ b/business/model/dao/report.go @@ -96,8 +96,8 @@ func GetStatisticsReportForOrders(db *DaoDB, storeIDs []int, fromDate time.Time, SUM(IF(a.vendor_id = a.waybill_vendor_id,waybill_tip_money,0)) waybill_tip_money, SUM(total_shop_money) total_shop_money, SUM(pm_subsidy_money) pm_subsidy_money, - SUM(new_earning_price) earning_price, - SUM(total_shop_money-new_earning_price-desired_fee-distance_freight_money-waybill_tip_money-80) total_gross_profit + SUM(IF(a.earning_type = 1, earning_price, new_earning_price)) earning_price, + SUM(IF(a.order_tpye = 0,total_shop_money-IF(a.earning_type = 1, earning_price, new_earning_price)-desired_fee-distance_freight_money-waybill_tip_money, 80) total_gross_profit 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 WHERE a.status = ?