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

增加测试用例

See merge request !14

src/test/java/com/oto/cases/admin/Authorization.java

@@ -22,10 +22,6 @@ public interface Authorization {
     default void otoLeaderAuth() {
         network.agentCookies.put(otoLeaderCookieKey, otoLeaderCookieValue);
     }
-    //oto销售工作台手机端-销售
-    default void otoSellerTku() {
-        network.agentCookies.put("tku", OTO_TKU);
-    }
 
     //oto销售工作台-管理员
     default void otoManagerAuth() {
@@ -33,6 +29,9 @@ public interface Authorization {
     }
 
 
+    //oto销售工作台手机端-销售
+    default void otoSellerTku() { network.agentCookies.put("tku", OTO_TKU); }
+
     /**
      * 集客助手相关授权
      */
@@ -50,4 +49,12 @@ public interface Authorization {
 
     }
 
+    /**
+     * 直播小程序相关授权
+     */
+    default void visitorAuth() {
+        network.agentCookies.put("authKey", visitorAuth);
+        System.out.println("用户AUTH_KEY：" + visitorAuth);
+    }
+
 }

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

 package com.oto.cases.otoseller;
 
+import com.oto.cases.admin.Authorization;
 import com.oto.config.BasicConfig;
 import com.oto.utils.IdMakeUtil;
 import com.oto.utils.NetworkUtils;
@@ -13,18 +14,20 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 
-import static com.oto.config.BasicConfig.LEADER_ID;
-import static com.oto.config.BasicConfig.SELLER_ID;
+import static com.oto.config.BasicConfig.*;
 import static com.oto.utils.BaseUtils.ssoLogin;
 import static com.oto.utils.ThreadSleepUtils.sleep;
 
-public class Manager {
+public class Manager implements Authorization {
 
     private static final NetworkUtils network = NetworkUtils.getInstance();
     private int sellerId;        //销售ID
     private String insureOrderstr;        //告知书的保单号
     private String pdfUrl;        //告知书的模板pdfURL
     private String encryptId;        //告知书的加密id
+    private int linkId;        //直播投放链接id
+    private String linkRemark;        //直播投放链接备注
+    private long pathkeyId;        //固定链接id
     @BeforeTest
     public void setUp(){
         ssoLogin();
@@ -492,4 +495,148 @@ public class Manager {
         int signatureState = response.jsonPath().getInt("data.list[0].signatureState");
         Assert.assertEquals(signatureState,4,network.message(BasicConfig.MANAGER_notification_list,"告知书的状态错误：非已失效",response.body().asString()));
     }
+
+    @Test(description = "修改投放账户",priority =34)
+    public void 修改投放账户(){
+        HashMap<String,Object> params = new HashMap<>();
+        params.put("id", 20);
+        params.put("accountId", "20220107CESHI_1");
+        params.put("accountName", "勿动_自动化测试专用账号");
+        params.put("companyId", 5);
+        params.put("pubChannel", 6);
+        Response response = network.postResponse(params, BasicConfig.MANAGER_account_saveOrUpdate);
+        boolean data = response.jsonPath().getBoolean("data");
+        Assert.assertTrue(data,network.message(params,BasicConfig.MANAGER_account_saveOrUpdate,"修改投放账户失败",response.body().asString()));
+    }
+
+    @Test(description = "查看投放账户列表",priority =35)
+    public void 查看投放账户列表(){
+        HashMap<String,Object> params = new HashMap<>();
+        params.put("pageIndex", 1);
+        params.put("pageSize", 20);
+        params.put("accountId", "");
+        params.put("accountName", "");
+        Response response = network.getResponse(params, BasicConfig.MANAGER_account_list);
+        int size = response.jsonPath().getInt("data.list.size");
+        Assert.assertTrue(size>0,network.message(params,BasicConfig.MANAGER_account_list,"投放账户列表为空",response.body().asString()));
+        int size2 = response.jsonPath().getInt("data.list.findAll{it.accountId == '20220107CESHI_1'}.size");
+        String accountName = response.jsonPath().getString("data.list.find{it.accountId == '20220107CESHI_1'}.accountName");
+        Assert.assertEquals(size2,1,network.message(params,BasicConfig.MANAGER_account_list,"投放账户列表不包含修改后的投放账户",response.body().asString()));
+        Assert.assertEquals(accountName,"勿动_自动化测试专用账号",network.message(params,BasicConfig.MANAGER_account_list,"修改后的投放账户名称错误",response.body().asString()));
+
+        params.clear();
+        params.put("id", 20);
+        params.put("accountId", "20220107CESHI_01");
+        params.put("accountName", "勿动_自动化测试账号");
+        params.put("companyId", 5);
+        params.put("pubChannel", 5);
+        response = network.postResponse(params, BasicConfig.MANAGER_account_saveOrUpdate);
+        boolean data = response.jsonPath().getBoolean("data");
+        Assert.assertTrue(data,network.message(params,BasicConfig.MANAGER_account_saveOrUpdate,"修改投放账户失败",response.body().asString()));
+    }
+
+    @Test(description = "创建固定直播投放链接",priority =36)
+    public void 创建固定直播投放链接(){
+        HashMap<String,Object> params = new HashMap<>();
+        linkRemark = "勿动_自动化直播公司的测试投放链接"+new Date();
+        params.put("channelRemark", linkRemark);
+        params.put("companyId", "101");
+        params.put("liveId", 8202);
+        params.put("launchAccountId", 20);
+        Response response = network.postResponse(params, BasicConfig.MANAGER_link_save);
+        linkId = response.jsonPath().getInt("data");
+        Assert.assertNotNull(linkId,network.message(params,BasicConfig.MANAGER_link_save,"修改投放账户失败",response.body().asString()));
+    }
+
+    @Test(description = "获取直播链接生成进度",priority =37)
+    public void 获取直播链接生成进度(){
+        boolean data = false;
+        Response response = null;
+        for (int i=0;i<10 && !data;i++) {
+            sleep(1000);
+            HashMap<String,Object> params = new HashMap<>();
+            params.put("id", linkId);
+            response = network.getResponse(params, BasicConfig.MANAGER_link_getStatus);
+            data = response.jsonPath().getBoolean("data");
+        }
+        Assert.assertTrue(data,network.message(BasicConfig.MANAGER_link_getStatus,"生成投放链接失败",response.body().asString()));
+    }
+
+    @Test(description = "查看直播投放链接列表",priority =38)
+    public void 查看直播投放链接列表(){
+        HashMap<String,Object> params = new HashMap<>();
+        params.put("pageIndex", 1);
+        params.put("pageSize", 20);
+        Response response = network.getResponse(params, BasicConfig.MANAGER_link_list);
+        int size = response.jsonPath().getInt("data.list.size");
+        Assert.assertTrue(size>0,network.message(params,BasicConfig.MANAGER_link_list,"直播投放链接列表为空",response.body().asString()));
+        int liveSpreadLinkId = response.jsonPath().getInt("data.list[0].liveSpreadLinkId");
+        String channelRemark = response.jsonPath().getString("data.list[0].channelRemark");
+        Assert.assertEquals(liveSpreadLinkId,linkId,network.message(params,BasicConfig.MANAGER_link_list,"直播投放链接列表不包含新增的投放直播链接",response.body().asString()));
+        Assert.assertEquals(channelRemark,linkRemark,network.message(params,BasicConfig.MANAGER_link_list,"新增的投放直播链接备注错误",response.body().asString()));
+        pathkeyId = response.jsonPath().getLong("data.list[0].id");
+    }
+
+    @Test(description = "查看映射记录",priority =39)
+    public void 查看映射记录(){
+        HashMap<String,Object> params = new HashMap<>();
+        params.put("pathKey", pathkeyId);
+        params.put("pageIndex", 1);
+        params.put("pageSize", 5);
+        Response response = network.getResponse(params, BasicConfig.MANAGER_link_listByPathKey);
+        int size = response.jsonPath().getInt("data.list.size");
+        Assert.assertEquals(size,1,network.message(params,BasicConfig.MANAGER_link_listByPathKey,"投放账户列表为空",response.body().asString()));
+        int liveSpreadLinkId = response.jsonPath().getInt("data.list[0].liveSpreadLinkId");
+        Assert.assertEquals(liveSpreadLinkId,linkId,network.message(params,BasicConfig.MANAGER_link_listByPathKey,"投放账户列表不包含修改后的投放账户",response.body().asString()));
+    }
+
+    @Test(description = "修改固定直播投放链接",priority =40)
+    public void 修改固定直播投放链接(){
+        HashMap<String,Object> params = new HashMap<>();
+        linkRemark = "勿动_自动化直播公司的测试投放链接"+new Date();
+        params.put("channelRemark", linkRemark);
+        params.put("companyId", "101");
+        params.put("liveId", 8203);
+        params.put("launchAccountId", 20);
+        params.put("pathKey", pathkeyId);
+        Response response = network.postResponse(params, BasicConfig.MANAGER_link_fakeUpdate);
+        linkId = response.jsonPath().getInt("data");
+        Assert.assertNotNull(linkId,network.message(params,BasicConfig.MANAGER_link_fakeUpdate,"修改投放账户失败",response.body().asString()));
+    }
+
+    @Test(description = "修改固定链接后查看映射记录更新",priority =41)
+    public void 修改固定链接后查看映射记录更新(){
+        HashMap<String,Object> params = new HashMap<>();
+        params.put("pathKey", pathkeyId);
+        params.put("pageIndex", 1);
+        params.put("pageSize", 5);
+        Response response = network.getResponse(params, BasicConfig.MANAGER_link_listByPathKey);
+        int size = response.jsonPath().getInt("data.list.size");
+        Assert.assertEquals(size,2,network.message(params,BasicConfig.MANAGER_link_listByPathKey,"投放账户列表为空",response.body().asString()));
+        int liveSpreadLinkId = response.jsonPath().getInt("data.list[0].liveSpreadLinkId");
+        Assert.assertEquals(liveSpreadLinkId,linkId,network.message(params,BasicConfig.MANAGER_link_listByPathKey,"投放账户列表不包含修改后的投放账户",response.body().asString()));
+    }
+
+    @Test(description = "名称模糊搜索投放账户",priority =42)
+    public void 名称模糊搜索投放账户(){
+        HashMap<String,Object> params = new HashMap<>();
+        params.put("accountName", "勿动");
+        Response response = network.getResponse(params, BasicConfig.MANAGER_account_fuzzyByAccountName);
+        int size = response.jsonPath().getInt("data.list.size");
+        Assert.assertEquals(size,1,network.message(params,BasicConfig.MANAGER_account_fuzzyByAccountName,"查询的投放账户列表为空",response.body().asString()));
+        int launchAccountId = response.jsonPath().getInt("data[0].launchAccountId");
+        Assert.assertEquals(launchAccountId,20,network.message(params,BasicConfig.MANAGER_account_fuzzyByAccountName,"模糊查询结果错误",response.body().asString()));
+    }
+
+    @Test(description = "投放链接进入直播后获取直播id",priority =43)
+    public void 投放链接进入直播后获取直播id(){
+        visitorAuth();
+        HashMap<String,Object> params = new HashMap<>();
+        params.put("pathKey",IdMakeUtil.encodingId(pathkeyId));
+        Response response = network.getResponse(params, BasicConfig.live_mapping_getTrueLinkInfo);
+        int accessSource = response.jsonPath().getInt("data.accessSource");
+        String liveId = response.jsonPath().getString("data.liveId");
+        Assert.assertEquals(accessSource,linkId,network.message(params,BasicConfig.live_mapping_getTrueLinkInfo,"查询的投放账户列表为空",response.body().asString()));
+        Assert.assertEquals(liveId,IdMakeUtil.encodingId(8203L),network.message(params,BasicConfig.live_mapping_getTrueLinkInfo,"模糊查询结果错误",response.body().asString()));
+    }
 }

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

@@ -678,6 +678,56 @@ public class Phone implements Authorization {
         Assert.assertTrue(data,network.message(params,BasicConfig.WORK_delCust,"删除见面场景失败",response.body().asString()));
     }
 
+    @Test(description = "查看我的预日报为未提交",priority = 48)
+    public void 查看我的预日报为未提交(){
+        otoSellerTku();
+        Response response =network.getResponse(BasicConfig.PHONE_paper_getReportFlag);
+        int reportFlag = response.jsonPath().getInt("data.reportFlag");
+        Assert.assertEquals(reportFlag,0,network.message(BasicConfig.PHONE_paper_getReportFlag,"日报提交状态非未提交",response.body().asString()));
+    }
+
+    @Test(description = "查看日报客户列表",priority = 49)
+    public void 查看日报客户列表(){
+        HashMap<String,Object> params = new HashMap<>();
+        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()));
+        String label = response.jsonPath().getString("data.list[0].label");
+        Assert.assertEquals(label,"今日查看微信",network.message(BasicConfig.PHONE_paper_getCustomers,"日报提交状态非0：未提交",response.body().asString()));
+    }
+
+    @Test(description = "提交日报",priority = 50)
+    public void 提交日报() {
+        HashMap<String, Object> params = new HashMap<>();
+        ArrayList custIds =new ArrayList();
+        custIds.add(IdMakeUtil.decodingId(cust_id));
+        custIds.add(IdMakeUtil.decodingId(introduceCustomer_id));
+        custIds.add(IdMakeUtil.decodingId(myselfCustomer_id));
+
+        params.put("custIds", custIds);
+        Response response = network.postResponse(params, BasicConfig.PHONE_paper_updateCustomer);
+        boolean data = response.jsonPath().getBoolean("data");
+        Assert.assertTrue(data,network.message(params,BasicConfig.PHONE_paper_updateCustomer,"提交日报失败",response.body().asString()));
+    }
+
+    @Test(description = "提交后查看日报状态",priority = 51)
+    public void 提交后查看日报状态() {
+        Response response =network.getResponse(BasicConfig.PHONE_paper_getReportFlag);
+        int reportFlag = response.jsonPath().getInt("data.reportFlag");
+        Assert.assertEquals(reportFlag,1,network.message(BasicConfig.PHONE_paper_getReportFlag,"日报提交状态非1：未提交",response.body().asString()));
+    }
+
+    @Test(description = "查询新客户详细信息",priority = 52)
+    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 addWxStatus = response.jsonPath().getInt("data.custInfo.addWxStatus");
+        Assert.assertEquals(addWxStatus,3,network.message(params,BasicConfig.WORK_detail,"加微状态不为3：上报已添加",response.body().asString()));
+    }
+
     @Test(description = "删除客户",priority = 79)
     public void 删除客户(){
         HashMap<String,Object> params = new HashMap<>();

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

@@ -15,7 +15,8 @@ public class BasicConfig {
   /**
    * 直播账号授权key
    */
-
+  //直播访客 （吉吉）ID：907
+  public static String visitorAuth ="LEH7epeHVDJWzhZ6DiexTHnfZVkhkqorGGQahRpVDVGzx7dWtF6qSrZH5EJekTCXsUVsZSSj1giy6aNiJSTN1JdVtPHgU";
   /**
    * 集客助手授权key
    */
@@ -99,6 +100,15 @@ public class BasicConfig {
   public static final String MANAGER_notification_signInvalid = MANAGER_HOST + "/kjy/manager/oto/notification/signInvalid";
   public static final String MANAGER_supplier_listAll = MANAGER_HOST + "/kjy/manager/oto/supplier/listAll";
   public static final String MANAGER_notification_getNotificationTemplate = MANAGER_HOST + "/kjy/manager/oto/notification/getNotificationTemplate";
+  public static final String MANAGER_account_saveOrUpdate = MANAGER_HOST + "/kjy/manager/oto/account/saveOrUpdate";
+  public static final String MANAGER_account_list = MANAGER_HOST + "/kjy/manager/oto/account/list";
+  public static final String MANAGER_link_save = MANAGER_HOST + "/kjy/manager/oto/link/mapping/save";
+  public static final String MANAGER_link_getStatus = MANAGER_HOST + "/kjy/manager/live/link/getStatus";
+  public static final String MANAGER_link_list = MANAGER_HOST + "/kjy/manager/oto/link/mapping/list";
+  public static final String MANAGER_link_listByPathKey = MANAGER_HOST + "/kjy/manager/oto/link/mapping/listByPathKey";
+  public static final String MANAGER_link_fakeUpdate = MANAGER_HOST + "/kjy/manager/oto/link/mapping/fakeUpdate";
+  public static final String MANAGER_account_fuzzyByAccountName = MANAGER_HOST + "/kjy/manager/oto/account/fuzzyByAccountName";
+  public static final String live_mapping_getTrueLinkInfo = MOBILE_HOST + "/kjy/live/oto/link/mapping/getTrueLinkInfo";
 
   //*************** OTO销售工作台 ***************
   public static final String WORK_getCaptcha = WORK_HOST +  "/kjy/oto/manager/auth/captcha";
@@ -146,13 +156,14 @@ public class BasicConfig {
   public static final String WORK_modifyTaskConf= WORK_HOST + "/kjy/oto/manager/sellerTask/modifyTaskConf";
   public static final String WORK_statisticHeader= WORK_HOST + "/kjy/oto/manager/sellerTask/statistic/header";
   public static final String WORK_taskDetailsList= WORK_HOST + "/kjy/oto/manager/sellerTask/taskDetailsList";
+
+  //***********************销售工作台手机端**********************
   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";
@@ -181,7 +192,11 @@ public class BasicConfig {
   public static final String PHONE_checkCustPhase = PHONE_HOST + "/kjy/oto/interview/checkCustPhase";
   public static final String PHONE_notification_getDetail = PHONE_HOST +"/kjy/oto/notification/getDetail";
   public static final String PHONE_notification_updateSignatureInfo = PHONE_HOST + "/kjy/oto/notification/updateSignatureInfo";
+  public static final String PHONE_paper_getReportFlag = PHONE_HOST + "/kjy/oto/seller/daily/paper/getReportFlag";
+  public static final String PHONE_paper_getCustomers = PHONE_HOST + "/kjy/oto/seller/daily/paper/getCustomers";
+  public static final String PHONE_paper_updateCustomer = PHONE_HOST + "/kjy/oto/seller/daily/paper/updateCustomer";
 
+  //******************专用测试接口****************************8
   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";

src/test/workTestNG.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
 <suite name="保险OTO" verbose="1" thread-count="3">
-    <test preserve-order="true" name="销售管理">
+    <test preserve-order="true" name="管理后台-公域引流">
         <classes>
             <class name="com.oto.cases.otoseller.Manager"/>
         </classes>