From dd5b15229cb15459fa7c31ccea77dac28cbfafbd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 四月 2020 10:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderCountMapper.xml | 34 ++++++++++++++++++++++++++++++----
1 files changed, 30 insertions(+), 4 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 0773862..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
@@ -62,6 +62,14 @@
WHERE t.co_source_type=#{sourceType} AND DATE_FORMAT(t.`co_third_create_time`,'%Y-%m-%d') = #{preDay}
</select>
+ <select id="countOrderNumber" resultMap="ChartMap">
+ SELECT IFNULL(COUNT(t.`co_id`),0) AS showValue,<include refid="Column_DateType"/>
+ FROM `yeshi_ec_common_order` t
+ WHERE t.co_source_type=#{sourceType} and t.`co_third_create_time` IS NOT NULL <include refid="Count_Select_DateType"/>
+ <include refid="Count_Group_DateType"/>
+ ORDER BY t.`co_third_create_time`
+ </select>
+
<select id="countOrderNumberBySettleTime" resultType="java.util.HashMap">
<!-- 缁熻鍘嗗彶璁㈠崟鏁伴噺 鏍规嵁缁撶畻鏃堕棿 -->
@@ -287,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
@@ -300,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>
@@ -317,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">
@@ -325,7 +351,7 @@
where d.co_uid = #{uid} and d.co_source_type = 1 and d.co_state <![CDATA[<>]]> 4
GROUP BY d.`co_order_no`
ORDER BY d.co_third_create_time desc
- limit 50)A where A.payment<![CDATA[<]]> 10
+ limit 100)A where A.payment<![CDATA[<]]> 10
</select>
</mapper>
--
Gitblit v1.8.0