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

aa

Browse Source
This commit is contained in:
苏尹岚
2021-03-19 15:51:10 +08:00
parent 08bec358e7
commit 7e7cdce60e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
business/model/dao/report.go
View File

@@ -85,7 +85,7 @@ func GetStatisticsReportForOrders(db *DaoDB, storeIDs, vendorIDs []int, fromDate
JOIN JOIN
( (
SELECT ss.*, SELECT ss.*,
ss.total_gross_profit1 - ss.afs_price total_gross_profit ss.earning_price - ss.afs_price earning_price
FROM ( FROM (
SELECT SELECT
IF(a.jx_store_id <> 0,a.jx_store_id,a.store_id) store_id, IF(a.jx_store_id <> 0,a.jx_store_id,a.store_id) store_id,
@@ -100,7 +100,7 @@ func GetStatisticsReportForOrders(db *DaoDB, storeIDs, vendorIDs []int, fromDate
SUM(a.total_shop_money) total_shop_money, SUM(a.total_shop_money) total_shop_money,
SUM(a.pm_subsidy_money) pm_subsidy_money, SUM(a.pm_subsidy_money) pm_subsidy_money,
SUM(IF(a.earning_type = 1, a.earning_price, a.new_earning_price)) earning_price, SUM(IF(a.earning_type = 1, a.earning_price, a.new_earning_price)) earning_price,
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(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(d.shop_price) afs_price SUM(d.shop_price) afs_price
FROM goods_order a 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 waybill b ON IF(a.waybill_vendor_id = -1,a.vendor_order_id,a.vendor_waybill_id) = b.vendor_waybill_id