anderx %!s(int64=4) %!d(string=hai) anos
pai
achega
d5052d4514

+ 1 - 1
src/main/java/com/goafanti/common/dao/UserLockReleaseMapper.java

@@ -143,7 +143,7 @@ public interface UserLockReleaseMapper {
 
 	void insertChannelList(@Param("list")List<String> list, @Param("aid")String aid);
 
-	void updateChannelList(@Param("list")List<String> list, @Param("aid")String aid);
+	void updateChannelList(@Param("list")List<String> list);
 
 
 }

+ 10 - 2
src/main/java/com/goafanti/common/mapper/UserChannelMapper.xml

@@ -172,7 +172,7 @@
         `recovery` = #{recovery,jdbcType=INTEGER},
       </if>
     </set>
-    where uid = #{uid,jdbcType=VARCHAR}
+    where uid = #{uid,jdbcType=VARCHAR} and status in (1,2)
   </update>
   <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.UserChannel">
     <!--
@@ -241,7 +241,15 @@
      <if test="maid !=null">
      ,maid= #{maid}
      </if>
-	where uid in( 
+	where 1=1
+	<if test="type == 2">
+    and status in (0,1,2) 
+     </if>
+     	<if test="type != 2">
+    and status in (0,1,2,6) 
+     </if>
+	
+	and  uid in( 
       <foreach collection="list" index="index" item="item" separator=",">
       #{item}
     </foreach>

+ 1 - 1
src/main/java/com/goafanti/common/mapper/UserLockReleaseMapper.xml

@@ -539,7 +539,7 @@ VALUES
   </insert>
   <update id="updateChannelList">
   update user_lock_release set status =2 ,release_time =now()
-	where aid= #{aid} and uid in (
+	where status=0 and type=0 and uid in (
 	 <foreach item="item" collection="list" separator="," index="">
        	#{item}
      </foreach>

+ 2 - 2
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -2082,7 +2082,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 	@Override
 	public Object pushChannelDeliver(List<String> uids, String receiveId, String remarks, Integer type) {
 		Date date = new Date();
-		Integer i = userMapper.updatechannelCustomerDeliver(uids, receiveId);
+		Integer i=userMapper.updatechannelCustomerDeliver(uids, receiveId);
 		Integer status=null;
 		if (i > 0) {
 			List<UserTransferLog> l = new ArrayList<UserTransferLog>();
@@ -2114,7 +2114,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 				status=ChannelStatus.YFPYXY.getCode();
 			}
 		}else {
-			userLockReleaseMapper.updateChannelList(uids,receiveId);
+			userLockReleaseMapper.updateChannelList(uids);
 			status=ChannelStatus.HT.getCode();
 		}
 		if(type==0) {

+ 6 - 6
src/main/resources/props/config_local.properties

@@ -1,13 +1,13 @@
 #Driver
 jdbc.driverClassName=com.mysql.jdbc.Driver
 #本地
-jdbc.url=jdbc\:mysql://localhost:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
-jdbc.username=root
-jdbc.password=123456
-#测试
-#jdbc.url=jdbc:mysql://101.37.32.31:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+#jdbc.url=jdbc\:mysql://localhost:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
 #jdbc.username=root
-#jdbc.password=aftdev
+#jdbc.password=123456
+#测试
+jdbc.url=jdbc:mysql://101.37.32.31:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+jdbc.username=root
+jdbc.password=aftdev
 #\u68c0\u6d4b\u6570\u636e\u5e93\u94fe\u63a5\u662f\u5426\u6709\u6548\uff0c\u5fc5\u987b\u914d\u7f6e
 jdbc.validationQuery=SELECT 'x'
 #\u521d\u59cb\u8fde\u63a5\u6570