Merge branch 'Feature/20220824-gxh' into 'master'

删除客户阶段

See merge request !26

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

@@ -99,12 +99,12 @@ public class Phone implements Authorization {
         params.put("custId", cust_id);
         Response response = network.getResponse(params, BasicConfig.PHONE_listCustInterConf);
         int size = response.jsonPath().getInt("data.size()");
-        Assert.assertEquals(size,0,network.message(params,BasicConfig.PHONE_listCustInterConf,"见面场景列表数量错误",response.body().asString()));
+        Assert.assertEquals(size,1,network.message(params,BasicConfig.PHONE_listCustInterConf,"见面场景列表数量错误",response.body().asString()));
 
     }
 
-    @Test(description = "打开场景后查看客户1阶段对应的见面场景",priority = 7)
-    public void 打开场景后查看客户1阶段对应的见面场景(){
+    @Test(description = "打开场景后查看客户对应的见面场景",priority = 7)
+    public void 打开场景后查看客户对应的见面场景(){
         otoManagerAuth();
         HashMap<String,Object> params = new HashMap<>();
         params.put("id",Work.sceneId);
@@ -117,9 +117,7 @@ public class Phone implements Authorization {
         params.put("custId", cust_id);
         response = network.getResponse(params, BasicConfig.PHONE_listCustInterConf);
         int size = response.jsonPath().getInt("data.size()");
-        Assert.assertEquals(size,1,network.message(params,BasicConfig.PHONE_listCustInterConf,"见面场景列表数量错误",response.body().asString()));
-        String sceneName = response.jsonPath().getString("data[0].sceneName");
-        Assert.assertEquals(sceneName,"勿动-自动化面访场景",network.message(params,BasicConfig.PHONE_listCustInterConf,"见面场景列表详情错误",response.body().asString()));
+        Assert.assertEquals(size,2,network.message(params,BasicConfig.PHONE_listCustInterConf,"见面场景列表数量错误",response.body().asString()));
     }
 
     @Test(description = "创建1进2的面访",priority = 8)
@@ -136,9 +134,7 @@ public class Phone implements Authorization {
         Response response = network.getResponse(params, BasicConfig.PHONE_customerList);
         int size = response.jsonPath().getInt("data.myCustomerVos.size()");
         Assert.assertTrue(size>0,network.message(params,BasicConfig.PHONE_customerList,"客户列表为空",response.body().asString()));
-        int custFlow = response.jsonPath().getInt("data.myCustomerVos.find{it.custName == '自动化激活用户'}.custFlow");
         boolean interviewStatus = response.jsonPath().getBoolean("data.myCustomerVos.find{it.custName == '自动化激活用户'}.interviewStatus");
-        Assert.assertEquals(custFlow,1,network.message(params,BasicConfig.PHONE_customerList,"客户阶段错误",response.body().asString()));
         Assert.assertTrue(interviewStatus,network.message(params,BasicConfig.PHONE_customerList,"客户面访状态错误：非面访中",response.body().asString()));
     }
 
@@ -256,11 +252,9 @@ public class Phone implements Authorization {
         params.put("id", interviewIds.get(0));
         Response response = network.getResponse(params, BasicConfig.PHONE_custExtDetail);
         String interviewAddress = response.jsonPath().getString("data.interviewAddress");
-        int commitPlanFlag = response.jsonPath().getInt("data.custInterviewExtDto.commitPlanFlag");
-        int custPhase = response.jsonPath().getInt("data.custInterviewExtDto.custPhase");
+        int commitPlanFlag = response.jsonPath().getInt("data.commitPlanFlag");
         Assert.assertNotNull(interviewAddress,network.message(params,BasicConfig.PHONE_custExtDetail,"面访地址为空",response.body().asString()));
         Assert.assertEquals(commitPlanFlag,0,network.message(params,BasicConfig.PHONE_custExtDetail,"是否提交计划书不为否",response.body().asString()));
-        Assert.assertEquals(custPhase,1,network.message(params,BasicConfig.PHONE_custExtDetail,"见面目的不为1进2",response.body().asString()));
     }
 
     @Test(description = "上传1进2面访详情并提示不流转2阶段",priority = 21)
@@ -312,11 +306,9 @@ public class Phone implements Authorization {
         params.put("id", interviewIds.get(0));
         Response response = network.getResponse(params, BasicConfig.PHONE_feedbackDetail);
         int followWeight = response.jsonPath().getInt("data.followWeight");
-        int pensionSalary = response.jsonPath().getInt("data.custInterviewExtDto.pensionSalary");
         int size = response.jsonPath().getInt("data.unusualTypes.size()");
         String unusualExplain = response.jsonPath().getString("data.unusualExplain");
         Assert.assertEquals(followWeight,1,network.message(params,BasicConfig.PHONE_feedbackDetail,"关注度显示错误",response.body().asString()));
-        Assert.assertEquals(pensionSalary,1,network.message(params,BasicConfig.PHONE_feedbackDetail,"是否提交计划书显示错误",response.body().asString()));
         Assert.assertEquals(size,2,network.message(params,BasicConfig.PHONE_feedbackDetail,"面访异常类型显示错误",response.body().asString()));
         Assert.assertEquals(unusualExplain,"手机号不一致且非面对面扫码的情况说明",network.message(params,BasicConfig.PHONE_feedbackDetail,"异常情况说明显示错误",response.body().asString()));
     }
@@ -371,18 +363,6 @@ public class Phone implements Authorization {
         Assert.assertTrue(data,network.message(params,BasicConfig.WORK_interviewAuditReject,"驳回审批失败",response.body().asString()));
     }
 
-    @Test(description = "查询客户阶段信息未更新",priority = 26)
-    public void 查询客户阶段信息未更新(){
-        otosellerAuth();
-        HashMap<String,Object> params = new HashMap<>();
-        params.put("custId", IdMakeUtil.decodingId(cust_id) );
-        Response response = network.getResponse(params,BasicConfig.PHONE_getCustPhase);
-        int custFlow = response.jsonPath().getInt("data.custFlow");
-        Object pensionSalary = response.jsonPath().getJsonObject("data.pensionSalary");
-        Assert.assertEquals(custFlow,1,network.message(params,BasicConfig.WORK_callLog,"新客户的客户阶段不为1：具备机构养老理念",response.body().asString()));
-        Assert.assertNull(pensionSalary,network.message(params,BasicConfig.WORK_callLog,"理想退休工资不为空",response.body().asString()));
-    }
-
     @Test(description = "查看我的面访状态更新为已失效",priority = 27)
     public void 查看我的面访状态更新为已失效(){
         HashMap<String,Object> params = new HashMap<>();
@@ -469,17 +449,6 @@ public class Phone implements Authorization {
         Assert.assertTrue(data,network.message(params,BasicConfig.WORK_interviewAuditPass,"通过审批失败",response.body().asString()));
     }
 
-    @Test(description = "查询客户阶段信息已更新",priority = 32)
-    public void 查询客户阶段信息已更新(){
-        otosellerAuth();
-        HashMap<String,Object> params = new HashMap<>();
-        params.put("custId", IdMakeUtil.decodingId(cust_id) );
-        Response response = network.getResponse(params,BasicConfig.PHONE_getCustPhase);
-        int custFlow = response.jsonPath().getInt("data.custFlow");
-        int pensionSalary = response.jsonPath().getInt("data.pensionSalary");
-        Assert.assertEquals(custFlow,2,network.message(params,BasicConfig.WORK_callLog,"新客户的客户阶段不为2：认同公司养老解决方案",response.body().asString()));
-        Assert.assertEquals(pensionSalary,1,network.message(params,BasicConfig.WORK_callLog,"理想退休工资错误",response.body().asString()));
-    }
 
     @Test(description = "查看我的面访状态更新为已完成",priority =33)
     public void 查看我的面访状态更新为已完成(){
@@ -597,22 +566,6 @@ public class Phone implements Authorization {
         Assert.assertTrue(success,network.message(params,BasicConfig.PHONE_interviewFeedback,"上传面访失败",response.body().asString()));
     }
 
-    @Test(description = "客户流程组_表格总览更新为当下成交",priority = 42)
-    public void 客户流程组_表格总览更新为当下成交(){
-        otosellerAuth();
-        sleep(2000);
-        Response response = network.getResponse(BasicConfig.WORK_staticChart);
-        int fourStep = response.jsonPath().getInt("data[3].custNum");
-        Assert.assertEquals(fourStep,Work.chart.get("fourStep")+1,network.message(BasicConfig.WORK_staticChart,"客户社区参观后已确认投保要素流程组状态未变为4",response.body().asString()));
-
-        HashMap<String,Object> params = new HashMap<>();
-        params.put("custId", IdMakeUtil.decodingId(cust_id) );
-        response = network.getResponse(params,BasicConfig.PHONE_getCustPhase);
-        int custFlow = response.jsonPath().getInt("data.custFlow");
-        int commitInsure = response.jsonPath().getInt("data.commitInsure");
-        Assert.assertEquals(custFlow,4,network.message(params,BasicConfig.WORK_callLog,"新客户的客户阶段不为4：当下成交",response.body().asString()));
-        Assert.assertEquals(commitInsure,1,network.message(params,BasicConfig.WORK_callLog,"理想退休工资错误",response.body().asString()));
-    }
 
     @Test(description = "修改客户阶段信息",priority = 43)
     public void 修改客户阶段信息(){
@@ -644,22 +597,6 @@ public class Phone implements Authorization {
         Assert.assertTrue(data,network.message(params,BasicConfig.PHONE_updateCustPhase,"修改客户阶段信息失败",response.body().asString()));
     }
 
-    @Test(description = "客户流程组_表格总览更新为已成单",priority = 44)
-    public void 客户流程组_表格总览更新为已成单(){
-        sleep(2000);
-        Response response = network.getResponse(BasicConfig.WORK_staticChart);
-        int fiveStep = response.jsonPath().getInt("data[4].custNum");
-        Assert.assertEquals(fiveStep,Work.chart.get("fiveStep")+1,network.message(BasicConfig.WORK_staticChart,"修改已成交后流程组状态未变为5",response.body().asString()));
-
-        HashMap<String,Object> params = new HashMap<>();
-        params.put("custId", IdMakeUtil.decodingId(cust_id) );
-        response = network.getResponse(params,BasicConfig.PHONE_getCustPhase);
-        int custFlow = response.jsonPath().getInt("data.custFlow");
-        int dealFlag = response.jsonPath().getInt("data.dealFlag");
-        Assert.assertEquals(custFlow,5,network.message(params,BasicConfig.WORK_callLog,"新客户的客户阶段不为5：已成单",response.body().asString()));
-        Assert.assertEquals(dealFlag,1,network.message(params,BasicConfig.WORK_callLog,"是否成交字段错误为否",response.body().asString()));
-    }
-
     @Test(description = "销售任务_销售完成任务",priority = 45)
     public void 销售任务_销售完成任务(){
         //销售完成面访，跟进时间更新，联系新客户任务完成

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

@@ -105,12 +105,12 @@ public class Work implements Authorization {
         Assert.assertTrue(data,network.message(params,BasicConfig.FORM_submitQuestion,"客户填写表单失败",response.body().asString()));
 
 
-//        for(int i = 0;i<10;i++){
+//        for(int i = 50;i<60;i++){
 //            HashMap<String,Object> params = new HashMap<>();
 //            params.put("formId", "Kj20ODA3");
-//            params.put("phoneNum", "1301121005"+i);
+//            params.put("phoneNum", "130112100"+i);
 //            params.put("urlLink", "https://kjj-static.duibatest.com.cn/cpic-home/202111261430?formId=Kj20ODA3&channel=bd&agent=x");
-//            params.put("username", "用户5"+i);
+//            params.put("username", "9月用户"+i);
 //            params.put("uuid", "622d83e4-ca21-4ccd-94cb-182c0f2a6b60");
 //            Response response = network.postResponse(params,BasicConfig.FORM_submit);
 //            String recordId = response.jsonPath().getString("data.recordId");
@@ -150,7 +150,7 @@ public class Work implements Authorization {
         boolean data = response.jsonPath().getBoolean("data");
         Assert.assertTrue(data,network.message(params,BasicConfig.MANAGER_oto_assignSeller,"销售相同产品组分配客户失败",response.body().asString()));
 
-//        for(int i = 6028;i<6035;i++){
+//        for(int i = 6104;i<6204;i++){
 //            HashMap<String,Object> params = new HashMap<>();
 //            params.put("customerId",i);
 //            params.put("sellerId", 2);
@@ -274,11 +274,9 @@ public class Work implements Authorization {
         params.put("custId", custId);
         Response response = network.getResponse(params,BasicConfig.WORK_detail);
         Object custInfo = response.jsonPath().getJsonObject("data.custInfo");
-        int custFlow = response.jsonPath().getInt("data.custInfo.custFlow");
         Object formInfo = response.jsonPath().getJsonObject("data.formInfo");
         Assert.assertNotNull(custInfo,network.message(params,BasicConfig.WORK_detail,"新客户提交计划书状态错误非0",response.body().asString()));
         Assert.assertNotNull(formInfo,network.message(params,BasicConfig.WORK_detail,"新客户投保要素确认状态错误非0",response.body().asString()));
-        Assert.assertEquals(custFlow,1,network.message(params,BasicConfig.WORK_detail,"客户阶段不为1：具备机构养老理念",response.body().asString()));
     }
 
     @Test(description = "查询客户电话表单回填状态",priority = 17)
@@ -312,9 +310,7 @@ public class Work implements Authorization {
         HashMap<String,Object> params = new HashMap<>();
         params.put("custId", custId);
         Response response = network.getResponse(params,BasicConfig.PHONE_getCustPhase);
-        int custFlow = response.jsonPath().getInt("data.custFlow");
         int commitPlanFlag = response.jsonPath().getInt("data.commitPlanFlag");
-        Assert.assertEquals(custFlow,1,network.message(params,BasicConfig.PHONE_getCustPhase,"新客户的客户阶段不为1：具备机构养老理念",response.body().asString()));
         Assert.assertEquals(commitPlanFlag,0,network.message(params,BasicConfig.PHONE_getCustPhase,"是否提交计划书不为否",response.body().asString()));
     }
 
@@ -852,10 +848,8 @@ public class Work implements Authorization {
         HashMap<String,Object> params = new HashMap<>();
         params.put("custId", custId);
         Response response = network.getResponse(params,BasicConfig.WORK_header);
-        Object custValue = response.jsonPath().getJsonObject("data.custValue");
         Object followWeight = response.jsonPath().getJsonObject("data.followWeight");
-        Assert.assertNull(custValue,network.message(params,BasicConfig.WORK_header,"客户价值未清空",response.body().asString()));
-        Assert.assertNull(followWeight,network.message(params,BasicConfig.WORK_header,"客户权重未清空",response.body().asString()));
+        Assert.assertNotNull(followWeight,network.message(params,BasicConfig.WORK_header,"客户权重未清空",response.body().asString()));
     }
 
     @Test(description = "总监查看名下销售列表",priority = 72)
@@ -1117,12 +1111,10 @@ public class Work implements Authorization {
     public void 新增见面场景(){
         otoManagerAuth();
         int companyIds[] = {1,5};
-        int custFlows[] = {1,2};
 
         HashMap<String,Object> params = new HashMap<>();
         params.put("confUsable",0);
         params.put("companyIds",companyIds);
-        params.put("custFlows",custFlows);
         params.put("sceneName","勿动-自动化场景");
         params.put("sceneDesc","勿动，这是自动化测试专用的面访场景");
         Response response =network.postResponse(params,BasicConfig.PHONE_custConfSave);
@@ -1225,6 +1217,15 @@ public class Work implements Authorization {
         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", phone);
+        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 = 97)

src/test/workTestNG.xml

@@ -18,11 +18,11 @@
         </classes>
     </test>
 
-    <test preserve-order="true" name="久久保人管系统">
-        <classes>
-            <class name="com.oto.cases.otoseller.JiuJiuBao"/>
-        </classes>
-    </test>
+<!--    <test preserve-order="true" name="久久保人管系统">-->
+<!--        <classes>-->
+<!--            <class name="com.oto.cases.otoseller.JiuJiuBao"/>-->
+<!--        </classes>-->
+<!--    </test>-->
 
 </suite>
         <!-- Suite -->