From 022c492fe0645af7761889f6471e3e2ae5751fb6 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 26 五月 2020 15:27:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/mapping/order/UserOrderDailyStatisticMapper.xml | 29 ++++++++++++++++++++++++++---
1 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/order/UserOrderDailyStatisticMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/order/UserOrderDailyStatisticMapper.xml
index 9b19ee8..6dd1581 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/order/UserOrderDailyStatisticMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/order/UserOrderDailyStatisticMapper.xml
@@ -81,12 +81,35 @@
<select id="listDividentsOrderByCreateTime" resultMap="BaseResultMap">
SELECT
ou.`sou_target_uid` AS uid, DATE(tdo_create_time) AS
- `day`,ou.`sou_type` AS `type`,SUM(TRUNCATE(ou.`sou_money`,2)) AS money,COUNT(*) AS
- orderCount FROM `yeshi_ec_team_dividents_source_order_user` ou LEFT JOIN yeshi_ec_team_dividents_source_order o ON ou.`sou_source_order_id`=o.`tdo_id` WHERE
+ `day`,ou.`sou_type` AS `type`,SUM(TRUNCATE(ou.`sou_money`,2)) AS
+ money,COUNT(*) AS
+ orderCount FROM
+ `yeshi_ec_team_dividents_source_order_user` ou LEFT JOIN
+ yeshi_ec_team_dividents_source_order o ON
+ ou.`sou_source_order_id`=o.`tdo_id` WHERE
ou.`sou_state`!=4 AND tdo_create_time>=#{minTime} and
#{maxTime}>tdo_create_time
- GROUP BY ou.`sou_target_uid`,
+ GROUP BY
+ ou.`sou_target_uid`,
DATE(tdo_create_time),ou.`sou_type`
</select>
+
+ <select id="listDividentsOrderCountByCreateTime" resultMap="BaseResultMap">
+ SELECT
+ ou.`sou_target_uid` AS uid, DATE(tdo_create_time) AS
+ `day`,COUNT(DISTINCT(CONCAT(O.`tdo_order_no`,O.`tdo_source_type`))) AS
+ orderCount
+ FROM `yeshi_ec_team_dividents_source_order_user` ou
+
+ LEFT JOIN yeshi_ec_team_dividents_source_order o ON
+ ou.`sou_source_order_id`=o.`tdo_id`
+
+ WHERE
+ ou.`sou_state`!=4 AND tdo_create_time>=#{minTime} AND
+ #{maxTime}>tdo_create_time
+ GROUP BY ou.`sou_target_uid`,
+ DATE(tdo_create_time)
+ </select>
+
</mapper>
--
Gitblit v1.8.0