From b8d98797f162f34ce0e4245b0d879ea0e6a30db0 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 26 一月 2019 18:15:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/mapping/ThreeSaleMapper.xml |    7 ++++++-
 1 files changed, 6 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 7484a5c..5e6defe 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/ThreeSaleMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/ThreeSaleMapper.xml
@@ -146,7 +146,12 @@
 		where t.state=0 and t.worker_id=#{0} AND (t.expire = 0 OR t.expire IS
 		NULL)
 	</update>
-
+	
+	<delete id="deleteExpireRecord" parameterType="java.lang.Long">
+		DELETE FROM yeshi_ec_threesale 
+		WHERE expire = 1 AND boss_id = #{bossId} AND worker_id = #{workerId}  
+	</delete>
+	
 	<!-- 鏌ヨ涓�搴﹂槦鍛橀泦鍚� -->
 	<select id="queryMyFirstTeamList" resultMap="BaseResultMap">
 		SELECT * FROM `yeshi_ec_threesale` yet

--
Gitblit v1.8.0