Merge branch 'Feature/seller_plan' into 'master'

Feature/seller plan

See merge request !54

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

@@ -687,6 +687,17 @@ public class Phone implements Authorization {
         getSellerPlan(1,1,1,1,2,0);
     }
 
+
+    @Test(description = "查看跟进人标签",priority = 59)
+    public void 查看跟进人标签(){
+        HashMap<String,Object> params = new HashMap<>();
+        params.put("custId", IdMakeUtil.decodingId(cust_id));
+        params.put("type", 1);
+        Response response = network.getResponse(params,BasicConfig.WORK_header);
+        int sceneConfDesc= response.jsonPath().getInt("data.sceneConfDesc.size()");
+        Assert.assertEquals(sceneConfDesc,1,network.message(params,BasicConfig.WORK_header,"客户的场景标签数量错误",response.body().asString()));
+    }
+
     @Test(description = "删除客户",priority = 79)
     public void 删除客户(){
         long id= IdMakeUtil.decodingId(cust_id);
@@ -697,10 +708,10 @@ public class Phone implements Authorization {
             boolean data = response.jsonPath().getBoolean("data");
             Assert.assertTrue(data,network.message(params,BasicConfig.WORK_delCust,"删除客户失败",response.body().asString()));
         }
-
+//
 //        for(int i = 4559;i<4984;i++){
 //            HashMap<String,Object> params = new HashMap<>();
-//            params.put("custId", i);
+//            params.put("custId", 7665);
 //            Response response = network.postResponse(params,BasicConfig.WORK_delCust);
 //
 //        }

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

@@ -489,6 +489,7 @@ public class Work implements Authorization {
         params.put("confUsable",0);
         params.put("companyIds",new int[]{5});
         params.put("sceneName","勿动-自动化场景");
+        params.put("sceneType",2);
         params.put("sceneDesc","勿动，这是自动化测试专用的面访场景");
         Response response =network.postResponse(params,BasicConfig.WORK_custConfSave);
         boolean data = response.jsonPath().getBoolean("data");
@@ -518,6 +519,7 @@ public class Work implements Authorization {
         HashMap<String,Object> params = new HashMap<>();
         params.put("id",sceneId);
         params.put("confUsable",1);
+        params.put("sceneType",1);
         params.put("companyIds",companyIds);
         params.put("sceneName","勿动-自动化面访场景");
         params.put("sceneDesc","勿动，这是自动化测试专用的面访场景");
@@ -777,10 +779,10 @@ public class Work implements Authorization {
         getCallCustInfo(1);
     }
 
-    @Test(description = "查看准客户面访任务和约面日历为未确认",priority = 53)
-    public void 查看准客户面访任务和约面日历为未确认(){
+    @Test(description = "查看准客户面访任务和约面日历为已确认",priority = 53)
+    public void 查看准客户面访任务和约面日历为已确认(){
         taskList(0,1);
-        getCalendarlist(today+86400000,1,"自动化测试用户","勿动-自动化测试邀约");
+        getCalendarlist(today+86400000,2,"自动化测试用户","勿动-自动化测试邀约");
     }
 
 //    @Test(description = "修改客户行程状态为已确认",priority = 52)
@@ -820,7 +822,7 @@ public class Work implements Authorization {
         taskList(0,1);
         getHasFirstInvite(1,true);
         getCallCustInfo(1);
-        getCalendarlist(today+86400000,1,"自动化测试用户","勿动-自动化测试邀约");
+        getCalendarlist(today+86400000,2,"自动化测试用户","勿动-自动化测试邀约");
     }
 
     @Test(description = "修改客户具体日期客户状态变为已改期",priority = 55)
@@ -1786,6 +1788,15 @@ public class Work implements Authorization {
         Assert.assertEquals(size,4,network.message(params,BasicConfig.WORK_getPlanList,"总计划数量错误",response.body().asString()));
     }
 
+    @Test(description = "获取场景类型",priority = 124)
+    public void 获取场景类型(){
+        HashMap<String,Object> params = new HashMap<>();
+        params.put("sceneType", "1,2");
+        Response response = network.getResponse(params,BasicConfig.WORK_getSceneTypes);
+        int size = response.jsonPath().getInt("data.size()");
+        Assert.assertTrue(size>0,network.message(params,BasicConfig.WORK_getSceneTypes,"场景结果为空",response.body().asString()));
+    }
+
     //修改客户的约面情况
     public void updateInvite(int interviewFlag,long time){
         HashMap<String,Object> params = new HashMap<>();

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

@@ -43,8 +43,8 @@ public class BasicConfig {
 
   /*******OTO销售工作台*********/
   public  static final String OTO_INVITER_TKU = "4yrzAfNog7WE527NKCNmqBqph48N7mWR9J49QYysZmKYC3DF97hQFap7RphynF3GFXLhp7GFZ35mc";
-  public  static final String OTO_TAKER_TKU = "7Fcuh7FWTsTHSqdGLMp5tQfPxhLUvJPui5b8gHP2ZkyDFqVEhZ7NLbZB2cpohNSKYScBin4vQrgDVDhxxBdmPr9937m1bY3LTXzDdQ6y8fGrF8r66CSzHbM69FPTYxJLGHG71NittSC1J1Hi86Vu4kFR";
-  public  static final String OTO_EXPERT_TKU = "7Fcuh7FWTsTHSqdGLMp5tQsHHyH8oTHwYpSo8uHUiYABxYw3KBuY2gfxur5mFo5wiLKNtMZbgNo969ULyi8W7CrWzvXgQCuqchPXa9qfmvNJnyFWjH7wtSifZFYoM9rMN8CeT9iMC4FbhHtEpdVuFmzP";
+  public  static final String OTO_TAKER_TKU = "7Fcuh7FWTsTHSqdGMe8YkveUybFE3wHk9mLiXVmBDJLeb1ziCz1PgEhvP8PDF2wzLy1Wa5NDhHptVxQMDus68MuZTCnuHsdPqgdN8hDwNHG4UKSHETMxQ8Fr8RJEoFPKsMipeBj1qyQbHUfDHkAXttwC";
+  public  static final String OTO_EXPERT_TKU = "7Fcuh7FWTsTHSqdGMe8Ykvemfh5GwzxxMicv5aVZLvZgWavNN8HMHeTDGLKfKVwwHZfCGXL864f64enZ1L3MUeg1UkZwKqhTkZM65V8comDPFGtrB3kRFzcnK94m1riZJRydADDmM6h6fAqXK6ajs26B";
   // *************** 客集集域名 ***************
   public static final String HOST = "https://kjj.m.duibatest.com.cn";
   public static final String SSO_HOST = "https://sso.duibatest.com.cn";
@@ -230,6 +230,7 @@ public class BasicConfig {
   public static final String WORK_getPlanDetail = WORK_HOST + "/kjy/oto/manager/customer/getPlanDetail";
   public static final String WORK_getPlanList = WORK_HOST + "/kjy/oto/manager/customer/getPlanList";
   public static final String WORK_callSubmit = WORK_HOST + "/kjy/oto/manager/customer/call/cust/info/submit";
+  public static final String WORK_getSceneTypes= WORK_HOST + "/kjy/oto/manager/custconf/getSceneTypes";
 
   //*************************客集集营销平台******************************
   public static final String PHONE_bindWxUser = HOST + "/kjy/oto/interview/bindWxUser";