From d24445181188425fbdc944a862bc82a8c5e52d69 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期四, 14 五月 2020 14:51:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/mapping/order/UserOrderDailyStatisticMapper.xml | 51 +++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 43 insertions(+), 8 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 a6ea634..1bd623f 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
@@ -19,14 +19,17 @@
<select id="listFanLiAndShareByPlaceOrderTime" resultMap="BaseResultMap">
SELECT
co.`co_uid` as
- uid,co.`co_child_source_type` AS `type`, SUM(v.`hb_money`)
+ uid,co.`co_child_source_type` AS `type`,
+ SUM(v.`hb_money`)
AS
money,DATE(co.`co_third_create_time`) AS
`day`,COUNT(DISTINCT(CONCAT(
co.co_order_no,'#',co.co_source_type)))
- AS orderCount FROM
+ AS
+ orderCount FROM
yeshi_ec_hongbao_v2 v LEFT JOIN
- yeshi_ec_hongbao_order ho ON
+ yeshi_ec_hongbao_order
+ ho ON
ho.`ho_hongbao_id`=v.`hb_id` LEFT JOIN
yeshi_ec_common_order co ON
co.`co_id`=ho.`ho_order_id` WHERE
@@ -40,11 +43,17 @@
<select id="listTeamByPlaceOrderTime" resultMap="BaseResultMap">
- SELECT v.`hb_uid` as uid,co.`co_child_source_type` AS `type`, SUM(v.`hb_money`) AS
- money,DATE(co.`co_third_create_time`) AS `day`,COUNT(DISTINCT(CONCAT(
- co.co_order_no,'#',co.co_source_type))) AS orderCount FROM
- yeshi_ec_hongbao_v2 v LEFT JOIN yeshi_ec_hongbao_order ho ON
- ho.`ho_hongbao_id`=v.`hb_pid` LEFT JOIN yeshi_ec_common_order co ON
+ SELECT
+ v.`hb_uid` as uid,co.`co_child_source_type` AS `type`,
+ SUM(v.`hb_money`) AS
+ money,DATE(co.`co_third_create_time`) AS
+ `day`,COUNT(DISTINCT(CONCAT(
+ co.co_order_no,'#',co.co_source_type))) AS
+ orderCount FROM
+ yeshi_ec_hongbao_v2 v LEFT JOIN yeshi_ec_hongbao_order
+ ho ON
+ ho.`ho_hongbao_id`=v.`hb_pid` LEFT JOIN yeshi_ec_common_order co
+ ON
co.`co_id`=ho.`ho_order_id` WHERE (v.`hb_type`=6 OR v.`hb_type`=7 OR
v.`hb_type`=21 OR v.`hb_type`=22) AND co.`co_id`>0 AND
co.`co_third_create_time`>=#{minTime} AND
@@ -54,4 +63,30 @@
</select>
+
+ <select id="listOrderCountByPlaceOrderTime" resultMap="BaseResultMap">
+ SELECT
+ uid,a.day,COUNT(*) AS orderCount FROM
+ (
+ SELECT co.`co_uid` AS
+ uid,co.`co_order_no`,co.`co_source_type`,
+ DATE(co.`co_third_create_time`) AS `day` FROM yeshi_ec_common_order co
+ WHERE co.`co_third_create_time`>=#{minTime} AND
+ #{maxTime}>co.`co_third_create_time` GROUP BY
+ co.`co_order_no`,co.`co_source_type`
+ ) a GROUP BY uid,a.day
+ </select>
+
+
+ <select id="listDividentsOrderByCreateTime" resultMap="BaseResultMap">
+ SELECT
+ ou.`sou_target_uid` AS uid, DATE(ou.`sou_create_time`) AS
+ `day`,ou.`sou_type` AS `type`,SUM(ou.`sou_money`) AS money,COUNT(*) AS
+ orderCount FROM `yeshi_ec_team_dividents_source_order_user` ou WHERE
+ ou.`sou_state`!=4 AND ou.`sou_create_time`>=#{minTime} and
+ #{maxTime}>ou.`sou_create_time`
+ GROUP BY ou.`sou_target_uid`,
+ DATE(ou.`sou_create_time`),ou.`sou_type`
+ </select>
+
</mapper>
--
Gitblit v1.8.0