Merge branch 'Feature/checkChart_20230519_gxh' into 'master'

增加邀约优化的测试用例

See merge request !106

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

@@ -81,7 +81,7 @@ public class Activity implements Authorization {
         Assert.assertEquals(size,3,network.message(params,BasicConfig.WORK_listActivity,"营销活动数量错误",response.body().asString()));
         acitityId = response.jsonPath().getInt("data[0].voList[2].id");
         String sceneName = response.jsonPath().getString("data[0].voList[0].sceneName");
-        Assert.assertEquals(sceneName,"勿动-自动化一面场景",network.message(params,BasicConfig.WORK_listActivity,"营销活动排序错误",response.body().asString()));
+        Assert.assertEquals(sceneName,"勿动-自动化一面沙龙场景",network.message(params,BasicConfig.WORK_listActivity,"营销活动排序错误",response.body().asString()));
         String timeInterval1 = response.jsonPath().getString("data[0].voList[0].timeInterval");
         Assert.assertEquals(timeInterval1, "am",network.message(params,BasicConfig.WORK_listActivity,"营销活动排序错误",response.body().asString()));
         String timeInterval2 = response.jsonPath().getString("data[0].voList[2].timeInterval");
@@ -282,7 +282,7 @@ public class Activity implements Authorization {
         params.put("date", today);
         Response response = network.postResponse(params, BasicConfig.WX_interviewConfigList);
         int size = response.jsonPath().getInt("data.size()");
-        Assert.assertEquals(size,4,network.message(params,BasicConfig.WX_interviewConfigList,"其他见面场景组数错误",response.body().asString()));
+        Assert.assertEquals(size,3,network.message(params,BasicConfig.WX_interviewConfigList,"其他见面场景组数错误",response.body().asString()));
     }
 
     @Test(description = "专家查看见面目的列表",priority = 15)
@@ -517,10 +517,10 @@ public class Activity implements Authorization {
 
     @Test(description = "查询团队更新经营客户情况",priority = 40)
     public void 查询团队更新经营客户情况(){
-        sleep(3000);
+        sleep(10000);
         otoLeaderAuth();
-        checChart(1,4,0);
-        checChart(2,1,0);
+        checChart(1,0,0);
+        checChart(2,3,0);
         checChart(3,0,0);
         checChart(4,0,0);
         checChart(5,0,0);
@@ -531,7 +531,7 @@ public class Activity implements Authorization {
     public void 上传kyc更新经营客户情况(){
         saveKyc(cust_id+2,true);
         saveKyc(cust_id+3,true);
-        sleep(3000);
+        sleep(10000);
         checChart(1,4,0);
         checChart(2,0,0);
         checChart(3,1,0);
@@ -545,7 +545,7 @@ public class Activity implements Authorization {
         otoPlanAuth();
         savePlanFile(3,cust_id+2);
         savePlanFile(3,cust_id+3);
-        sleep(3000);
+        sleep(10000);
         checChart(1,4,1);
         checChart(2,0,0);
         checChart(3,0,0);
@@ -558,7 +558,7 @@ public class Activity implements Authorization {
     public void 上传解决方案更新经营客户情况(){
         savePlanFile(3,cust_id+2);
         savePlanFile(3,cust_id+3);
-        sleep(3000);
+        sleep(10000);
         checChart(1,4,1);
         checChart(2,0,0);
         checChart(3,0,0);
@@ -572,7 +572,7 @@ public class Activity implements Authorization {
         otoLeaderAuth();
         promotionUpdate(cust_id+2,2);
         promotionUpdate(cust_id+3,2);
-        sleep(3000);
+        sleep(10000);
         checChart(1,4,1);
         checChart(2,0,0);
         checChart(3,0,0);

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

@@ -113,9 +113,9 @@ public class Invite implements Authorization {
         params.put("custId",cust_id);
         Response response =network.getResponse(params,BasicConfig.WORK_getAllSceneConfs);
         int size = response.jsonPath().getInt("data.size()");
-        int confUsableSize = response.jsonPath().getInt("data[0].findAll{it.confUsable == 1}.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,3 ,network.message(params,BasicConfig.WORK_getAllSceneConfs,"面访场景包含场景未根据产品组关联",response.body().asString()));
+        Assert.assertEquals(confUsableSize,4 ,network.message(params,BasicConfig.WORK_getAllSceneConfs,"面访场景包含场景未根据产品组关联",response.body().asString()));
     }
 
     @Test(description = "修改客户面访承诺时间为今天",priority = 8)
@@ -239,7 +239,7 @@ public class Invite implements Authorization {
         //查看回显
         getHasFirstInvite(1,true);
         getCallCustInfo(1);
-        getCalendarlist(today,2,"自动化测试客户","勿动-自动化备用邀约");
+        getCalendarlist(today+86400000,2,"自动化测试客户","勿动-自动化备用邀约");
 
         //还原
         assignSeller(cust_id,INVITE_ID,true,1,"crm");

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

@@ -588,7 +588,7 @@ public class Phone implements Authorization {
     public void 邀约仅能查看自己创建的面访(){
         otoInviterTku();
         HashMap<String,Object> params = new HashMap<>();
-        params.put("custName", "自动化测试用户");
+        params.put("custName", "自动化测试客户");
         params.put("pageSize", "20");
         Response response = network.getResponse(params, BasicConfig.PHONE_interviewList);
         int size = response.jsonPath().getInt("data.customerInterviewVos.size()");
@@ -609,14 +609,14 @@ public class Phone implements Authorization {
         otoEpertTku();
 
         HashMap<String,Object> params = new HashMap<>();
-        params.put("custName", "自动化测试用户");
+        params.put("custName", "自动化测试客户");
         params.put("pageSize", "20");
         Response response = network.getResponse(params, BasicConfig.PHONE_interviewList);
         int size = response.jsonPath().getInt("data.customerInterviewVos.size()");
         Assert.assertEquals(size,4,network.message(params,BasicConfig.PHONE_interviewList,"专家面访列表为空",response.body().asString()));
 
         params.clear();
-        params.put("custName", "自动化测试用户");
+        params.put("custName", "自动化测试客户");
         params.put("pageSize", "20");
         response = network.getResponse(params, BasicConfig.PHONE_customerList);
         int interviewNum = response.jsonPath().getInt("data.myCustomerVos[0].interviewNum");
@@ -647,7 +647,7 @@ public class Phone implements Authorization {
         Assert.assertEquals(meetTimeSize,3,network.message(params1,BasicConfig.WORK_detail_v2,"客户的见面次数非3",response.body().asString()));
 
         HashMap<String,Object> params2 = new HashMap<>();
-        params2.put("custName", "自动化测试用户");
+        params2.put("custName", "自动化测试客户");
         params2.put("pageIndex", 1);
         params2.put("pageSize", 50);
         response = network.getResponse(params2,BasicConfig.WORK_inviterCustList);