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

删除客户阶段

See merge request !26

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 -->