|
|
@@ -775,6 +775,7 @@
|
|
|
t1.worker_name,
|
|
|
IFNULL(SUM( t1.totalSaleValue ) - SUM( t1.retValue ), 0) AS totalSaleValue,
|
|
|
IFNULL(SUM( t1.cash ), 0) AS cash,
|
|
|
+ IFNULL(SUM( t1.allinpay ), 0) AS allinpay,
|
|
|
IFNULL(SUM( t1.cashSaleValue ), 0) AS cashSaleValue,
|
|
|
IFNULL(SUM( t1.allinpaySaleValue ), 0) AS allinpaySaleValue,
|
|
|
IFNULL(SUM( t1.retValue ), 0) AS retValue
|
|
|
@@ -1405,7 +1406,7 @@
|
|
|
a.worker_name,
|
|
|
a.websit_id,
|
|
|
a.websit_name,
|
|
|
- b.category_id,
|
|
|
+ b.goods_category_id AS category_id,
|
|
|
SUM( a.sales_qty ) AS totalQty,
|
|
|
SUM( a.totalSaleVal ) AS totalSaleVal,
|
|
|
SUM( a.convert_qty ) as totalConvertQty
|
|
|
@@ -1449,13 +1450,13 @@
|
|
|
AND a.confirm_by IS NOT NULL
|
|
|
AND a.confirm_time BETWEEN #{startDate} AND #{endDate}
|
|
|
) a
|
|
|
- LEFT JOIN goods b ON a.goods_id = b.goods_id
|
|
|
+ LEFT JOIN websit_goods b ON a.goods_id = b.goods_id
|
|
|
GROUP BY
|
|
|
a.worker_id,
|
|
|
a.worker_name,
|
|
|
a.websit_id,
|
|
|
a.websit_name,
|
|
|
- b.category_id
|
|
|
+ b.goods_category_id
|
|
|
) a
|
|
|
GROUP BY
|
|
|
a.worker_id,
|
‘linchangsheng’