强开流转排除US组和EU组

src/main/java/com/malk/eastar/schedule/ScheduleTask1.java

@@ -173,6 +173,11 @@ public class ScheduleTask1 {
         }
         log.info("打款客户数量="+confirmedReceiptCustomerCodeSet.size());
 
+        /*
+            白名单客户
+         */
+        List<String> whiteCustomerNameList = new ArrayList<>();
+
         /*
             筛选客户
             非测试使用、公海/私海=私、是否特殊客户=否、下过单客户=否、新老客户=新
@@ -188,6 +193,15 @@ public class ScheduleTask1 {
                 //忽略测试使用的客户
                 continue;
             }
+            if(ltcCustomerRecord.get("businessGroup")!=null && "US组".equals(ltcCustomerRecord.get("businessGroup").toString())){
+                continue;
+            }
+            if(ltcCustomerRecord.get("businessGroup")!=null && "EU组".equals(ltcCustomerRecord.get("businessGroup").toString())){
+                continue;
+            }
+            if(ltcCustomerRecord.get("customerName")!=null && whiteCustomerNameList.contains(ltcCustomerRecord.get("customerName").toString())){
+                continue;
+            }
             if(ltcCustomerRecord.get("seaType")!=null && "公".equals(ltcCustomerRecord.get("seaType").toString())){
                 continue;
             }
@@ -197,7 +211,7 @@ public class ScheduleTask1 {
             if(ltcCustomerRecord.get("orderedStatus")!=null && "是".equals(ltcCustomerRecord.get("orderedStatus").toString())){
                 continue;
             }
-            if(ltcCustomerRecord.get("newOrOld")!=null && "老".equals(ltcCustomerRecord.get("newOrOld").toString())){
+            if(ltcCustomerRecord.get("newOrOld")!=null && !"新".equals(ltcCustomerRecord.get("newOrOld").toString())){
                 continue;
             }
             //满足以上条件，进强开流转池

src/main/java/com/malk/eastar/service/impl/YidaServiceImpl.java

@@ -1584,7 +1584,7 @@ public class YidaServiceImpl implements YidaService {
 
             //生成客户数据
             customerRecord = UtilMap.map(
-                    "formInstId, customerName, customerNameUnique, customerCode, userId, userIdText, " +
+                    "formInstId, customerName, customerNameUnique, customerCode, userId, userIdText, businessGroup, " +
                             "customerLevel, customerPotentialLevel, specialCustomerFlag, newOrOld, seaType, privateSeaTime, lastFollowupTime, establishStatus, countryOrRegion, " +
                             "productTypes, previousFollowerUserIdList, previousFollowerGroupList, orderedStatus, testUseFlag, aiTableId",
                     formInstId, //表单实例ID
@@ -1593,6 +1593,7 @@ public class YidaServiceImpl implements YidaService {
                     customerCode,   //客户编号
                     userId,  //业务员userId
                     userIdText,  //业务员userId（隐藏字段）
+                    fields.getString("selectField_moy9v8ve"),   //业务小组
                     fields.getString("selectField_mcsoft5i"),    //客户当前分级
                     fields.getString("selectField_mhsvnqsv"),    //客户潜在等级
                     fields.getString("radioField_mo0xhmnw"),    //是否特殊客户