增加总监盘点的接口用例

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

@@ -867,6 +867,32 @@ public class Manager implements Authorization {
 
     }
 
+    @Test(description = "修改客户的产品组",priority = 56)
+    public void 修改客户产品组(){
+        HashMap<String,Object> params = new HashMap<>();
+        params.put("custId",custids.get(0));
+        params.put("companyIds",new int[]{5,6});
+        Response response =network.postResponse(params,BasicConfig.MANAGER_customer_update);
+        boolean data = response.jsonPath().getBoolean("data");
+        Assert.assertTrue(data,network.message(params,BasicConfig.MANAGER_customer_update,"修改客户的产品组失败",response.body().asString()));
+
+        params.clear();
+        params.put("pageIndex", 1);
+        params.put("pageSize", 10);
+        params.put("phoneNum", "15136361302");
+        response = network.getResponse(params,BasicConfig.MANAGER_oto_customerList);
+        int companySize = response.jsonPath().getInt("data.list[0].companyIds.size()");
+        Assert.assertEquals(companySize,2,network.message(params,BasicConfig.MANAGER_oto_customerList,"客户的产品组错误",response.body().asString()));
+
+    }
+
+    @Test(description = "查询所有产品列表",priority = 57)
+    public void 查询所有产品列表(){
+        Response response =network.getResponse(BasicConfig.MANAGER_product_listAll);
+        int size = response.jsonPath().getInt("data.list.size()");
+        Assert.assertTrue(size>0 ,network.message(BasicConfig.MANAGER_product_listAll,"查看产品列表不为空",response.body().asString()));
+
+    }
 
     public int searchCustName(String custName){
         HashMap<String,Object> params = new HashMap<>();

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

@@ -105,9 +105,9 @@ public class Phone implements Authorization {
         HashMap<String,Object> params = new HashMap<>();
         params.put("id",Work.sceneId);
         params.put("confUsable",1);
-        Response response =network.postResponse(params,BasicConfig.PHONE_updateStatus);
+        Response response =network.postResponse(params,BasicConfig.WORK_updateStatus);
         boolean data = response.jsonPath().getBoolean("data");
-        Assert.assertTrue(data,network.message(params,BasicConfig.PHONE_updateStatus,"关闭见面场景失败",response.body().asString()));
+        Assert.assertTrue(data,network.message(params,BasicConfig.WORK_updateStatus,"关闭见面场景失败",response.body().asString()));
 
         params.clear();
         params.put("custId", cust_id);
@@ -304,6 +304,12 @@ public class Phone implements Authorization {
         response =network.getResponse(params,BasicConfig.WORK_invire);
         boolean data = response.jsonPath().getBoolean("data");Assert.assertTrue(data ,network.message(params,BasicConfig.WORK_invire,"上传面访记录>=1",response.body().asString()));
 
+        params.clear();
+        params.put("custId",  IdMakeUtil.decodingId(cust_id));
+        response = network.getResponse(params,BasicConfig.WORK_detail_v2);
+        int commitPlanFlag = response.jsonPath().getInt("data.otoCustInfo4Manage.commitPlanFlag");
+        Assert.assertEquals(commitPlanFlag,0,network.message(params,BasicConfig.WORK_detail_v2,"是否提交计划书非否",response.body().asString()));
+
         //查看约面日历
         otoManagerAuth();
         Work.getCalendarlist(Work.today,5,"自动化激活用户","勿动-自动化测试邀约");
@@ -346,6 +352,13 @@ public class Phone implements Authorization {
         Response response =network.postResponse(params,BasicConfig.WORK_interviewAuditReject);
         boolean data = response.jsonPath().getBoolean("data");
         Assert.assertTrue(data,network.message(params,BasicConfig.WORK_interviewAuditReject,"驳回审批失败",response.body().asString()));
+
+        otoTakerAuth();
+        params.clear();
+        params.put("custId",  IdMakeUtil.decodingId(cust_id));
+        response = network.getResponse(params,BasicConfig.WORK_detail_v2);
+        int commitPlanFlag = response.jsonPath().getInt("data.otoCustInfo4Manage.commitPlanFlag");
+        Assert.assertEquals(commitPlanFlag,1,network.message(params,BasicConfig.WORK_detail_v2,"是否提交计划书非否",response.body().asString()));
     }
 
     @Test(description = "查看我的面访状态更新为已失效",priority = 26)
@@ -443,6 +456,13 @@ public class Phone implements Authorization {
         response =network.postResponse(params,BasicConfig.WORK_interviewAuditPass);
         boolean data = response.jsonPath().getBoolean("data");
         Assert.assertTrue(data,network.message(params,BasicConfig.WORK_interviewAuditPass,"通过审批失败",response.body().asString()));
+
+        otoTakerAuth();
+        params.clear();
+        params.put("custId",  IdMakeUtil.decodingId(cust_id));
+        response = network.getResponse(params,BasicConfig.WORK_detail_v2);
+        int commitPlanFlag = response.jsonPath().getInt("data.otoCustInfo4Manage.commitPlanFlag");
+        Assert.assertEquals(commitPlanFlag,1,network.message(params,BasicConfig.WORK_detail_v2,"是否提交计划书非是",response.body().asString()));
     }
 
     @Test(description = "查询专家列表",priority = 32)
@@ -587,7 +607,7 @@ public class Phone implements Authorization {
         otoManagerAuth();
         HashMap<String,Object> params = new HashMap<>();
         params.put("id",Work.sceneId);
-        Response response =network.postResponse(params,BasicConfig.PHONE_delete);
+        Response response =network.postResponse(params,BasicConfig.WORK_delete);
         boolean data = response.jsonPath().getBoolean("data");
         Assert.assertTrue(data,network.message(params,BasicConfig.WORK_delCust,"删除见面场景失败",response.body().asString()));
     }
@@ -606,9 +626,9 @@ public class Phone implements Authorization {
         params.put("pageSize",20);
         Response response =network.getResponse(params,BasicConfig.PHONE_paper_getCustomers);
         int size = response.jsonPath().getInt("data.list.size()");
-        Assert.assertTrue(size>0,network.message(BasicConfig.PHONE_paper_getCustomers,"订单状态未更新为已参观",response.body().asString()));
+        Assert.assertTrue(size>0,network.message(BasicConfig.PHONE_paper_getCustomers,"日报列表客户为空",response.body().asString()));
         String label = response.jsonPath().getString("data.list[0].label");
-        Assert.assertEquals(label,"今日联系",network.message(BasicConfig.PHONE_paper_getCustomers,"日报提交状态非0：未提交",response.body().asString()));
+        Assert.assertEquals(label,"",network.message(BasicConfig.PHONE_paper_getCustomers,"客户非今日见面标签",response.body().asString()));
     }
 
     @Test(description = "提交日报",priority = 50)
@@ -639,18 +659,6 @@ public class Phone implements Authorization {
         interviewdetail(interviewIds.get(2),1,0,"",0,0,null);
     }
 
-    @Test(description = "查询新客户详细信息",priority = 54)
-    public void 查询新客户详细信息(){
-        otoTakerAuth();
-        HashMap<String,Object> params = new HashMap<>();
-        params.put("custId", IdMakeUtil.decodingId(cust_id));
-        Response response = network.getResponse(params,BasicConfig.WORK_detail);
-        int addWxStatus = response.jsonPath().getInt("data.custInfo.addWxStatus");
-        int commitPlanFlag = response.jsonPath().getInt("data.custPhaseVo.commitPlanFlag");
-        Assert.assertEquals(addWxStatus,3,network.message(params,BasicConfig.WORK_detail,"加微状态不为3：上报已添加",response.body().asString()));
-        Assert.assertEquals(commitPlanFlag,0,network.message(params,BasicConfig.WORK_detail,"是否提交计划书不为否",response.body().asString()));
-    }
-
     @Test(description = "邀约仅能查看自己创建的面访",priority = 55)
     public void 邀约仅能查看自己创建的面访(){
         otoInviterTku();
@@ -662,7 +670,16 @@ public class Phone implements Authorization {
         Assert.assertEquals(size,0,network.message(params,BasicConfig.PHONE_interviewList,"邀约面访列表不为空",response.body().asString()));
     }
 
-    @Test(description = "专家能查看关联自己的面访",priority = 56)
+    @Test(description = "邀约查看历史备注包含面访备注",priority = 56)
+    public void 邀约查看历史备注包含面访备注(){
+        HashMap<String,Object> params = new HashMap<>();
+        params.put("custId", IdMakeUtil.decodingId(cust_id));
+        Response response = network.getResponse(params, BasicConfig.WORK_historyRecord);
+        int size = response.jsonPath().getInt("data.size()");
+        Assert.assertEquals(size,3,network.message(params,BasicConfig.WORK_historyRecord,"邀约面访列表不为空",response.body().asString()));
+    }
+
+    @Test(description = "专家能查看关联自己的面访",priority = 57)
     public void 专家能查看关联自己的面访(){
         otoEpertTku();
         HashMap<String,Object> params = new HashMap<>();
@@ -676,7 +693,7 @@ public class Phone implements Authorization {
     @Test(description = "删除客户",priority = 79)
     public void 删除客户(){
         long id= IdMakeUtil.decodingId(cust_id);
-        for(int i = (int)id;i<id+5;i++){
+        for(int i = (int)id;i<id+6;i++){
             HashMap<String,Object> params = new HashMap<>();
             params.put("custId", i);
             Response response = network.postResponse(params,BasicConfig.WORK_delCust);

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 = "7Fcuh7FWTsTHSqd2BcxmPv9SXECJUK6FddtgLSE1ugtvw4pYHcyHV7StcfozfnfchPdCkpFErSUP3kgVyF58YPpp9B8BdrksYwChC8mBXn6pQ8GxCb5AJpZreWsh8wxX6phe6zHs2RvsKvd3jnq1kyQA";
-  public  static final String OTO_EXPERT_TKU = "7Fcuh7FWTsTHSqd2BcxmPuvuvvAePiLgYnPp2yhMkiydMAt2nVg96imnjRqrqVAH3cmNGvDJURv32AVK2yLe2x7Lf6AHBynU8eM24vGtyweFzdxys5K12eHXDwbkxrb2kvT1n4iw91cxjxXqpVSRffbo";
+  public  static final String OTO_TAKER_TKU = "7Fcuh7FWTsTHSqd2be68YiRKvNhscfrWwNHFvuMwkumtuhF4AotfJLRbsAVpjxzt4G9E5r6M2nvgrcqiP5xBvQDLDQjT5eB9rqBVB1eonEqkmd1gjktdoWV8GLPAK8S3nk7yaHUevCWZWaZhJ8YkQV6M";
+  public  static final String OTO_EXPERT_TKU = "7Fcuh7FWTsTHSqd2be68YiSEoRqh5beyhXNsJahtdNENwqw57Q8TPPkJkUoE8pP57iQhpfhq2LnsJVpBfdtSt2j969eSDnpxUd7WGNhyZDL8gSFA6ecKSbZSYh29SPrUQXhHQihrbPNDfLzrDbku1AM4";
   // *************** 客集集域名 ***************
   public static final String HOST = "https://kjj.m.duibatest.com.cn";
   public static final String SSO_HOST = "https://sso.duibatest.com.cn";
@@ -156,7 +156,6 @@ public class BasicConfig {
   public static final String WORK_tag = WORK_HOST + "/kjy/oto/manager/customer/tag";
   public static final String WORK_order = WORK_HOST + "/kjy/oto/manager/customer/order";
   public static final String WORK_feedback = WORK_HOST + "/kjy/oto/manager/customer/feedback";
-  public static final String WORK_edit = WORK_HOST + "/kjy/oto/manager/customer/edit";
   public static final String WORK_operation = WORK_HOST + "/kjy/oto/manager/customer/log/operation";
   public static final String WORK_fuzzyCustName= WORK_HOST + "/kjy/oto/manager/customer/fuzzy/custName";
   public static final String WORK_call= WORK_HOST + "/kjy/oto/manager/customer/call";
@@ -202,6 +201,15 @@ public class BasicConfig {
   public static final String WORK_updateExpertRemark= WORK_HOST + "/kjy/oto/manager/customer/updateExpertRemark";
   public static final String WORK_updateAddWxStatus= WORK_HOST + "/kjy/oto/manager/customer/updateAddWxStatus";
   public static final String WORK_introduce_save= WORK_HOST + "/kjy/oto/manager/customer/introduce/save";
+  public static final String WORK_updateCustName= WORK_HOST + "/kjy/oto/manager/customer/updateCustName";
+  public static final String WORK_custConfSave = WORK_HOST + "/kjy/oto/manager/custconf/save";
+  public static final String WORK_custConfList = WORK_HOST + "/kjy/oto/manager/custconf/list";
+  public static final String WORK_updateStatus = WORK_HOST + "/kjy/oto/manager/custconf/updateStatus";
+  public static final String WORK_delete = WORK_HOST +  "/kjy/oto/manager/custconf/delete";
+  public static final String WORK_saveCheckRecord = WORK_HOST +  "/kjy/oto/manager/customer/saveCheckRecord";
+  public static final String WORK_checkCustList = WORK_HOST +  "/kjy/oto/manager/customer/check/custList";
+  public static final String WORK_checkList = WORK_HOST +  "/kjy/oto/manager/customer/check/list";
+  public static final String WORK_historyRecord = WORK_HOST + "/kjy/oto/manager/customer/log/historyRecord";
 
   //*************************客集集营销平台******************************
   public static final String PHONE_bindWxUser = HOST + "/kjy/oto/interview/bindWxUser";
@@ -210,12 +218,8 @@ public class BasicConfig {
   public static final String WX_confirm= HOST + "/kjy/mp/oto/risk/invLetter/confirm";
 
   //***********************销售工作台手机端**********************
-  public static final String PHONE_custConfSave = WORK_HOST + "/kjy/oto/manager/custconf/save";
-  public static final String PHONE_custConfList = WORK_HOST + "/kjy/oto/manager/custconf/list";
-  public static final String PHONE_updateStatus = WORK_HOST + "/kjy/oto/manager/custconf/updateStatus";
   public static final String PHONE_getCustPhase = WORK_HOST + "/kjy/oto/manager/customer/getCustPhase";
   public static final String PHONE_updateCustPhase = WORK_HOST + "/kjy/oto/manager/customer/updateCustPhase";
-  public static final String PHONE_delete = WORK_HOST +  "/kjy/oto/manager/custconf/delete";
   public static final String PHONE_customerList = PHONE_HOST + "/kjy/oto/manager/customer/list";
   public static final String PHONE_customerSave = PHONE_HOST + "/kjy/oto/manager/customer/introduce/save";
   public static final String PHONE_appointmentDetail = PHONE_HOST + "/kjy/oto/interview/appointment/detail";

src/test/java/com/oto/utils/NetworkUtils.java

@@ -27,7 +27,7 @@ public class NetworkUtils {
         //cookies中的tku
         agentCookies.put("tku",AGENT_TKU);
         //多场景测试标志
-        agentCookies.put("_duibaServiceGroupKey","miria-3401");
+        agentCookies.put("_duibaServiceGroupKey","miria-3321");
         //json类型的headers
         agentHeaders.put("Content-Type","application/json");
         //二进制文件的headers