From fb1d948a7b64cd02083b7b6f7ae18d16ad638609 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 13 十二月 2019 18:28:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/mapping/ThreeSaleMapper.xml | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/ThreeSaleMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/ThreeSaleMapper.xml
index f3cf08f..988b5a5 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/ThreeSaleMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/ThreeSaleMapper.xml
@@ -163,7 +163,7 @@
</update>
<update id="inviteSeparate">
- update yeshi_ec_threeSale t set t.state = 0,t.expire = 2,t.succeedTime = null,
+ update yeshi_ec_threeSale t set t.state = 0,t.expire = 1,
t.updateTime = <![CDATA[UNIX_TIMESTAMP(CURRENT_TIMESTAMP()) * 1000]]>
where t.worker_id=#{workerId} AND t.boss_id = #{bossId}
</update>
@@ -481,6 +481,14 @@
t.`expire`IS NULL)
LIMIT 1
</select>
+
+
+ <select id="getNearRelationByBossIdAndWorkerId" resultMap="BaseResultMap">
+ SELECT * FROM `yeshi_ec_threesale` t
+ WHERE t.`boss_id` = #{bossId} AND t.`worker_id` = #{workerId}
+ ORDER BY t.`state` DESC, t.`createTime` DESC
+ LIMIT 1
+ </select>
<select id="getExpireRecord" resultMap="BaseResultMap">
SELECT * FROM
@@ -505,4 +513,12 @@
WHERE t.`worker_id` = #{workerId} AND t.`state` = 1
<![CDATA[AND t.succeedTime >= #{time}]]>
</select>
+
+ <select id="getTeamOrderNumByWorkerId" resultType="Long">
+ SELECT IFNULL(COUNT(d.`id`),0) FROM yeshi_ec_threesale d
+ LEFT JOIN (SELECT t.`id`,t.`boss_id` FROM `yeshi_ec_threesale` t
+ WHERE t.`state` = 1 AND t.`worker_id` = #{workerId} LIMIT 1)t ON t.`boss_id` = d.`boss_id`
+ WHERE d.`id` <![CDATA[<=]]>t.id AND d.`state` = 1
+ </select>
+
</mapper>
--
Gitblit v1.8.0