Merge branch 'feafture/20220509-gxh' into 'master'

增加OTO销售工作台移动端1.1的测试用例

See merge request test-group/kejiji!252

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

 package com.kjj.cases.otoseller;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.kjj.cases.admin.Authorization;
 import com.kjj.config.BasicConfig;
 import com.kjj.sql.KjyLiveNormalDB;
-import com.kjj.sql.KjyUserDB;
 import com.kjj.sql.UserSqlFactory;
 import com.kjj.utils.IdMakeUtil;
 import com.kjj.utils.NetworkUtils;
@@ -30,6 +27,7 @@ public class Phone implements Authorization {
     private String introduceCustomer_id;
     private String myselfCustomer_id;
     private long productId = 19;
+    private int businessId;
     private ArrayList ids;
     private ArrayList<String> interviewIds;
     private Object scanCodeId;
@@ -135,7 +133,29 @@ public class Phone implements Authorization {
         Assert.assertEquals(statusCount,3,network.message(params,BasicConfig.PHONE_interviewCode,"面访码数量错误",response.body().asString()));
     }
 
-    @Test(description = "已存在未结束的普通面访后创建普通面访失败",priority = 9)
+    @Test(description = "上传地理位置",priority = 9)
+    public void 上传地理位置(){
+        HashMap<String,Object> params = new HashMap<>();
+        params.put("latitude", 30.287816);
+        params.put("longitude", 120.111991);
+        params.put("id", interviewIds.get(0));
+        Response response = network.postResponse(params, BasicConfig.PHONE_address);
+        boolean data = response.jsonPath().getBoolean("data");
+        Assert.assertTrue(data,network.message(params,BasicConfig.PHONE_customerSave,"上传地理位置失败",response.body().asString()));
+    }
+
+    @Test(description = "销售查询面访状态",priority = 10)
+    public void 销售查询面访状态() {
+        sleep(1000);
+
+        HashMap<String,Object> params = new HashMap<>();
+        params.put("id", interviewIds.get(0));
+        Response response = network.getResponse(params, BasicConfig.PHONE_interviewStatus);
+        int interviewStatus = response.jsonPath().getInt("data.interviewStatus");
+        Assert.assertEquals(interviewStatus,1,network.message(params,BasicConfig.PHONE_interviewStatus,"面访状态错误：非未授权",response.body().asString()));
+    }
+
+    @Test(description = "已存在未结束的普通面访后创建普通面访失败",priority = 11)
     public void 已存在未结束的社区面访后创建社区面访失败(){
         HashMap<String,Object> params = new HashMap<>();
         params.put("custIds", ids);
@@ -146,8 +166,8 @@ public class Phone implements Authorization {
         Assert.assertFalse(success,network.message(params,BasicConfig.PHONE_interviewSave,"存在未结束普通面访时创建普通面访成功",response.body().asString()));
     }
 
-    @Test(description = "查询面访详情",priority = 10)
-    public void 查询面访详情(){
+    @Test(description = "发起面访时查询面访详情",priority = 12)
+    public void 发起面访时查询面访详情(){
         HashMap<String,Object> params = new HashMap<>();
         params.put("custId", cust_id);
         params.put("interviewType", 2);
@@ -158,7 +178,16 @@ public class Phone implements Authorization {
         Assert.assertEquals(id, interviewIds.get(0),network.message(params,BasicConfig.PHONE_appointmentDetail,"查询面访详情的id错误",response.body().asString()));
     }
 
-    @Test(description = "修改面访时间",priority = 11)
+    @Test(description = "修改面访时查询面访详情",priority = 13)
+    public void 修改面访时查询面访详情(){
+        HashMap<String,Object> params = new HashMap<>();
+        params.put("id", interviewIds.get(0));
+        Response response = network.getResponse(params, BasicConfig.PHONE_interviewDetail);
+        String customerName = response.jsonPath().getString("data.custName");
+        Assert.assertEquals(customerName,custName,network.message(params,BasicConfig.PHONE_interviewDetail,"查询面访详情的客户姓名错误",response.body().asString()));
+    }
+
+    @Test(description = "修改面访时间",priority = 14)
     public void 修改面访时间(){
         HashMap<String,Object> params = new HashMap<>();
         params.put("id", interviewIds.get(0));
@@ -168,107 +197,61 @@ public class Phone implements Authorization {
         Assert.assertTrue(data,network.message(params,BasicConfig.PHONE_interviewUpdate,"修改社区时间失败",response.body().asString()));
     }
 
-    @Test(description = "扫码绑定微信用户并评价",priority = 12)
-    public void 扫码绑定微信用户() throws SQLException {
+    @Test(description = "授权失败",priority = 15)
+    public void 授权失败() throws SQLException {
         agentTku();
 
         Map<String, Object> result = KjyLiveNormalDB.getInstance().findSimpleResult(UserSqlFactory.selectCodeIdByCustomerId, IdMakeUtil.decodingId(cust_id));
         scanCodeId = result.get("scan_code_id");
-        scanCode(IdMakeUtil.encodingId((Long) scanCodeId));
-    }
-
-    @Test(description = "销售查询面访状态",priority = 13)
-    public void 销售查询面访状态() {
-        sleep(2000);
-        otoSellerTku();
-
-        HashMap<String,Object> params = new HashMap<>();
-        params.put("latitude", 30.287816);
-        params.put("longitude", 120.111991);
-        params.put("id", interviewIds.get(0));
-        Response response = network.postResponse(params, BasicConfig.PHONE_interviewStatus);
-        int interviewStatus = response.jsonPath().getInt("data.interviewStatus");
-        boolean isMatching = response.jsonPath().getBoolean("data.isMatching");
-        Assert.assertEquals(interviewStatus,3,network.message(params,BasicConfig.PHONE_interviewStatus,"面访状态错误：非待上传",response.body().asString()));
-        Assert.assertFalse(isMatching,network.message(params,BasicConfig.PHONE_interviewStatus,"手机号匹配状态错误：非不匹配",response.body().asString()));
-    }
 
-    @Test(description = "销售查询客户授权手机号",priority = 15)
-    public void 销售查询客户授权手机号() {
         HashMap<String,Object> params = new HashMap<>();
-        params.put("id", interviewIds.get(0));
-        Response response = network.getResponse(params, BasicConfig.PHONE_interviewPhone);
-        String authPhone = response.jsonPath().getString("data.authPhone");
-        boolean isMatching = response.jsonPath().getBoolean("data.isMatching");
-        Assert.assertNotNull(authPhone,network.message(params,BasicConfig.PHONE_interviewPhone,"获取的系统手机号为空",response.body().asString()));
-        Assert.assertFalse(isMatching,network.message(params,BasicConfig.PHONE_interviewPhone,"手机号匹配状态错误：非不匹配",response.body().asString()));
-    }
-
-    @Test(description = "销售取消关联手机号",priority = 16)
-    public void 销售取消关联手机号() {
-        HashMap<String,Object> params = new HashMap<>();
-        params.put("id", interviewIds.get(0));
-        Response response = network.postResponse(params, BasicConfig.PHONE_bindCancel);
+        params.put("scanCodeId", IdMakeUtil.encodingId((Long) scanCodeId));
+        params.put("scanCodeType", 1048);
+        Response response = network.postResponse(params, BasicConfig.PHONE_fail);
         boolean data = response.jsonPath().getBoolean("data");
-        Assert.assertTrue(data,network.message(params,BasicConfig.PHONE_bindCancel,"取消关联手机号失败",response.body().asString()));
+        Assert.assertTrue(data,network.message(params,BasicConfig.PHONE_fail,"授权失败接口错误",response.body().asString()));
     }
 
-    @Test(description = "销售再次查询面访状态",priority = 17)
-    public void 销售再次查询面访状态() {
-        sleep(2000);
+    @Test(description = "销售查询面访状态更新为授权失败",priority = 16)
+    public void 销售查询面访状态更新为授权失败() {
+        sleep(1000);
         otoSellerTku();
 
         HashMap<String,Object> params = new HashMap<>();
-        params.put("latitude", 30.287816);
-        params.put("longitude", 120.111991);
         params.put("id", interviewIds.get(0));
-        Response response = network.postResponse(params, BasicConfig.PHONE_interviewStatus);
+        Response response = network.getResponse(params, BasicConfig.PHONE_interviewStatus);
         int interviewStatus = response.jsonPath().getInt("data.interviewStatus");
-        Assert.assertEquals(interviewStatus,1,network.message(params,BasicConfig.PHONE_interviewStatus,"扫码评价失败",response.body().asString()));
+        Assert.assertEquals(interviewStatus,5,network.message(params,BasicConfig.PHONE_interviewStatus,"面访状态错误：非未授权",response.body().asString()));
     }
 
-    @Test(description = "客户重新扫码进行评价",priority = 18)
-    public void 客户重新扫码进行评价() throws SQLException {
+    @Test(description = "非面对面扫码并评价",priority = 17)
+    public void 扫码绑定微信用户(){
         agentTku();
-        scanCode(IdMakeUtil.encodingId((Long) scanCodeId));
+        scanCode(IdMakeUtil.encodingId((Long) scanCodeId),1048);
     }
 
-    @Test(description = "销售查询更新面访状态",priority = 19)
-    public void 销售查询更新面访状态() {
+    @Test(description = "销售查询面访状态更新为待上传",priority = 18)
+    public void 销售查询面访状态更新为待上传() {
         sleep(2000);
         otoSellerTku();
 
         HashMap<String,Object> params = new HashMap<>();
-        params.put("latitude", 30.287816);
-        params.put("longitude", 120.111991);
         params.put("id", interviewIds.get(0));
-        Response response = network.postResponse(params, BasicConfig.PHONE_interviewStatus);
+        Response response = network.getResponse(params, BasicConfig.PHONE_interviewStatus);
         int interviewStatus = response.jsonPath().getInt("data.interviewStatus");
-        Assert.assertEquals(interviewStatus,3,network.message(params,BasicConfig.PHONE_interviewStatus,"面访状态错误：非待上传",response.body().asString()));
+        Assert.assertEquals(interviewStatus,3,network.message(params,BasicConfig.PHONE_interviewStatus,"扫码评价失败",response.body().asString()));
     }
 
-    @Test(description = "销售确定关联手机号",priority = 20)
-    public void 销售确定关联手机号() {
+    @Test(description = "查询面访异常类型",priority = 19)
+    public void 查询面访异常类型(){
         HashMap<String,Object> params = new HashMap<>();
         params.put("id", interviewIds.get(0));
-        Response response = network.postResponse(params, BasicConfig.PHONE_interviewBind);
-        boolean data = response.jsonPath().getBoolean("data");
-        Assert.assertTrue(data,network.message(params,BasicConfig.PHONE_interviewBind,"确定关联失败",response.body().asString()));
-    }
-
-    @Test(description = "查看我的面访",priority = 21)
-    public void 查看我的面访(){
-        HashMap<String,Object> params = new HashMap<>();
-        params.put("custName", "自动化测试用户");
-        params.put("pageSize", "20");
-        Response response = network.getResponse(params, BasicConfig.PHONE_interviewList);
-        int size = response.jsonPath().getInt("data.customerInterviewVos.size()");
-        int interviewStatus = response.jsonPath().getInt("data.customerInterviewVos[0].interviewStatus");
-        Assert.assertEquals(size,1,network.message(params,BasicConfig.PHONE_interviewList,"面访列表为空",response.body().asString()));
-        Assert.assertEquals(interviewStatus,3,network.message(params,BasicConfig.PHONE_interviewList,"面访列表为空",response.body().asString()));
+        Response response = network.getResponse(params, BasicConfig.PHONE_getUnusualTypes);
+        int size = response.jsonPath().getInt("data.size()");
+        Assert.assertEquals(size,2,network.message(params,BasicConfig.PHONE_getUnusualTypes,"面访异常错误",response.body().asString()));
     }
 
-    @Test(description = "查询面访回填信息",priority = 22)
+    @Test(description = "查询面访回填信息",priority = 20)
     public void 查询面访回填信息(){
         HashMap<String,Object> params = new HashMap<>();
         params.put("id", interviewIds.get(0));
@@ -279,26 +262,202 @@ public class Phone implements Authorization {
         Assert.assertEquals(commitPlanFlag,0,network.message(params,BasicConfig.PHONE_custExtDetail,"面访列表为空",response.body().asString()));
     }
 
-    @Test(description = "上传社区面访详情",priority = 23)
+    @Test(description = "上传社区面访详情",priority = 21)
     public void 上传社区面访详情(){
         HashMap<String,Object> params = new HashMap<>();
+        ArrayList unusualTypes = new ArrayList();
+        unusualTypes.add(1);
+        unusualTypes.add(2);
+        ArrayList unusualProofs = new ArrayList();
+        unusualProofs.add("https://yun.dui88.com/kjy/image/20220506/ecf1d585e2e040ad97ec7996ce5bf2a3.jpg");
+        unusualProofs.add("https://yun.dui88.com/kjy/image/20220505/62cc0df86ed7430ea67d5015ee3fcc2b.jpg");
         params.put("id", interviewIds.get(0));
         params.put("interviewRemark", "第一次社区参观");
         params.put("coreMaker", 2);
         params.put("followWeight", 1);
         params.put("commitPlanFlag", 0);
+        params.put("commitInsure", 0);
+        params.put("commitCustStatus", 2);
+        params.put("isNormal", false);
+        params.put("insureReason", "未确认投保要素说明");
+        params.put("unusualTypes", unusualTypes);
+        params.put("unusualExplain", "手机号不一致且非面对面扫码的情况说明");
+        params.put("unusualProofs", unusualProofs);
         Response response = network.postResponse(params, BasicConfig.PHONE_interviewFeedback);
         boolean success = response.jsonPath().getBoolean("success");
-        Assert.assertTrue(success,network.message(params,BasicConfig.WORK_delCust,"上传面访失败",response.body().asString()));
+        Assert.assertTrue(success,network.message(params,BasicConfig.PHONE_interviewFeedback,"上传面访失败",response.body().asString()));
+    }
+
+    @Test(description = "查看面访详情",priority = 22)
+    public void 查看面访详情(){
+        sleep(1000);
+        HashMap<String,Object> params = new HashMap<>();
+        params.put("id", interviewIds.get(0));
+        Response response = network.getResponse(params, BasicConfig.PHONE_feedbackDetail);
+        int followWeight = response.jsonPath().getInt("data.followWeight");
+        int commitPlanFlag = response.jsonPath().getInt("data.commitPlanFlag");
+        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(commitPlanFlag,0,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()));
+    }
+
+    @Test(description = "查看我的面访状态更新为审批中",priority = 23)
+    public void 查看我的面访状态更新为审批中(){
+        HashMap<String,Object> params = new HashMap<>();
+        params.put("custName", "自动化测试用户");
+        params.put("pageSize", "20");
+        Response response = network.getResponse(params, BasicConfig.PHONE_interviewList);
+        int size = response.jsonPath().getInt("data.customerInterviewVos.size()");
+        int interviewStatus = response.jsonPath().getInt("data.customerInterviewVos.find{it.id == '"+  interviewIds.get(0) +"'}.interviewStatus");
+        Assert.assertEquals(size,1,network.message(params,BasicConfig.PHONE_interviewList,"面访列表为空",response.body().asString()));
+        Assert.assertEquals(interviewStatus,6,network.message(params,BasicConfig.PHONE_interviewList,"面访状态错误",response.body().asString()));
+    }
+
+    @Test(description = "总监查看审批列表",priority = 24)
+    public void 总监查看审批列表(){
+        otoLeaderAuth();
+
+        HashMap<String,Object> params = new HashMap<>();
+        params.put("pageIndex",1);
+        params.put("pageSize",20);
+        params.put("auditState",1);
+        Response response =network.getResponse(params,BasicConfig.WORK_interviewAuditList);
+        int size = response.jsonPath().getInt("data.list.size()");
+        int unusualTypes = response.jsonPath().getInt("data.list[0].unusualTypes.size()");
+        String sellerName = response.jsonPath().getString("data.list[0].sellerName");
+        Assert.assertTrue(size>0,network.message(BasicConfig.WORK_interviewAuditList,"待审批列表为空",response.body().asString()));
+        Assert.assertEquals(unusualTypes,2,network.message(BasicConfig.WORK_interviewAuditList,"面访异常错误",response.body().asString()));
+        Assert.assertEquals(sellerName,"勿动-自动化测试销售",network.message(BasicConfig.WORK_interviewAuditList,"销售名称错误",response.body().asString()));
+        businessId = response.jsonPath().getInt("data.list[0].businessId");
+    }
+
+    @Test(description = "总监驳回审批",priority = 25)
+    public void 总监驳回审批(){
+        otoLeaderAuth();
+
+        HashMap<String,Object> params = new HashMap<>();
+        params.put("businessId",businessId);
+        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()));
+    }
+
+    @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.WORK_detail);
+        int custFlow = response.jsonPath().getInt("data.custInfo.custFlow");
+        int commitPlanFlag = response.jsonPath().getInt("data.custInfo.commitPlanFlag");
+        Assert.assertEquals(custFlow,1,network.message(params,BasicConfig.WORK_detail,"新客户流程组状态错误非1",response.body().asString()));
+        Assert.assertEquals(commitPlanFlag,0,network.message(params,BasicConfig.WORK_detail,"新客户投保要素确认状态错误非0",response.body().asString()));
     }
 
-    @Test(description = "取消面访",priority = 24)
+    @Test(description = "查看我的面访状态更新为已失效",priority = 27)
+    public void 查看我的面访状态更新为已失效(){
+        HashMap<String,Object> params = new HashMap<>();
+        params.put("custName", "自动化测试用户");
+        params.put("pageSize", "20");
+        Response response = network.getResponse(params, BasicConfig.PHONE_interviewList);
+        int interviewStatus = response.jsonPath().getInt("data.customerInterviewVos.find{it.id == '"+  interviewIds.get(0) +"'}.interviewStatus");
+        Assert.assertEquals(interviewStatus,7,network.message(params,BasicConfig.PHONE_interviewList,"面访状态错误",response.body().asString()));
+    }
+
+    @Test(description = "取消面访",priority = 28)
     public void 取消面访(){
         interviewCancle(interviewIds.get(1));
         interviewCancle(interviewIds.get(2));
     }
 
-    @Test(description = "客户流程组_表格总览",priority = 25)
+    @Test(description = "客户再次创建面访并扫码评价",priority = 29)
+    public void 客户再次创建面访并扫码评价() throws SQLException {
+        otoSellerTku();
+        HashMap<String,Object> params = new HashMap<>();
+        ids = new ArrayList();
+        ids.add(cust_id);
+        params.put("custIds", ids);
+        params.put("interviewType", 2);
+        params.put("appointmentTime", System.currentTimeMillis()+3600000);
+        Response response = network.postResponse(params, BasicConfig.PHONE_interviewSave);
+        interviewIds.clear();
+        interviewIds.add(response.jsonPath().getString("data[0]"));
+
+        agentTku();
+        Map<String, Object> result = KjyLiveNormalDB.getInstance().findSimpleResult(UserSqlFactory.selectCodeIdByCustomerId, IdMakeUtil.decodingId(cust_id));
+        scanCodeId = result.get("scan_code_id");
+        System.out.println(scanCodeId);
+        scanCode(IdMakeUtil.encodingId((Long) scanCodeId),1047);
+    }
+
+    @Test(description = "销售上传社区面访",priority = 30)
+    public void 销售上传社区面访(){
+        otoSellerTku();
+        HashMap<String,Object> params = new HashMap<>();
+        ArrayList unusualTypes = new ArrayList();
+        unusualTypes.add(2);
+        ArrayList unusualProofs = new ArrayList();
+        unusualProofs.add("https://yun.dui88.com/kjy/image/20220506/ecf1d585e2e040ad97ec7996ce5bf2a3.jpg");
+        params.put("id", interviewIds.get(0));
+        params.put("interviewRemark", "第一次社区参观");
+        params.put("coreMaker", 2);
+        params.put("followWeight", 1);
+        params.put("commitPlanFlag", 0);
+        params.put("isNormal", false);
+        params.put("unusualTypes", unusualTypes);
+        params.put("unusualExplain", "手机号不一致的情况说明");
+        params.put("unusualProofs", unusualProofs);
+        Response response = network.postResponse(params, BasicConfig.PHONE_interviewFeedback);
+        boolean success = response.jsonPath().getBoolean("success");
+        Assert.assertTrue(success,network.message(params,BasicConfig.PHONE_interviewFeedback,"上传面访失败",response.body().asString()));
+    }
+
+    @Test(description = "总监通过审批",priority = 31)
+    public void 总监通过审批(){
+        otoLeaderAuth();
+
+        HashMap<String,Object> params = new HashMap<>();
+        params.put("pageIndex",1);
+        params.put("pageSize",20);
+        params.put("auditState",1);
+        Response response =network.getResponse(params,BasicConfig.WORK_interviewAuditList);
+        int size = response.jsonPath().getInt("data.list.size()");
+        Assert.assertTrue(size>0,network.message(BasicConfig.WORK_interviewAuditList,"待审批列表为空",response.body().asString()));
+        businessId = response.jsonPath().getInt("data.list[0].businessId");
+
+        params.clear();
+        params.put("businessId",businessId);
+        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()));
+    }
+
+    @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.WORK_detail);
+        int custFlow = response.jsonPath().getInt("data.custInfo.custFlow");
+        int commitPlanFlag = response.jsonPath().getInt("data.custInfo.commitPlanFlag");
+        Assert.assertEquals(custFlow,2,network.message(params,BasicConfig.WORK_detail,"新客户流程组状态错误非1",response.body().asString()));
+        Assert.assertEquals(commitPlanFlag,0,network.message(params,BasicConfig.WORK_detail,"新客户投保要素确认状态错误非0",response.body().asString()));
+    }
+
+    @Test(description = "查看我的面访状态更新为已完成",priority =33)
+    public void 查看我的面访状态更新为已完成(){
+        HashMap<String,Object> params = new HashMap<>();
+        params.put("custName", "自动化测试用户");
+        params.put("pageSize", "20");
+        Response response = network.getResponse(params, BasicConfig.PHONE_interviewList);
+        int interviewStatus = response.jsonPath().getInt("data.customerInterviewVos.find{it.id == '"+  interviewIds.get(0) +"'}.interviewStatus");
+        Assert.assertEquals(interviewStatus,4,network.message(params,BasicConfig.PHONE_interviewList,"面访状态错误",response.body().asString()));
+    }
+
+    @Test(description = "客户流程组_表格总览",priority = 34)
     public void 客户流程组_表格总览(){
         otosellerAuth();
         Response response = network.getResponse(BasicConfig.WORK_staticChart);
@@ -308,7 +467,7 @@ public class Phone implements Authorization {
         Assert.assertEquals(twoStep,Work.chart.get("twoStep")+1,network.message(BasicConfig.WORK_staticChart,"客户社区参观后未提交计划书流程组状态未变为2",response.body().asString()));
     }
 
-    @Test(description = "创建普通面访",priority = 26)
+    @Test(description = "创建普通面访",priority = 35)
     public void 创建普通面访(){
         otoSellerTku();
         HashMap<String,Object> params = new HashMap<>();
@@ -323,44 +482,35 @@ public class Phone implements Authorization {
         interviewIds.add(response.jsonPath().getString("data[0]"));
     }
 
-    @Test(description = "客户完成普通面访并扫码",priority = 27)
+    @Test(description = "客户完成普通面访并扫码",priority = 36)
     public void 客户完成普通面访并扫码() throws SQLException {
         agentTku();
         Map<String, Object> result = KjyLiveNormalDB.getInstance().findSimpleResult(UserSqlFactory.selectCodeIdByCustomerId, IdMakeUtil.decodingId(cust_id));
         scanCodeId = result.get("scan_code_id");
         System.out.println(scanCodeId);
-        scanCode(IdMakeUtil.encodingId((Long) scanCodeId));
+        scanCode(IdMakeUtil.encodingId((Long) scanCodeId),1047);
     }
 
 
-    @Test(description = "销售查询客户授权手机号与关联手机号一致",priority = 28)
-    public void 销售查询客户授权手机号与关联手机号一致() {
-        sleep(2000);
+    @Test(description = "二次正常扫码面访异常类型为空",priority = 37)
+    public void 二次正常扫码面访异常类型为空(){
         otoSellerTku();
-
         HashMap<String,Object> params = new HashMap<>();
-        params.put("latitude", 30.287816);
-        params.put("longitude", 120.111991);
         params.put("id", interviewIds.get(0));
-        Response response = network.postResponse(params, BasicConfig.PHONE_interviewStatus);
-        int interviewStatus = response.jsonPath().getInt("data.interviewStatus");
-        boolean isMatching = response.jsonPath().getBoolean("data.isMatching");
-        Assert.assertEquals(interviewStatus,3,network.message(params,BasicConfig.PHONE_interviewStatus,"面访状态错误：非待上传",response.body().asString()));
-//        Assert.assertTrue(isMatching,network.message(params,BasicConfig.PHONE_interviewStatus,"手机号匹配状态错误：非匹配",response.body().asString()));
-
+        Response response = network.getResponse(params, BasicConfig.PHONE_getUnusualTypes);
+        int size = response.jsonPath().getInt("data.size()");
+        Assert.assertEquals(size,0,network.message(params,BasicConfig.PHONE_getUnusualTypes,"面访异常错误",response.body().asString()));
     }
 
-    @Test(description = "查看公司产品列表",priority = 29)
+    @Test(description = "查看公司产品列表",priority = 38)
     public void 查看公司产品列表() {
-        otoSellerTku();
-
         String encodeProductId = IdMakeUtil.encodingId(productId);
         Response response = network.getResponse(BasicConfig.PHONE_listBysellComp);
         int size = response.jsonPath().getInt("data.findAll{it.id == '"+encodeProductId+"'}.size()");
         Assert.assertEquals(size,1,network.message(BasicConfig.PHONE_listBysellComp,"产品列表未包含已上架产品",response.body().asString()));
     }
 
-    @Test(description = "下架公司产品",priority = 30)
+    @Test(description = "下架公司产品",priority = 39)
     public void 下架公司产品() {
         ssoLogin();
         HashMap<String,Object> params = new HashMap<>();
@@ -370,7 +520,7 @@ public class Phone implements Authorization {
         Assert.assertTrue(data,network.message(params,BasicConfig.MANAGER_oto_productUpdateStatus,"下架公司产品失败",response.body().asString()));
     }
 
-    @Test(description = "产品下架后公司产品列表不显示",priority = 31)
+    @Test(description = "产品下架后公司产品列表不显示",priority = 40)
     public void 产品下架后公司产品列表不显示() {
         otoSellerTku();
 
@@ -385,7 +535,7 @@ public class Phone implements Authorization {
         boolean data = response.jsonPath().getBoolean("data");
     }
 
-    @Test(description = "上传普通面访详情",priority = 32)
+    @Test(description = "上传普通面访详情",priority = 41)
     public void 上传普通面访详情(){
         HashMap<String,Object> params = new HashMap<>();
         params.put("id", interviewIds.get(0));
@@ -400,12 +550,13 @@ public class Phone implements Authorization {
         params.put("insByApplicant", 1);
         params.put("insPeriod", 3);
         params.put("insMoney", 3);
+        params.put("isNormal", true);
         Response response = network.postResponse(params, BasicConfig.PHONE_interviewFeedback);
         boolean success = response.jsonPath().getBoolean("success");
         Assert.assertTrue(success,network.message(params,BasicConfig.WORK_delCust,"上传面访失败",response.body().asString()));
     }
 
-    @Test(description = "客户流程组_表格总览更新为当下成交",priority = 33)
+    @Test(description = "客户流程组_表格总览更新为当下成交",priority = 42)
     public void 客户流程组_表格总览更新为当下成交(){
         otosellerAuth();
         sleep(2000);
@@ -424,7 +575,7 @@ public class Phone implements Authorization {
         Assert.assertEquals(commitPlanFlag,1,network.message(params,BasicConfig.WORK_detail,"新客户投保要素确认状态错误非0",response.body().asString()));
     }
 
-    @Test(description = "修改客户基础信息",priority = 34)
+    @Test(description = "修改客户基础信息",priority = 43)
     public void 修改客户基础信息(){
         HashMap<String,Object> params = new HashMap<>();
         ArrayList<Integer> array = new ArrayList<>();
@@ -437,7 +588,7 @@ public class Phone implements Authorization {
         Assert.assertTrue(data,network.message(params,BasicConfig.WORK_edit,"修改客户基础信息失败",response.body().asString()));
     }
 
-    @Test(description = "客户流程组_表格总览更新为已成单",priority = 35)
+    @Test(description = "客户流程组_表格总览更新为已成单",priority = 44)
     public void 客户流程组_表格总览更新为已成单(){
         sleep(2000);
         Response response = network.getResponse(BasicConfig.WORK_staticChart);
@@ -456,48 +607,49 @@ public class Phone implements Authorization {
     }
 
 
-    @Test(description = "删除客户",priority = 79)
-    public void 删除客户(){
-        HashMap<String,Object> params = new HashMap<>();
-        params.put("custId", IdMakeUtil.decodingId(cust_id));
-        Response response = network.postResponse(params,BasicConfig.WORK_delCust);
-        boolean data = response.jsonPath().getBoolean("data");
-        Assert.assertTrue(data,network.message(params,BasicConfig.WORK_delCust,"删除客户失败",response.body().asString()));
-
-        params.put("custId", IdMakeUtil.decodingId(introduceCustomer_id));
-        response = network.postResponse(params,BasicConfig.WORK_delCust);
-        data = response.jsonPath().getBoolean("data");
-        Assert.assertTrue(data,network.message(params,BasicConfig.WORK_delCust,"删除客户失败",response.body().asString()));
 
-        params.put("custId", IdMakeUtil.decodingId(myselfCustomer_id));
-        response = network.postResponse(params,BasicConfig.WORK_delCust);
-        data = response.jsonPath().getBoolean("data");
-        Assert.assertTrue(data,network.message(params,BasicConfig.WORK_delCust,"删除客户失败",response.body().asString()));
-    }
-
-    @Test(description = "退出登录",priority = 80)
+//    @Test(description = "删除客户",priority = 79)
+//    public void 删除客户(){
+//        HashMap<String,Object> params = new HashMap<>();
+//        params.put("custId", IdMakeUtil.decodingId(cust_id));
+//        Response response = network.postResponse(params,BasicConfig.WORK_delCust);
+//        boolean data = response.jsonPath().getBoolean("data");
+//        Assert.assertTrue(data,network.message(params,BasicConfig.WORK_delCust,"删除客户失败",response.body().asString()));
+//
+//        params.put("custId", IdMakeUtil.decodingId(introduceCustomer_id));
+//        response = network.postResponse(params,BasicConfig.WORK_delCust);
+//        data = response.jsonPath().getBoolean("data");
+//        Assert.assertTrue(data,network.message(params,BasicConfig.WORK_delCust,"删除客户失败",response.body().asString()));
+//
+//        params.put("custId", IdMakeUtil.decodingId(myselfCustomer_id));
+//        response = network.postResponse(params,BasicConfig.WORK_delCust);
+//        data = response.jsonPath().getBoolean("data");
+//        Assert.assertTrue(data,network.message(params,BasicConfig.WORK_delCust,"删除客户失败",response.body().asString()));
+//    }
+//
+//    @Test(description = "删除客户填写的表单记录",priority = 80)
+//    public void 删除客户填写的表单记录(){
+//        HashMap<String,Object> params = new HashMap<>();
+//        params.put("phoneNum", "17830855590");
+//        Response response = network.postResponse(params,BasicConfig.WORK_delPubFormRecord);
+//        boolean data = response.jsonPath().getBoolean("data");
+//        Assert.assertTrue(data,network.message(params,BasicConfig.WORK_delPubFormRecord,"删除客户表单记录失败",response.body().asString()));
+//    }
+
+    @Test(description = "退出登录",priority = 81)
     public void 退出登录(){
         Response response = network.postResponse(BasicConfig.WORK_logout);
         boolean data = response.jsonPath().getBoolean("data");
         Assert.assertTrue(data,network.message(BasicConfig.WORK_logout,"退出登录失败",response.body().asString()));
     }
 
-    public void scanCode(String scanCodeId) {
+    public void scanCode(String scanCodeId,int scanCodeType) {
         HashMap<String,Object> params = new HashMap<>();
         params.put("scanCodeId", scanCodeId);
-        params.put("scanCodeType", 1047);
+        params.put("scanCodeType", scanCodeType);
         Response response = network.postResponse(params, BasicConfig.PHONE_bindWxUser);
         boolean data = response.jsonPath().getBoolean("data");
         Assert.assertTrue(data,network.message(params,BasicConfig.PHONE_bindWxUser,"扫码绑定失败",response.body().asString()));
-
-        ArrayList evaluateDetail = new ArrayList();
-        evaluateDetail.add(2);
-        evaluateDetail.add(3);
-        params.put("scanCodeId", scanCodeId);
-        params.put("evaluateDetail", evaluateDetail);
-        response = network.postResponse(params, BasicConfig.PHONE_submitEvaluate);
-        data = response.jsonPath().getBoolean("data");
-        Assert.assertTrue(data,network.message(params,BasicConfig.PHONE_submitEvaluate,"扫码评价失败",response.body().asString()));
     }
 
     public void interviewCancle(String interviewId){

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

@@ -246,7 +246,7 @@ public class Work implements Authorization {
         int custFlow = response.jsonPath().getInt("data.custInfo.custFlow");
         int commitInsure = response.jsonPath().getInt("data.custInfo.commitInsure");
         int commitPlanFlag = response.jsonPath().getInt("data.custInfo.commitPlanFlag");
-        Assert.assertEquals(custFlow,1,network.message(params,BasicConfig.WORK_detail,"新客户流程组状态错误非0",response.body().asString()));
+        Assert.assertEquals(custFlow,1,network.message(params,BasicConfig.WORK_detail,"新客户流程组状态错误非1",response.body().asString()));
         Assert.assertEquals(commitInsure,0,network.message(params,BasicConfig.WORK_detail,"新客户提交计划书状态错误非0",response.body().asString()));
         Assert.assertEquals(commitPlanFlag,0,network.message(params,BasicConfig.WORK_detail,"新客户投保要素确认状态错误非0",response.body().asString()));
     }
@@ -416,7 +416,7 @@ public class Work implements Authorization {
         params.put("custName", "自动化");
         Response response = network.getResponse(params,BasicConfig.WORK_fuzzyCustName);
         int size = response.jsonPath().getInt("data.size()");
-        Assert.assertEquals(size,2,network.message(params,BasicConfig.WORK_fuzzyCustName,"客户动态条数错误",response.body().asString()));
+        Assert.assertTrue(size>0,network.message(params,BasicConfig.WORK_fuzzyCustName,"客户动态条数错误",response.body().asString()));
     }
 
     @Test(description = "公域引流_删除标签",priority = 41)
@@ -712,4 +712,15 @@ public class Work implements Authorization {
         Assert.assertTrue(data,network.message(BasicConfig.WORK_cancelSchedule,"取消日程失败",response.body().asString()));
     }
 
+    @Test(description = "普通销售不可查看审批管理",priority = 65)
+    public void 普通销售不可查看审批管理(){
+        otosellerAuth();
+        HashMap<String,Object> params = new HashMap<>();
+        params.put("pageIndex",1);
+        params.put("pageSize",20);
+        Response response =network.getResponse(params,BasicConfig.WORK_interviewAuditList);
+        int size = response.jsonPath().getInt("data.list.size()");
+        Assert.assertEquals(size,0,network.message(BasicConfig.WORK_interviewAuditList,"查看审批列表不为空",response.body().asString()));
+    }
+
 }

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

@@ -114,7 +114,7 @@ public class BasicConfig {
 
 
   /*******OTO销售工作台*********/
-  public  static final String OTO_TKU = "2RA3RVc1LEF7SnuZg7qu8kr9mx4BEQcUy3ZmGw6EcESNTGXj1XP9rtChjMmfcnvfeQzPijhA2sbAWvYHchwK9o9b1GtjMLwvmUpJ1PdC57Y1yGJLynbr3FZ3YLURN35f9CE7sFhm3CrqT5FTo4tjpxD";
+  public  static final String OTO_TKU = "2RA3RVc1LEF7SnuZgb5JDNWuiTCgii9S3tU1tUS83jyZyWSgFwREmcRF3wB1txYth5GgnEskgLHUcvfYLLa6Uqn14w6EZ2srZaJXCWVGaYbxhbv1EMnMS5QqjK54GaeEUo4d9vPQz1o9P5DmruUsgNa";
 
   // *************** 客集集域名 ***************
   public static final String HOST = "https://kjj.m.duibatest.com.cn";
@@ -1372,6 +1372,9 @@ public class BasicConfig {
   public static final String WORK_saveOrModifySchedule= WORK_HOST + "/kjy/oto/manager/sellerNotify/saveOrModifySchedule";
   public static final String WORK_cancelSchedule= WORK_HOST + "/kjy/oto/manager/sellerNotify/cancelSchedule";
   public static final String WORK_abandonCust= WORK_HOST + "/kjy/oto/manager/customer/abandonCust";
+  public static final String WORK_interviewAuditList= WORK_HOST + "/kjy/oto/manager/audit/getInterviewAuditList";
+  public static final String WORK_interviewAuditReject= WORK_HOST + "/kjy/oto/manager/audit/interviewAuditReject";
+  public static final String WORK_interviewAuditPass= WORK_HOST + "/kjy/oto/manager/audit/interviewAuditPass";
 
   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";
@@ -1382,7 +1385,7 @@ public class BasicConfig {
   public static final String PHONE_interviewList = PHONE_HOST + "/kjy/oto/interview/list";
   public static final String PHONE_interviewCancel = PHONE_HOST + "/kjy/oto/interview/cancel";
   public static final String PHONE_interviewCode = PHONE_HOST + "/kjy/oto/h5/interview/code";
-  public static final String PHONE_interviewStatus = PHONE_HOST + "/kjy/oto/h5/interview/status";
+  public static final String PHONE_interviewStatus = PHONE_HOST + "/kjy/oto/h5/v1/getInterviewStatus";
   public static final String PHONE_interviewPhone = PHONE_HOST + "/kjy/oto/h5/interview/phone";
   public static final String PHONE_interviewBind = PHONE_HOST + "/kjy/oto/h5/interview/bind";
   public static final String PHONE_bindCancel = PHONE_HOST + "/kjy/oto/h5/interview/cancel";
@@ -1390,13 +1393,15 @@ public class BasicConfig {
   public static final String PHONE_custExtDetail = PHONE_HOST + "/kjy/oto/interview/custExtDetail";
   public static final String PHONE_interviewFeedback = PHONE_HOST + "/kjy/oto/interview/feedback";
   public static final String PHONE_interviewDetail = PHONE_HOST + "/kjy/oto/interview/edit/detail";
-  public static final String PHONE_authPhone = PHONE_HOST + "/auth/oto/authPhone";
-  public static final String PHONE_getAuthPhone = PHONE_HOST + "/auth/oto/getAuthPhone";
   public static final String PHONE_bindWxUser = HOST + "/kjy/oto/interview/bindWxUser";
   public static final String PHONE_submitEvaluate = HOST + "/kjy/oto/interview/submitEvaluate";
   public static final String PHONE_listBysellComp = PHONE_HOST + "/kjy/oto/manager/customer/listBysellComp";
+  public static final String PHONE_address = PHONE_HOST + "/kjy/oto/h5/v1/save/address";
+  public static final String PHONE_getUnusualTypes = PHONE_HOST + "/kjy/oto/h5/v1/getUnusualTypes";
+  public static final String PHONE_fail = HOST + "/kjy/oto/interview/authorize/fail";
 
   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";
 
 }