Merge branch 'Feature/20221108/inviterTask' into 'master'

增加邀约任务的接口用例

See merge request !42

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

@@ -586,9 +586,9 @@ public class Phone implements Authorization {
         params.put("taskConfId",4); //任务配置id，4:联系未跟进的客户，5:复拨未接通的客户，6:超过N天未跟进的客户
         params.put("pageIndex",1);
         params.put("pageSize",20);
-        Response response = network.getResponse(params,BasicConfig.WORK_taskDetailsList);
+        Response response = network.getResponse(params,BasicConfig.WORK_taskList);
         int finishCustNum = response.jsonPath().getInt("data.finishCustNum");
-        Assert.assertTrue(finishCustNum>0,network.message(params,BasicConfig.WORK_taskDetailsList,"已完成数量记录错误",response.body().asString()));
+        Assert.assertTrue(finishCustNum>0,network.message(params,BasicConfig.WORK_taskList,"已完成数量记录错误",response.body().asString()));
     }
 
     @Test(description = "查看我的预约订单列表",priority = 46)

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

@@ -1182,10 +1182,10 @@ public class Work implements Authorization {
 
         //获取任务列表验证修改是否成功
         Response listRes = network.getResponse(BasicConfig.WORK_taskConfList);
-        int custType = listRes.jsonPath().getInt("data[0].custType");
-        int custSourceList = listRes.jsonPath().getInt("data[0].notCustSource.size()");
-        Assert.assertEquals(custType,2,network.message(BasicConfig.WORK_taskConfList,"修改任务配置失败",listRes.body().asString()));
-        Assert.assertEquals(custSourceList,4,network.message(BasicConfig.WORK_taskConfList,"修改任务配置失败",listRes.body().asString()));
+        int sellerRole = listRes.jsonPath().getInt("data[0].sellerRole.size()");
+        int notCustSource = listRes.jsonPath().getInt("data[0].notCustSource.size()");
+        Assert.assertEquals(sellerRole,2,network.message(BasicConfig.WORK_taskConfList,"修改任务配置失败",listRes.body().asString()));
+        Assert.assertEquals(notCustSource,1,network.message(BasicConfig.WORK_taskConfList,"修改任务配置失败",listRes.body().asString()));
 
         //恢复默认配置
         params.put("notCustSource",new String[]{});//不支持的客户来源
@@ -1203,22 +1203,23 @@ public class Work implements Authorization {
         otoInviterAuth();
         sleep(2000);
         Response response = network.getResponse(BasicConfig.WORK_statisticHeader);
+        int listSize = response.jsonPath().getInt("data.size()");
         int finishCustNum = response.jsonPath().getInt("data[0].finishCustNum");
-        System.out.println(finishCustNum);
+        Assert.assertEquals(listSize,1,network.message(BasicConfig.WORK_taskList,"待完成客户数统计错误",response.body().asString()));
         Assert.assertEquals(finishCustNum,0,network.message(BasicConfig.WORK_statisticHeader,"销售任务统计错误",response.body().asString()));
     }
 
-    @Test(description = "查看联系新客户任务明细",priority = 89)
-    public void 查看联系新客户任务明细(){
+    @Test(description = "查看承接客户任务明细",priority = 89)
+    public void 查看承接客户任务明细(){
         HashMap<String,Object> params = new HashMap<>();
-        params.put("taskConfId",4); //任务配置id，4:联系未跟进的客户，5:复拨未接通的客户，6:超过N天未跟进的客户
+        params.put("taskConfId",7); //任务配置id，4:联系未跟进的客户，5:复拨未接通的客户，6:超过N天未跟进的客户
         params.put("pageIndex",1);
         params.put("pageSize",20);
-        Response response = network.getResponse(params,BasicConfig.WORK_taskDetailsList);
+        Response response = network.getResponse(params,BasicConfig.WORK_taskList);
         int finishCustNum = response.jsonPath().getInt("data.finishCustNum");
         int listSize = response.jsonPath().getInt("data.list.size()");
-        Assert.assertEquals(finishCustNum,0,network.message(params,BasicConfig.WORK_taskDetailsList,"已完成数量记录错误",response.body().asString()));
-        Assert.assertTrue(listSize>0,network.message(params,BasicConfig.WORK_taskDetailsList,"待完成客户数统计错误",response.body().asString()));
+        Assert.assertEquals(finishCustNum,0,network.message(params,BasicConfig.WORK_taskList,"已完成数量记录错误",response.body().asString()));
+        Assert.assertEquals(listSize,4,network.message(params,BasicConfig.WORK_taskList,"待完成客户数统计错误",response.body().asString()));
     }
 
     @Test(description = "销售标记客户星标成功",priority = 90)
@@ -1266,7 +1267,7 @@ public class Work implements Authorization {
         params.put("pageSize",20);
         Response response =network.getResponse(params,BasicConfig.PHONE_getReservationList);
         int size = response.jsonPath().getInt("data.size()");
-        Assert.assertTrue(size>0,network.message(BasicConfig.PHONE_getReservationList,"查看预约列表不为空",response.body().asString()));
+        Assert.assertEquals(size,2,network.message(BasicConfig.PHONE_getReservationList,"查看预约列表不为空",response.body().asString()));
 
         int bookingStatus = response.jsonPath().getInt("data[0].bookingStatus");
         Assert.assertEquals(bookingStatus,0,network.message(BasicConfig.PHONE_getReservationList,"预约状态错误：非待参观",response.body().asString()));

src/test/java/com/oto/config/BasicConfig.java

@@ -174,8 +174,8 @@ public class BasicConfig {
   public static final String WORK_interviewAuditPass= WORK_HOST + "/kjy/oto/manager/audit/interviewAuditPass";
   public static final String WORK_taskConfList= WORK_HOST + "/kjy/oto/manager/task/config/list";
   public static final String WORK_taskEdit = WORK_HOST + "/kjy/oto/manager/task/config/edit";
-  public static final String WORK_statisticHeader= WORK_HOST + "/kjy/oto/manager/sellerTask/statistic/header";
-  public static final String WORK_taskDetailsList= WORK_HOST + "/kjy/oto/manager/sellerTask/taskDetailsList";
+  public static final String WORK_statisticHeader= WORK_HOST + "/kjy/oto/manager/task/statistic/header";
+  public static final String WORK_taskList = WORK_HOST + "/kjy/oto/manager/task/seller/list";
   public static final String WORK_coefficient_detail= WORK_HOST + "/kjy/oto/manager/customer/coefficient/detail";
   public static final String WORK_customer_detail= WORK_HOST + "/kjy/oto/manager/customer/claimDetail";
   public static final String WORK_customer_claim= WORK_HOST +"/kjy/oto/manager/customer/claim";
@@ -255,6 +255,8 @@ public class BasicConfig {
   public static final String WORK_verifyCode = WORK_HOST + "/kjy/oto/auto/test/verifyCode";
   public static final String WORK_delCust = WORK_HOST + "/kjy/oto/auto/test/delCust";
   public static final String WORK_delPubFormRecord = WORK_HOST + "/kjy/oto/auto/test/delPubFormRecord";
+  public static final String CALL_BACK_1 = "https://kjj-work.duibatest.com.cn/kjy/oto/notify/record?CallSheetID=e7b4efe0-e7bc-4fc1-9ce8-d7655dccc8cd&CallID=e7b4efe0-e7bc-4fc1-9ce8-d7655dccc8cd&CallType=normal&CallNo=";
+  public static final String CALL_BACK_2 = "&CalledNo=18248405155&Ring=2022-11-07%2013:57:06&RingingTime=&Begin=2022-11-07%2013:57:14&End=2022-11-07%2013:57:28&CallTimeLength=0&State=notDeal&MonitorFilename=http://work-phone-record.oss-cn-beijing.aliyuncs.com/20221103/20221103135706_16621273912_136****3947_e7b4efe0-e7bc-4fc1-9ce8-d7655dccc8cd.mp3&RecordFile=20221103/20221103135706_16621273912_136****3947_e7b4efe0-e7bc-4fc1-9ce8-d7655dccc8cd.mp3&FileServer=http://work-phone-record.oss-cn-beijing.aliyuncs.com/&ring=2022-11-07%2013:57:06";
 
   //*************** 人管系统 ***************
   public static final String JiuJiuBao_login = JiuJiuBao_HOST + "/oto/manager/login";