Browse Source

科德系统项目派单优化

anderx 3 years ago
parent
commit
e6159b1b60

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

@@ -2092,6 +2092,16 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 
 	@Override
 	public boolean checkMax(String uid,String aid) {
+		boolean isUs = false;
+		if (uid.contains(",")) {
+			isUs = true;
+		}
+		List<String> uList = new ArrayList<>();
+		if (isUs) {
+			uList = Arrays.asList(uid.split(","));
+			uid=uList.get(0);
+		}
+		int x=uList.size();
 		int y = 0;
 		int i = userMapper.checkUserMax(aid);
 		if (uid !=null){
@@ -2113,7 +2123,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 				break;
 			}
 		}
-
+		i+=x;
 		if (i >= y) {
 			return true;
 		}

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

@@ -1,12 +1,12 @@
 dev.name=local
 jdbc.driverClassName=com.mysql.jdbc.Driver
 #jdbc.url=jdbc\:mysql://localhost:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
-jdbc.url=jdbc\:mysql://localhost:3306/aft20220318?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/aft20220318?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
 jdbc.validationQuery=SELECT 'x'
 jdbc.initialSize=3
 jdbc.maxActive=20