From 8a57b3a0ee3fa70e8d43eb12865f1c27d0d385d8 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 01 四月 2020 14:55:58 +0800
Subject: [PATCH] Merge branch 'div-1' into div
---
fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderCountMapper.xml | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderCountMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderCountMapper.xml
index 2de717d..3da9a76 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderCountMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderCountMapper.xml
@@ -295,10 +295,19 @@
<select id="countValidOrderByDay" resultMap="CountOrderMap">
SELECT co_uid AS uid ,totalOrder FROM (
SELECT COUNT(d.`co_id`) AS totalOrder,d.`co_uid` FROM `yeshi_ec_common_order` d
- WHERE DATE_FORMAT(d.`co_third_create_time`,'%Y-%m-%d') = '2019-11-11' AND (d.`co_state`=1 OR d.`co_state`=2)
+ WHERE DATE_FORMAT(d.`co_third_create_time`,'%Y-%m-%d') = #{preDay}
+ AND (d.`co_state`=1 OR d.`co_state`=2)
GROUP BY d.`co_order_no`,d.`co_source_type`)A
GROUP BY co_uid
</select>
+
+
+ <select id="getUidByValidOrderByDay" resultType="Long">
+ SELECT DISTINCT d.`co_uid` FROM `yeshi_ec_common_order` d
+ WHERE TO_DAYS(co_third_create_time) = TO_DAYS(#{preDay}) AND (d.`co_state`=1 OR d.`co_state`=2)
+ GROUP BY d.`co_order_no`,d.`co_source_type`
+ </select>
+
<select id="countDownOrderUserByUidAndDate" resultType="Integer">
SELECT COUNT(DISTINCT d.`co_uid`) FROM `yeshi_ec_common_order` d
@@ -308,10 +317,19 @@
</foreach>
</select>
+ <select id="getDownOrderUserByListUidAndDate" resultType="Long">
+ SELECT d.`co_uid` FROM `yeshi_ec_common_order` d
+ WHERE d.`co_third_create_time`<![CDATA[<=]]> #{preDay} AND (d.`co_state`=1 OR d.`co_state`=2)
+ <foreach collection="list" item="uid" open="AND (" separator="OR" close=")" >
+ d.`co_uid` = #{uid}
+ </foreach>
+ GROUP BY d.`co_order_no`,d.`co_source_type`
+ </select>
+
<select id="countCommissionByDay" resultMap="CountOrderMap">
SELECT co_uid AS uid ,commission FROM (
SELECT SUM(IFNULL(d.`co_eIncome`,d.`co_estimate`)) AS commission,d.`co_uid` FROM `yeshi_ec_common_order` d
- WHERE DATE_FORMAT(d.`co_third_create_time`,'%Y-%m-%d') = '2019-11-11' AND (d.`co_state`=1 OR d.`co_state`=2)
+ WHERE DATE_FORMAT(d.`co_third_create_time`,'%Y-%m-%d') = #{preDay} AND (d.`co_state`=1 OR d.`co_state`=2)
GROUP BY d.`co_order_no`,d.`co_source_type`)A
GROUP BY co_uid
</select>
@@ -325,7 +343,7 @@
<select id="countCommissionByDate" resultType="BigDecimal">
SELECT SUM(IFNULL(d.`co_eIncome`,d.`co_estimate`)) FROM `yeshi_ec_common_order` d
- WHERE d.`co_third_create_time`= #{preDay} AND (d.`co_state`=1 OR d.`co_state`=2)
+ WHERE TO_DAYS(d.`co_third_create_time`)= TO_DAYS#{preDay}) AND (d.`co_state`=1 OR d.`co_state`=2)
</select>
<select id="countOderByUidAndLess10" resultType="Integer">
--
Gitblit v1.8.0