Browse Source

客户释放修改

anderx 1 year ago
parent
commit
4e7f99490a

+ 2 - 0
src/main/java/com/goafanti/common/dao/UserMapper.java

@@ -254,4 +254,6 @@ public interface UserMapper {
     List<PublicReleaseListBo> getPublicReleaseList(String uid);
 
     void updateUserShareType(List<LockingReleaseBo> newList);
+
+    List<LockingReleaseBo > selectSignReleaseUser(String id);
 }

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

@@ -1538,4 +1538,13 @@
                 #{item.uid}
         </foreach>
     </update>
+
+    <select id="selectSignReleaseUser" resultType="com.goafanti.customer.bo.LockingReleaseBo">
+        select
+        u.id uid,u.aid,0 type,u.share_type shareType,u.nickname userName,u.new_channel newChannel
+        from user u left join user_mid um on u.id=um.uid
+        where u.channel=0 and u.share_type in (2)
+        and u.aid = #{id}
+        and datediff(now(),if(u.transfer_time  &lt; um.last_follow_time,um.last_follow_time,u.transfer_time))>30
+    </select>
 </mapper>

+ 17 - 16
src/main/java/com/goafanti/common/task/ReleaseUserTask.java

@@ -33,7 +33,6 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.UUID;
-import java.util.stream.Collectors;
 
 
 @Component
@@ -234,7 +233,7 @@ public class ReleaseUserTask {
 		Date releaseTime = new Date();
 		try {
 			List<LockingReleaseBo> lockUserList = new ArrayList<>();
-			List<LockingReleaseBo> lockUserList2 = new ArrayList<>();
+			List<LockingReleaseBo> users=new ArrayList<>();
 			if (userList != null && !userList.isEmpty()) {
 				for (User u : userList) {
 					System.out.println(u.getId());
@@ -244,16 +243,15 @@ public class ReleaseUserTask {
 						customerService.pushReleaseLog(userTmpList);
 						addUserNotice(userTmpList);
 						if (!userTmpList.isEmpty()) {
-							//30天私有和270天签单业务释放不改变
-							List<LockingReleaseBo> collect = userTmpList.stream().filter(e ->
-											(e.getShareType() == 0&& e.getType()==0)||e.getType()==1
-									).collect(Collectors.toList());
-							lockUserList.addAll(collect);
-							//30天签单单独只释放签签单
-							List<LockingReleaseBo> collect2 = userTmpList.stream().filter(e ->
-									e.getShareType() == 2&& e.getType()==0).collect(Collectors.toList());
-							lockUserList2.addAll(collect2);
+							lockUserList.addAll(userTmpList);
 						}
+						//获取需要释放的签单客户
+						List<LockingReleaseBo> users1 = userService.selectSignReleaseUser(u.getId());
+						if (!users1.isEmpty()){
+							users.addAll(users1);
+						}
+						customerService.pushReleaseLog(users);
+						addUserNotice(users);
 					}
 				}
 			}
@@ -270,11 +268,13 @@ public class ReleaseUserTask {
 
 				}
 			}
-			if (!lockUserList2.isEmpty()) {
-				for (int i = 0; i < lockUserList2.size(); i++) {
-					newList.add(lockUserList2.get(i));
-					System.out.println(lockUserList2.get(i).getUserName());
-					if (pointsDataLimit == newList.size() || i == lockUserList.size() - 1) {
+
+			//新增客户丢失
+			if (!users.isEmpty()) {
+				List<LockingReleaseBo> releaseList = new ArrayList<>();
+				for (int i = 0; i < users.size(); i++) {
+					releaseList.add(users.get(i));
+					if (pointsDataLimit == releaseList.size() || i == users.size() - 1) {
 						userService.updateUserShareType(newList);
 						newList.clear();
 						Thread.sleep(2000);
@@ -299,6 +299,7 @@ public class ReleaseUserTask {
 
 
 
+
 	private void pushSalesmanCount(List<LockingReleaseBo> aidList) {
 		for (LockingReleaseBo e : aidList) {
 			String dates= e.getLockTime();

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

@@ -2585,12 +2585,13 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		List<UserTransferLog> list3 = new ArrayList<UserTransferLog>();
 		if (!list.isEmpty()) {
 			for (int i = 0; i < list.size(); i++) {
-				int type = list.get(i).getType();
+
 				newList.add(list.get(i));
 				if (50 == newList.size() || i == list.size() - 1) {
 					if (!newList.isEmpty()) {
 						// 处理日志
 						for (LockingReleaseBo lrb : newList) {
+							int type = lrb.getType();
 							UserTransferLog utl = new UserTransferLog();
 							utl.setAid(lrb.getAid());
 							utl.setCreateTime(date);

+ 2 - 0
src/main/java/com/goafanti/user/service/UserService.java

@@ -79,4 +79,6 @@ public interface UserService {
 	 * @param newList
 	 */
     void updateUserShareType(List<LockingReleaseBo> newList);
+
+	List<LockingReleaseBo> selectSignReleaseUser(String id);
 }

+ 5 - 0
src/main/java/com/goafanti/user/service/impl/UserServiceImpl.java

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