From bbb7a538df960f2f47b0af8c3db03622fca08d99 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 22 五月 2020 13:54:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/mapping/order/dividents/TeamDividentsSourceOrderUserMapMapper.xml | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/order/dividents/TeamDividentsSourceOrderUserMapMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/order/dividents/TeamDividentsSourceOrderUserMapMapper.xml
index 675399e..e691ada 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/order/dividents/TeamDividentsSourceOrderUserMapMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/order/dividents/TeamDividentsSourceOrderUserMapMapper.xml
@@ -202,6 +202,9 @@
LEFT JOIN yeshi_ec_team_dividents_source_order t ON d.`sou_source_order_id` = t.`tdo_id`
WHERE d.`sou_target_uid` = #{targetUid} AND t.`tdo_create_time` >= #{minTime}
AND t.`tdo_create_time` <![CDATA[<=]]>#{maxTime}
+ <if test = "key != null and key != ''">
+ AND (t.`tdo_order_no` = #{key} OR d.`sou_source_uid` = #{key})
+ </if>
GROUP BY t.`tdo_order_no`,t.`tdo_source_type`
ORDER BY t.`tdo_create_time` DESC
LIMIT #{start},#{count}
@@ -212,7 +215,10 @@
SELECT COUNT(A.sou_id) FROM (SELECT d.`sou_id` FROM yeshi_ec_team_dividents_source_order_user d
LEFT JOIN yeshi_ec_team_dividents_source_order t ON d.`sou_source_order_id` = t.`tdo_id`
WHERE d.`sou_target_uid` = #{targetUid} AND t.`tdo_create_time` >= #{minTime}
- AND t.`tdo_create_time` <![CDATA[<=]]>#{maxTime}
+ AND t.`tdo_create_time` <![CDATA[<=]]>#{maxTime}
+ <if test = "key != null and key != ''">
+ AND (t.`tdo_order_no` = #{key} OR d.`sou_source_uid` = #{key})
+ </if>
GROUP BY t.`tdo_order_no`,t.`tdo_source_type`)A
</select>
@@ -221,5 +227,8 @@
LEFT JOIN yeshi_ec_team_dividents_source_order t ON d.`sou_source_order_id` = t.`tdo_id`
WHERE d.`sou_target_uid` = #{targetUid} AND t.`tdo_create_time` >= #{minTime}
AND t.`tdo_create_time` <![CDATA[<=]]>#{maxTime}
+ <if test = "key != null and key != ''">
+ AND (t.`tdo_order_no` = #{key} OR d.`sou_source_uid` = #{key})
+ </if>
</select>
</mapper>
--
Gitblit v1.8.0