Merge branch 'Feature/checkChart_20230519_gxh' into 'master'

增加邀约优化的测试用例

See merge request !107

src/test/java/com/oto/cases/otoseller/Activity.java

@@ -519,7 +519,7 @@ public class Activity implements Authorization {
     public void 查询团队更新经营客户情况(){
         sleep(10000);
         otoLeaderAuth();
-        checChart(1,0,0);
+        checChart(1,3,0);
         checChart(2,3,0);
         checChart(3,0,0);
         checChart(4,0,0);
@@ -531,9 +531,9 @@ public class Activity implements Authorization {
     public void 上传kyc更新经营客户情况(){
         saveKyc(cust_id+2,true);
         saveKyc(cust_id+3,true);
-        sleep(10000);
-        checChart(1,4,0);
-        checChart(2,0,0);
+        sleep(15000);
+        checChart(1,3,0);
+        checChart(2,2,0);
         checChart(3,1,0);
         checChart(4,0,0);
         checChart(5,0,0);
@@ -545,9 +545,9 @@ public class Activity implements Authorization {
         otoPlanAuth();
         savePlanFile(3,cust_id+2);
         savePlanFile(3,cust_id+3);
-        sleep(10000);
-        checChart(1,4,1);
-        checChart(2,0,0);
+        sleep(15000);
+        checChart(1,3,1);
+        checChart(2,2,0);
         checChart(3,0,0);
         checChart(4,1,0);
         checChart(5,0,0);
@@ -558,9 +558,9 @@ public class Activity implements Authorization {
     public void 上传解决方案更新经营客户情况(){
         savePlanFile(3,cust_id+2);
         savePlanFile(3,cust_id+3);
-        sleep(10000);
-        checChart(1,4,1);
-        checChart(2,0,0);
+        sleep(15000);
+        checChart(1,3,1);
+        checChart(2,2,0);
         checChart(3,0,0);
         checChart(4,0,0);
         checChart(5,1,0);
@@ -572,9 +572,9 @@ public class Activity implements Authorization {
         otoLeaderAuth();
         promotionUpdate(cust_id+2,2);
         promotionUpdate(cust_id+3,2);
-        sleep(10000);
-        checChart(1,4,1);
-        checChart(2,0,0);
+        sleep(15000);
+        checChart(1,3,1);
+        checChart(2,2,0);
         checChart(3,0,0);
         checChart(4,0,0);
         checChart(5,0,0);

src/test/java/com/oto/cases/otoseller/CheckTask.java

@@ -109,7 +109,8 @@ public class CheckTask implements Authorization {
 
     @Test(description = "查询团队未盘点的未见面客户",priority = 7)
     public void 查询团队未盘点的未见面客户(){
-        checChart(1,5,0);
+        sleep(10000);
+        checChart(1,4,0);
     }
 
     @Test(description = "特定销售可见团队",priority = 9)
@@ -720,8 +721,9 @@ public class CheckTask implements Authorization {
 
     @Test(description = "查询团队的经营客户情况",priority = 70)
     public void 查询团队的经营客户情况(){
-        checChart(1,6,1);
-        checChart(2,0,0);
+        sleep(10000);
+        checChart(1,5,1);
+        checChart(2,2,0);
         checChart(3,0,0);
         checChart(4,0,0);
         checChart(5,0,0);

src/test/java/com/oto/cases/otoseller/Invite.java

@@ -115,7 +115,7 @@ public class Invite implements Authorization {
         int size = response.jsonPath().getInt("data.size()");
         int confUsableSize = response.jsonPath().getInt("data[0].vos.findAll{it.confUsable == 1}.size()");
         Assert.assertEquals(size,4 ,network.message(params,BasicConfig.WORK_getAllSceneConfs,"面访场景包含场景未根据产品组关联",response.body().asString()));
-        Assert.assertEquals(confUsableSize,4 ,network.message(params,BasicConfig.WORK_getAllSceneConfs,"面访场景包含场景未根据产品组关联",response.body().asString()));
+        Assert.assertEquals(confUsableSize,3 ,network.message(params,BasicConfig.WORK_getAllSceneConfs,"面访场景包含场景未根据产品组关联",response.body().asString()));
     }
 
     @Test(description = "修改客户面访承诺时间为今天",priority = 8)
@@ -287,7 +287,7 @@ public class Invite implements Authorization {
         Assert.assertTrue(data,network.message(params,BasicConfig.WORK_calendar_preAssign,"预分配失败",response.body().asString()));
 
         //验证约面日历状态/专家/带看人变更
-        getCalendarlist(today,4,"自动化测试客户","勿动-自动化测试邀约");
+        getCalendarlist(today+86400000,4,"自动化测试客户","勿动-自动化测试邀约");
         Assert.assertEquals(recordItem.expertName,"勿动-自动化测试专家",network.message(params,BasicConfig.WORK_calendar_list,"专家名称错误",response.body().asString()));
         Assert.assertEquals(recordItem.takeLookName,"勿动-自动化测试带看",network.message(params,BasicConfig.WORK_calendar_list,"带看人名称错误",response.body().asString()));
         Assert.assertTrue(recordItem.hasAssignFlag,network.message(params,BasicConfig.WORK_calendar_list,"是否分配状态非【已分配】",response.body().asString()));
@@ -314,7 +314,7 @@ public class Invite implements Authorization {
         Assert.assertTrue(data,network.message(params,BasicConfig.WORK_calendar_assignRollback,"退回邀约组失败",response.body().asString()));
 
         //验证约面日历状态/专家/带看人清空
-        getCalendarlist(today,3,"自动化测试客户","勿动-自动化测试邀约");
+        getCalendarlist(today+86400000,3,"自动化测试客户","勿动-自动化测试邀约");
         Assert.assertNull(recordItem.expertName,network.message(params,BasicConfig.WORK_calendar_list,"专家名称不为空",response.body().asString()));
         Assert.assertNull(recordItem.takeLookName,network.message(params,BasicConfig.WORK_calendar_list,"带看人名称不为空",response.body().asString()));
         Assert.assertFalse(recordItem.hasAssignFlag,network.message(params,BasicConfig.WORK_calendar_list,"是否分配状态非【待分配未确认】",response.body().asString()));

src/test/java/com/oto/cases/otoseller/Work.java

@@ -46,25 +46,25 @@ public class Work implements Authorization {
         menuList(3);
 
         otoExpertAuth();
-        menuList(4);
+        menuList(5);
 
         otoAssistAuth();
-        menuList(14);
+        menuList(15);
 
         otoLeaderAuth();
-        menuList(19);
+        menuList(20);
 
         otoPMAuth();
         menuList(13);
 
         otoAreaAuth();
-        menuList(12);
+        menuList(16);
 
         otoPlanAuth();
         menuList(3);
 
         otoManagerAuth();
-        menuList(24);
+        menuList(26);
     }
 
     @Test(description = "工作台_标签列表",priority = 5)