From 5c4ecf9e8b47efbbf5d21c9e109be0a60cb7e26d Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 08 四月 2019 15:15:09 +0800
Subject: [PATCH] 冲突解决
---
fanli/src/main/java/com/yeshi/fanli/mapping/ThreeSaleMapper.xml | 59 +++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 37 insertions(+), 22 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 ed471e1..cc643ef 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/ThreeSaleMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/ThreeSaleMapper.xml
@@ -161,7 +161,8 @@
<delete id="deleteExpireRecord" parameterType="java.lang.Long">
DELETE FROM
yeshi_ec_threesale
- WHERE expire = 1 AND boss_id = #{bossId} AND worker_id = #{workerId}
+ WHERE expire = 1 AND boss_id = #{bossId} AND
+ worker_id = #{workerId}
</delete>
<!-- 鏌ヨ涓�搴﹂槦鍛橀泦鍚� -->
@@ -395,23 +396,21 @@
<select id="listFirstTeam" resultMap="AllResultMap">
- SELECT * FROM
- `yeshi_ec_threesale` ts
+ SELECT * FROM `yeshi_ec_threesale` ts
LEFT JOIN `yeshi_ec_threesale_extra_info` ff
- ON ts.`boss_id` = ff.`tf_boss_id` AND ts.`worker_id`=ff.`tf_worker_id`
+ ON
+ ts.`boss_id` = ff.`tf_boss_id` AND ts.`worker_id`=ff.`tf_worker_id`
WHERE ts.`boss_id` = #{uid}
<if test="state != null">
AND ts.`state` = #{state}
</if>
- ORDER BY ts.state DESC, ts.expire,
- ts.createTime DESC
+ ORDER BY ts.state DESC, ts.expire, ts.createTime DESC
LIMIT ${start},${count}
</select>
<select id="countFirstTeam" resultType="java.lang.Long">
SELECT IFNULL(count(id),0) FROM `yeshi_ec_threesale`
- WHERE `boss_id` =
- #{uid}
+ WHERE `boss_id` = #{uid}
<if test="state != null">
AND `state` = #{state}
</if>
@@ -420,20 +419,24 @@
<select id="listSecondTeam" resultMap="AllResultMap">
SELECT yet.* FROM (
- SELECT DISTINCT(ts.`id`) AS id FROM `yeshi_ec_threesale` ts
- LEFT JOIN yeshi_ec_threesale tf ON ts.`boss_id`=tf.`worker_id`
- WHERE tf.`boss_id` = #{uid})A
+ SELECT
+ DISTINCT(ts.`id`) AS id FROM `yeshi_ec_threesale` ts
+ LEFT JOIN
+ yeshi_ec_threesale tf ON ts.`boss_id`=tf.`worker_id`
+ WHERE tf.`boss_id`
+ = #{uid})A
LEFT JOIN yeshi_ec_threesale yet ON yet.id =
A.id
- LEFT JOIN `yeshi_ec_threesale_extra_info` ff
- ON yet.`boss_id` =
- ff.`tf_boss_id` AND yet.`worker_id` =ff.`tf_worker_id`
- WHERE
+ LEFT JOIN
+ `yeshi_ec_threesale_extra_info` ff ON yet.`boss_id` = ff.`tf_boss_id`
+
+ WHERE yet.`worker_id` =ff.`tf_worker_id`
<if test="state != null">
AND yet.`state` = #{state}
</if>
ORDER BY
- yet.state DESC, yet.expire, yet.createTime DESC
+ yet.state DESC,
+ yet.expire, yet.createTime DESC
LIMIT ${start},${count}
</select>
@@ -469,19 +472,31 @@
</select>
<select id="getSuccessRelationshipNum" resultType="java.lang.Integer">
- SELECT IFNULL (COUNT(*),0) FROM `yeshi_ec_threesale` t
- WHERE t.`state` = 1 AND (t.`worker_id` =${uid} OR t.`boss_id` = ${uid})
+ SELECT IFNULL
+ (COUNT(*),0) FROM `yeshi_ec_threesale` t
+ WHERE t.`state` = 1 AND
+ (t.`worker_id` =${uid} OR t.`boss_id` = ${uid})
</select>
<select id="getRelationshipByBossIdAndWorkerId" resultMap="BaseResultMap">
SELECT * FROM `yeshi_ec_threesale` t
- WHERE t.`boss_id` = ${bossId} AND t.`worker_id` = ${workerId}
- AND t.`state` = 0 AND (t.`expire` = 0 OR t.`expire`IS NULL)
+ WHERE t.`boss_id` = ${bossId} AND
+ t.`worker_id` = ${workerId}
+ AND t.`state` = 0 AND (t.`expire` = 0 OR
+ t.`expire`IS NULL)
LIMIT 1
</select>
<select id="getExpireRecord" resultMap="BaseResultMap">
- SELECT * FROM `yeshi_ec_threesale`
- WHERE expire = 1 AND boss_id = #{bossId} AND worker_id = #{workerId}
+ SELECT * FROM
+ `yeshi_ec_threesale`
+ WHERE expire = 1 AND boss_id = #{bossId} AND
+ worker_id = #{workerId}
</select>
+
+ <select id="selectSuccessByWorkerId" resultMap="BaseResultMap" parameterType="java.lang.Long">
+ SELECT * FROM `yeshi_ec_threesale`
+ WHERE `state` = 1 AND worker_id = #{0} order by id desc
+ </select>
+
</mapper>
--
Gitblit v1.8.0