From 758a59e77aba29b858698808fedd31c569955357 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 25 五月 2020 15:23:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/mapping/order/UserOrderDailyStatisticMapper.xml | 12 ++++++------
1 files changed, 6 insertions(+), 6 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 1bd623f..9b19ee8 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
@@ -80,13 +80,13 @@
<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`
+ 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
+ ou.`sou_state`!=4 AND tdo_create_time>=#{minTime} and
+ #{maxTime}>tdo_create_time
GROUP BY ou.`sou_target_uid`,
- DATE(ou.`sou_create_time`),ou.`sou_type`
+ DATE(tdo_create_time),ou.`sou_type`
</select>
</mapper>
--
Gitblit v1.8.0