|
|
@@ -2050,7 +2050,7 @@
|
|
|
<select id="getStatisticsTenantView" parameterType="com.zhongzheng.modules.top.order.bo.TopOrderStatisticsViewBo"
|
|
|
resultType="com.zhongzheng.modules.top.order.vo.TopOrderStatisticsTwoVo">
|
|
|
SELECT
|
|
|
- COUNT(a.order_id) AS orderNum,
|
|
|
+ COUNT(DISTINCT a.order_id) AS orderNum,
|
|
|
SUM(a.money) AS money,
|
|
|
any_value(a.timeStr) AS orderTime,
|
|
|
any_value(a.create_username) AS create_username,
|
|
|
@@ -2096,15 +2096,18 @@
|
|
|
SELECT
|
|
|
o.order_id as order_id,
|
|
|
o.create_time as timeStr,
|
|
|
- o.pay_price as money,
|
|
|
+ og.goods_received as money,
|
|
|
null as create_username,
|
|
|
st.tenant_name
|
|
|
FROM
|
|
|
`order` o
|
|
|
+ LEFT JOIN `order_goods` `og` ON o.order_sn = og.order_sn
|
|
|
LEFT JOIN sys_tenant st ON o.tenant_id = st.tenant_id
|
|
|
WHERE
|
|
|
o.`status` = 1
|
|
|
AND o.order_status = 1
|
|
|
+ AND og.refund_status != 2
|
|
|
+ AND og.pay_status != 1
|
|
|
AND (
|
|
|
o.input_order_sn IS NULL
|
|
|
OR ( SELECT COUNT( too.order_id ) FROM top_old_order too WHERE too.input_order_sn = o.input_order_sn ) = 0
|
he2802