Просмотр исходного кода

修改渠道客户转为私有客户丢失问题

anderx 1 год назад
Родитель
Сommit
62223b03af

+ 8 - 7
src/main/java/com/goafanti/common/task/ReleaseUserTask.java

@@ -22,8 +22,8 @@ import com.goafanti.customer.service.CustomerService;
 import com.goafanti.user.service.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
@@ -35,8 +35,8 @@ import java.util.List;
 import java.util.UUID;
 
 
-@Component
-//@RestController
+//@Component
+@RestController
 public class ReleaseUserTask {
 	@Resource
 	private CustomerService customerService;
@@ -65,9 +65,9 @@ public class ReleaseUserTask {
 	 * 客户释放
 	 *
 	 */
-//	@Scheduled(cron = "0 22 11  * * ?")
-//	@RequestMapping("/open/test")
-	@Scheduled(cron = "0 0 1  * * ?")
+//	@Scheduled(cron = "0 23 9  * * ?")
+	@RequestMapping("/open/test")
+//	@Scheduled(cron = "0 0 1  * * ?")
 	public void startTask() {
 		try {
 			List<User> userList = userService.selectUserByRoleName("营销员", "营销经理");
@@ -238,6 +238,7 @@ public class ReleaseUserTask {
 					System.out.println(u.getId());
 					if (StringUtils.isNotBlank(u.getId())&&!AFTConstants.CAOJIN_AID.equals(u.getId())) {
 						// 获取30天释放 释放以锁定表与user_mid最后跟进取时间
+
 						List<LockingReleaseBo>  userTmpList = customerService.selectWaitReleaseCustomer(u.getId());
 						customerService.pushReleaseLog(userTmpList, 0);
 						addUserNotice(userTmpList);

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

@@ -2256,7 +2256,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		List<LockingReleaseBo> lockingReleaseBos = userLockReleaseMapper.selectWaitReleaseCustomer(uid);
 		for (LockingReleaseBo bo : lockingReleaseBos) {
 			// 渠道为空或者不其他的需要处理
-			if (bo.getChannelType()==null||bo.getChannelType()!=1){
+			if (bo.getNewChannel()!=1||bo.getChannelType()==null||bo.getChannelType()!=1){
 				list.add(bo);
 			}
 		}

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

@@ -1,8 +1,8 @@
 dev.name=local
 jdbc.driverClassName=com.mysql.jdbc.Driver
 
-#static.host=//static.jishutao.com/1.3.18
-static.host=//172.16.1.187/1.3.18
+static.host=//static.jishutao.com/1.3.19
+#static.host=//172.16.1.187/1.3.19
 
 #jdbc.url=jdbc\:mysql://localhost:3306/aft20240430?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

+ 1 - 1
src/main/resources/props/config_test.properties

@@ -1,5 +1,5 @@
 dev.name=test
-static.host=//static.jishutao.com/1.3.18
+static.host=//static.jishutao.com/1.3.19
 #Driver
 jdbc.driverClassName=com.mysql.jdbc.Driver
 jdbc.url=jdbc:mysql://127.0.0.1:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false