Browse Source

客户释放BUG修复

anderx 1 year ago
parent
commit
067a48324b

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

@@ -1515,7 +1515,7 @@
 
     <update id="updateUserShareType">
         update user
-        set share_type = 0,transfer_time = now()
+        set share_type = 1,transfer_time = now()
         where id in
         <foreach collection="list" item="item" separator="," open="(" close=")">
             #{item.uid}

+ 14 - 3
src/main/java/com/goafanti/common/task/ReleaseUserTask.java

@@ -285,6 +285,7 @@ public class ReleaseUserTask {
 		Date releaseTime = new Date();
 		try {
 			List<LockingReleaseBo> lockUserList = new ArrayList<>();
+			List<LockingReleaseBo> lockSignList = new ArrayList<>();
 			if (userList != null && !userList.isEmpty()) {
 				for (User u : userList) {
 					System.out.println(u.getId());
@@ -300,14 +301,24 @@ public class ReleaseUserTask {
 						List<LockingReleaseBo> users1 = userService.selectSignReleaseUser(u.getId());
 						customerService.pushReleaseLog(users1);
 						addUserNotice(users1);
-						if (!users1.isEmpty()){
-							lockUserList.addAll(users1);
-						}
+						lockSignList.addAll(users1);
 
 					}
 				}
 			}
+			//签单客户要单独处理,没有锁,直接释放
 			List<LockingReleaseBo> newList = new ArrayList<LockingReleaseBo>();
+			if (!lockSignList.isEmpty()) {
+				for (int i = 0; i < lockSignList.size(); i++) {
+					newList.add(lockSignList.get(i));
+					if (pointsDataLimit == newList.size() || i == lockUserList.size() - 1) {
+						customerService.updateUserShareType(newList);
+						newList.clear();
+						Thread.sleep(2000);
+					}
+
+				}
+			}
 			//处理私有客户
 			if (!lockUserList.isEmpty()) {
 				for (int i = 0; i < lockUserList.size(); i++) {

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

@@ -3143,7 +3143,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 
 	@Override
 	public void updateUserShareType(List<LockingReleaseBo> newList) {
-
+			userMapper.updateUserShareType(newList);
 	}
 
     @Override

+ 1 - 5
src/main/java/com/goafanti/user/service/UserService.java

@@ -74,11 +74,7 @@ public interface UserService {
 	List<OutUser> getuser();
 
 
-	/**
-	 * 将签单客户释放,但是不释放业务锁
-	 * @param newList
-	 */
-    void updateUserShareType(List<LockingReleaseBo> newList);
+
 
 	List<LockingReleaseBo> selectSignReleaseUser(String id);
 }

+ 1 - 4
src/main/java/com/goafanti/user/service/impl/UserServiceImpl.java

@@ -371,10 +371,7 @@ public class UserServiceImpl extends BaseMybatisDao<UserMapper> implements UserS
 		return userMapper.getAllUser();
 	}
 
-    @Override
-    public void updateUserShareType(List<LockingReleaseBo> newList) {
-		userMapper.updateUserShareType(newList);
-    }
+
 
 	@Override
 	public List<LockingReleaseBo > selectSignReleaseUser(String id) {