Merge branch 'Feature/acitityAndOa_20230417' into 'master'

Feature/acitity and oa 20230417

See merge request !87

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

@@ -49,13 +49,13 @@ public class Activity implements Authorization {
         params.put("paramList", depts);
         params.put("isNeedInvite", 1);
         params.put("maTime", activity_day+"11:30");
-        params.put("sceneConfId", 17);
+        params.put("sceneConfId", 440);
         Response response = network.postResponse(params, BasicConfig.WORK_saveActivity);
         boolean data = response.jsonPath().getBoolean("data");
         Assert.assertTrue(data,network.message(params,BasicConfig.WORK_saveActivity,"新建营销活动失败",response.body().asString()));
 
         otoManagerAuth();
-        params.put("sceneConfId", 440);
+        params.put("sceneConfId", 17);
         params.put("totalCost", 99999999.99);
         params.put("maTime", activity_day+"12:00");
         response = network.postResponse(params, BasicConfig.WORK_saveActivity);
@@ -64,7 +64,7 @@ public class Activity implements Authorization {
 
         params.clear();
         params.put("totalCost", 0.01);
-        params.put("sceneConfId", 440);
+        params.put("sceneConfId", 17);
         params.put("isNeedInvite", 0);
         params.put("maTime", activity_day+"11:20");
         response = network.postResponse(params, BasicConfig.WORK_saveActivity);
@@ -80,7 +80,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");
@@ -99,11 +99,10 @@ public class Activity implements Authorization {
         depts.add(deptItem1);
         params.put("paramList", depts);
         params.put("id", acitityId-1);
-        params.put("id", acitityId);
         params.put("isNeedInvite", 1);
         params.put("sceneConfId", 440);
         params.put("totalCost",0);
-        params.put("maTime", activity_day+"20:00");
+        params.put("maTime", activity_day+"11:30");
         Response response = network.postResponse(params, BasicConfig.WORK_modifyActivity);
         boolean data = response.jsonPath().getBoolean("data");
         Assert.assertTrue(data,network.message(params,BasicConfig.WORK_modifyActivity,"修改营销活动失败",response.body().asString()));

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

@@ -712,7 +712,7 @@ public class CheckTask implements Authorization {
         params.put("name", "自动化");
         Response response = network.getResponse(params, BasicConfig.WORK_OA_custName);
         int size = response.jsonPath().getInt("data.size()");
-        Assert.assertTrue(size>3,network.message(params,BasicConfig.WORK_OA_custName,"客户姓名为空",response.body().asString()));
+        Assert.assertTrue(size>2,network.message(params,BasicConfig.WORK_OA_custName,"客户姓名为空",response.body().asString()));
     }
 
 

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

@@ -60,6 +60,9 @@ public class Work implements Authorization {
         otoAreaAuth();
         menuList(11);
 
+        otoPlanAuth();
+        menuList(3);
+
         otoManagerAuth();
         menuList(20);
     }
@@ -98,6 +101,9 @@ public class Work implements Authorization {
         otoAreaAuth();
         tagList(tags);
 
+        otoPlanAuth();
+        tagList(tags);
+
         otoManagerAuth();
         tagList(tags);
     }
@@ -118,7 +124,7 @@ public class Work implements Authorization {
         Assert.assertTrue(size>0,network.message(BasicConfig.WORK_notifyList,"通知栏不为空",response.body().asString()));
         int notifyType = response.jsonPath().getInt("data[0].notifyType");
         int custCount = response.jsonPath().getInt("data[0].custCount");
-        Assert.assertEquals(custCount,6,network.message(BasicConfig.WORK_notifyList,"客户数量错误",response.body().asString()));
+        Assert.assertEquals(custCount,5,network.message(BasicConfig.WORK_notifyList,"客户数量错误",response.body().asString()));
         Assert.assertEquals(notifyType,2,network.message(BasicConfig.WORK_notifyList,"通知栏类型错误",response.body().asString()));
     }