Merge branch 'Feature/signDetailAndExpert_20220424' into 'master'

增加服务专家的测试用例

See merge request !91

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

@@ -82,8 +82,15 @@ public interface Authorization {
     default void otoEpertTku() { network.agentCookies.put("tku", OTO_EXPERT_TKU); }
 
 
-    //oto销售工作台个微端-客户
-    default void WXCustomerTku() { network.agentCookies.put("ototku", WX_CUSTOMER_TKU); }
+    //oto销售工作台个微端-客户_自动化测试客户3
+    default void WXCustomerTku3() { network.agentCookies.put("ototku", WX_CUSTOMER_TKU3); }
+
+
+    //oto销售工作台个微端-客户_自动化测试客户2
+    default void WXCustomerTku2() { network.agentCookies.put("ototku", WX_CUSTOMER_TKU2); }
+
+    //oto销售工作台个微端-客户_自动化测试客户5
+    default void WXCustomerTku5() { network.agentCookies.put("ototku", WX_CUSTOMER_TKU5); }
 
     //oto销售工作台个微端-专家
     default void WXExpertTTku() { network.agentCookies.put("ototku", WX_EXPERT_TKU); }

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

@@ -199,7 +199,7 @@ public class Activity implements Authorization {
 
     @Test(description = "查询活动签到配置",priority = 8)
     public void 查询活动签到配置(){
-        WXCustomerTku();
+        WXCustomerTku3();
         HashMap<String,Object> params = new HashMap<>();
         params.put("activityId", IdMakeUtil.encodingId((long) acitityId-1));
         Response response = network.getResponse(params, BasicConfig.WX_signDetail);
@@ -230,9 +230,9 @@ public class Activity implements Authorization {
         HashMap<String,Object> params = new HashMap<>();
         params.put("date", today);
         Response response = network.postResponse(params, BasicConfig.WX_submitRecordDetail);
-        int confSize = response.jsonPath().getInt("data.list.size");
+        int confSize = response.jsonPath().getInt("data.list.size()");
         Assert.assertEquals(confSize,1,network.message(params,BasicConfig.WX_submitRecordDetail,"签到场景数错误",response.body().asString()));
-        int size = response.jsonPath().getInt("data.list[0].custList.size");
+        int size = response.jsonPath().getInt("data.list[0].custList.size()");
         int configId = response.jsonPath().getInt("data.list[0].configId");
         Assert.assertEquals(configId,440,network.message(params,BasicConfig.WX_submitRecordDetail,"签到活动的见面场景错误",response.body().asString()));
         Assert.assertEquals(size,4,network.message(params,BasicConfig.WX_submitRecordDetail,"签到活动量数错误",response.body().asString()));
@@ -249,7 +249,7 @@ public class Activity implements Authorization {
         HashMap<String,Object> params = new HashMap<>();
         params.put("date", today);
         Response response = network.postResponse(params, BasicConfig.otherDetailForSeller);
-        int confSize = response.jsonPath().getInt("data.vos.size");
+        int confSize = response.jsonPath().getInt("data.vos.size()");
         Assert.assertEquals(confSize,1,network.message(params,BasicConfig.otherDetailForSeller,"签到场景数错误",response.body().asString()));
         int configId = response.jsonPath().getInt("data.vos[0].configId");
         Assert.assertEquals(configId,17,network.message(params,BasicConfig.otherDetailForSeller,"签到活动的见面场景错误",response.body().asString()));
@@ -294,14 +294,14 @@ public class Activity implements Authorization {
         HashMap<String,Object> params = new HashMap<>();
         params.put("date", today);
         Response response = network.postResponse(params, BasicConfig.WX_interviewConfigList);
-        int size = response.jsonPath().getInt("data.list.size");
+        int size = response.jsonPath().getInt("data.list.size()");
         Assert.assertEquals(size,1,network.message(params,BasicConfig.WX_interviewConfigList,"其他见面场景数错误",response.body().asString()));
     }
 
     @Test(description = "专家查看见面目的列表",priority = 15)
     public void 专家查看见面目的列表(){
         Response response = network.getResponse(BasicConfig.WX_custPhase);
-        int size = response.jsonPath().getInt("data.size");
+        int size = response.jsonPath().getInt("data.size()");
         Assert.assertEquals(size,5,network.message(BasicConfig.WX_custPhase,"见面目的数错误",response.body().asString()));
     }
 
@@ -310,7 +310,7 @@ public class Activity implements Authorization {
         HashMap<String,Object> params = new HashMap<>();
         params.put("custName", "自动化测试用户3");
         Response response = network.getResponse(params, BasicConfig.WX_searchCust);
-        int size = response.jsonPath().getInt("data.list.size");
+        int size = response.jsonPath().getInt("data.list.size()");
         Assert.assertEquals(size,1,network.message(params,BasicConfig.WX_searchCust,"搜索跟进中客户数量为0",response.body().asString()));
     }
 
@@ -333,8 +333,8 @@ public class Activity implements Authorization {
     public void 总监查看部门列表(){
         WXLeaderTku();
         Response response = network.getResponse( BasicConfig.WX_deptList);
-        int size = response.jsonPath().getInt("data.size");
-        Assert.assertEquals(size,2,network.message(BasicConfig.WX_custPhase,"见面目的数错误",response.body().asString()));
+        int size = response.jsonPath().getInt("data.size()");
+        Assert.assertEquals(size,2,network.message(BasicConfig.WX_custPhase,"部门列表数错误",response.body().asString()));
     }
 
     @Test(description = "总监查看今日提报概况",priority = 19)
@@ -377,9 +377,9 @@ public class Activity implements Authorization {
         params.put("date", today);
         params.put("sellerId", IdMakeUtil.encodingId(284L));
         Response response = network.postResponse(params, BasicConfig.WX_submitRecordDetail);
-        int confSize = response.jsonPath().getInt("data.list.size");
+        int confSize = response.jsonPath().getInt("data.list.size()");
         Assert.assertEquals(confSize, 1, network.message(params, BasicConfig.WX_submitRecordDetail, "签到场景数错误", response.body().asString()));
-        int size = response.jsonPath().getInt("data.list[0].custList.size");
+        int size = response.jsonPath().getInt("data.list[0].custList.size()");
         int configId = response.jsonPath().getInt("data.list[0].configId");
         Assert.assertEquals(configId, 440, network.message(params, BasicConfig.WX_submitRecordDetail, "签到活动的见面场景错误", response.body().asString()));
         Assert.assertEquals(size, 4, network.message(params, BasicConfig.WX_submitRecordDetail, "签到活动量数错误", response.body().asString()));
@@ -444,6 +444,91 @@ public class Activity implements Authorization {
         Assert.assertNotNull(data,network.message(params,BasicConfig.WX_saveIntroduce,"创建转介绍客户失败",response.body().asString()));
     }
 
+    @Test(description = "查看客户报名页",priority = 26)
+    public void 查看客户报名页(){
+        WXCustomerTku5();
+        Response response = network.getResponse(BasicConfig.WX_serviceExpert_detail);
+        boolean sign = response.jsonPath().getBoolean("data.sign");
+        int showType = response.jsonPath().getInt("data.showType");
+        Assert.assertEquals(showType,1,network.message(BasicConfig.WX_serviceExpert_detail,"展示页面非【报名页】",response.body().asString()));
+        Assert.assertFalse(sign,network.message(BasicConfig.WX_serviceExpert_detail,"客户公众号报名失败",response.body().asString()));
+    }
+
+    @Test(description = "客户公众号报名",priority = 27)
+    public void 客户公众号报名(){
+        Response response = network.postResponse(BasicConfig.WX_serviceExpert_sign);
+        boolean data = response.jsonPath().getBoolean("data");
+        Assert.assertTrue(data,network.message(BasicConfig.WX_serviceExpert_sign,"客户公众号报名失败",response.body().asString()));
+
+        response = network.getResponse(BasicConfig.WX_serviceExpert_detail);
+        boolean sign = response.jsonPath().getBoolean("data.sign");
+        int showType = response.jsonPath().getInt("data.showType");
+        Assert.assertEquals(showType,1,network.message(BasicConfig.WX_serviceExpert_detail,"展示页面非【报名页】",response.body().asString()));
+        Assert.assertTrue(sign,network.message(BasicConfig.WX_serviceExpert_detail,"客户公众号报名失败",response.body().asString()));
+    }
+
+    @Test(description = "查看客户中间页",priority = 28)
+    public void 查看客户中间页(){
+        WXCustomerTku2();
+        Response response = network.getResponse(BasicConfig.WX_serviceExpert_detail);
+        int showType = response.jsonPath().getInt("data.showType");
+        Assert.assertEquals(showType,2,network.message(BasicConfig.WX_serviceExpert_detail,"展示页面非【中间页】",response.body().asString()));
+    }
+
+    @Test(description = "查看客户服务专家",priority = 29)
+    public void 查看客户服务专家(){
+        WXCustomerTku3();
+        Response response = network.getResponse(BasicConfig.WX_serviceExpert_detail);
+        int showType = response.jsonPath().getInt("data.showType");
+        String expertConfigUrl = response.jsonPath().getString("data.expertConfigUrl");
+        Assert.assertEquals(showType,3,network.message(BasicConfig.WX_serviceExpert_detail,"展示页面非【专家页】",response.body().asString()));
+        Assert.assertNotNull(expertConfigUrl,network.message(BasicConfig.WX_serviceExpert_detail,"专家配置页为空",response.body().asString()));
+    }
+
+    @Test(description = "查询登录人个人信息",priority = 30)
+    public void 查询登录人个人信息(){
+        WXLeaderTku();
+        Response response = network.getResponse( BasicConfig.WX_info);
+        int size = response.jsonPath().getInt("data.roles.size()");
+        boolean isShowSignDetailButton = response.jsonPath().getBoolean("data.isShowSignDetailButton");
+        Assert.assertEquals(size,2,network.message(BasicConfig.WX_info,"登录人角色数错误",response.body().asString()));
+        Assert.assertTrue(isShowSignDetailButton,network.message(BasicConfig.WX_info,"总监不可见签到详情",response.body().asString()));
+    }
+
+    @Test(description = "查看签到列表",priority = 31)
+    public void 查看签到列表(){
+        updateInvite(1,now + 3600000,cust_id+1);
+
+        HashMap<String,Object> params = new HashMap<>();
+        params.put("activityId", IdMakeUtil.encodingId((long) acitityId-1));
+        Response response = network.getResponse(params, BasicConfig.WX_sign_list);
+        int shouldSignNum = response.jsonPath().getInt("data.shouldSignNum");
+        int notSignNum = response.jsonPath().getInt("data.notSignNum");
+        int size = response.jsonPath().getInt("data.vos.size()");
+        int isSign1 = response.jsonPath().getInt("data.vos.find{it.custName.equals(\"自动化测试用户0\")}.isSign");
+        int isSign2 = response.jsonPath().getInt("data.vos.find{it.custName.equals(\"自动化测试用户2\")}.isSign");
+        Assert.assertEquals(shouldSignNum,3,network.message(params,BasicConfig.WX_sign_list,"应签到人数错误",response.body().asString()));
+        Assert.assertEquals(notSignNum,1,network.message(params,BasicConfig.WX_sign_list,"未签到人数错误",response.body().asString()));
+        Assert.assertEquals(size,3,network.message(params,BasicConfig.WX_sign_list,"签到列表人数错误",response.body().asString()));
+        Assert.assertEquals(isSign1,1,network.message(params,BasicConfig.WX_sign_list,"已签到客户的签到非【是】",response.body().asString()));
+        Assert.assertEquals(isSign2,0,network.message(params,BasicConfig.WX_sign_list,"已分配客户的签到非【否】",response.body().asString()));
+    }
+
+    @Test(description = "补签",priority = 32)
+    public void 补签(){
+        HashMap<String,Object> params = new HashMap<>();
+        params.put("activityId", IdMakeUtil.encodingId((long) acitityId-1));
+        params.put("custId", IdMakeUtil.encodingId((long) cust_id+1));
+        Response response = network.postResponse(params, BasicConfig.WX_saveIntroduce);
+        boolean data = response.jsonPath().getBoolean("data");
+        Assert.assertTrue(data,network.message(params,BasicConfig.WX_submitRecord,"补签失败",response.body().asString()));
+
+        response = network.getResponse(params, BasicConfig.WX_sign_list);
+        int notSignNum = response.jsonPath().getInt("data.notSignNum");
+        int isSign = response.jsonPath().getInt("data.vos.find{it.custName.equals(\"自动化测试用户2\")}.isSign");
+        Assert.assertEquals(notSignNum,0,network.message(params,BasicConfig.WX_saveIntroduce,"未签到人数错误",response.body().asString()));
+        Assert.assertEquals(isSign,1,network.message(params,BasicConfig.WX_saveIntroduce,"已分配客户的签到非【是】",response.body().asString()));
+    }
 
     public void sellerSubmitRecord(int status,int count){
         HashMap<String,Object> params = new HashMap<>();

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

@@ -709,6 +709,34 @@ public class Depts implements Authorization {
         Assert.assertEquals(deptId,47,network.message(selectParams, BasicConfig.WORK_MNG_customerList, "客户所属团队错误", response.body().asString()));
     }
 
+    @Test(description = "配置成员资料",priority = 50)
+    public void 配置成员资料(){
+        HashMap<String,Object> params = new HashMap<>();
+        params.put("id", EXPERT_ID);
+        params.put("introduceImage", "//yun.dui88.com/kjy/image/20230424/9c17d843991b4ea7ac800235f144542f.jpg");
+        params.put("shareImageUrl", "//yun.dui88.com/kjy/image/20230424/72d9608dea5c459dae86e42129bf1fe7.jpg");
+        params.put("shareDesc", "勿动-自动化专家分享的卡片标题");
+        Response response = network.postResponse(params, BasicConfig.WORK_configSave);
+        boolean data = response.jsonPath().getBoolean("data");
+        Assert.assertTrue(data, network.message(params, BasicConfig.WORK_configSave, "配置成员资料失败", response.body().asString()));
+    }
+
+    @Test(description = "查看成员资料配置",priority = 50)
+    public void 查看成员资料配置(){
+        HashMap<String,Object> params = new HashMap<>();
+        params.put("id", EXPERT_ID);
+        Response response = network.postResponse(params, BasicConfig.WORK_configDetail);
+        String shareDesc = response.jsonPath().getString("data.shareDesc");
+        Assert.assertEquals(shareDesc, "勿动-自动化专家分享的卡片标题",network.message(params, BasicConfig.WORK_configDetail, "配置成员资料失败", response.body().asString()));
+
+        params.put("introduceImage", "//yun.dui88.com/kjy/image/20230424/9c17d843991b4ea7ac800235f144542f.jpg");
+        params.put("shareImageUrl", "//yun.dui88.com/kjy/image/20230424/72d9608dea5c459dae86e42129bf1fe7.jpg");
+        params.put("shareDesc", "勿动-自动化测试专家分享的卡片标题");
+        response = network.postResponse(params, BasicConfig.WORK_configSave);
+        boolean data = response.jsonPath().getBoolean("data");
+        Assert.assertTrue(data, network.message(params, BasicConfig.WORK_configSave, "配置成员资料失败", response.body().asString()));
+    }
+
     public void dimissionStatus(int sellreid){
         HashMap<String,Object> params = new HashMap<>();
         params.put("id", sellreid);

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

@@ -45,7 +45,9 @@ public class BasicConfig {
   public  static final String OTO_EXPERT_TKU = "7Fcuh7FWTsTHSpfadRRWCqKfrLzGwUzSt2GyKaN2k4JGQDTqw8BwHhYw3TyqyaYEjXrPE6fkTN8KHHHhhFKnjdfEt8mmziXNdVKTpV1oLBfQVLsLG32XkcYgX9nHtUA3r9bYDRhQGQp1y4AumVyQFbxr";
 
   /*******OTO销售工作台-个微*********/
-  public  static final String WX_CUSTOMER_TKU = "3XE1uRL2Mq7DEPFFUMAtEgc1KZagjL4Bw7STUYA79h2mLaQExn9ji9MtuMqeigWxzYyLqGhdKFSWs18uFNXF74dZzMAuvJKHkLrc63b9erfkSoBQvM";
+  public  static final String WX_CUSTOMER_TKU3 = "3XE1uRL2Mq7DEPFFUMAtEgc1KZagjL4Bw7STUYA79h2mLaQExn9ji9MtuMqeigWxzYyLqGhdKFSWs18uFNXF74dZzMAuvJKHkLrc63b9erfkSoBQvM";
+  public  static final String WX_CUSTOMER_TKU2 = "3XE1uRL2Mq7DEPFFFRdnRPaPh4SXgsm35PhVj4M9pZEiBBjeEqjofm85tjBtZPBTzQoh68V4gcwq5RxvfTUzvU1HPrRRqU6Pji7JxkpeYD3PNZX7oH";
+  public  static final String WX_CUSTOMER_TKU5 = "3XE1uRL2Mq7DEPFFFRdnRPaTjtsHkF2ZD1idKAhmtGUvcqgpiFwyGQDqRFUnkryobzja88dJCcoixi4Locvda442c7y97vgtPidEaUhwXTot8J3VEG";
   public  static final String WX_EXPERT_TKU = "8WLT4bmESccxwWsdtyqvYAujdym8wr9EFgyuxyVTUn3bWkjBxCaRZ3Ab9Th23hEEHsVL89gYm26n7Eag4ZxYGhabwkN8voFamdmibepJZ7Jjinx";
   public  static final String WX_LEADER_TKU = "8WLT4bmESccxwWsdtyqvYGjw2btb5QStHynN3Wqird53MakwdEDu5aNZEnV3PdpvmxipZ4bVxD7bjZKdofEdP9XVWgdNfNF52Vw1qV2dsf7gWVe";
   // *************** 客集集域名 ***************
@@ -332,6 +334,8 @@ public class BasicConfig {
   public static final String WORK_MNG_ykList = WORK_HOST + "/kjy/oto/mng/seller/account/yk/availableList";
   public static final String WORK_MNG_accountList = WORK_HOST + "/kjy/oto/mng/seller/account/availableList";
   public static final String WORK_getDeptList= WORK_HOST + "/kjy/oto/mng/seller/get/dept/list";
+  public static final String WORK_configSave= WORK_HOST + "/kjy/oto/mng/seller/configSave";
+  public static final String WORK_configDetail= WORK_HOST + "/kjy/oto/mng/seller/configDetail";
 
   //*************************客集集营销平台******************************
   public static final String PHONE_bindWxUser = HOST + "/kjy/oto/interview/bindWxUser";
@@ -355,6 +359,11 @@ public class BasicConfig {
   public static final String WX_searchCust = WX_HOST + "/oto/seller/submitRecord/searchCust";
   public static final String WX_submitRecord = WX_HOST + "/oto/seller/submitRecord/submit";
   public static final String WX_saveIntroduce= WX_HOST + "/oto/customer/introduce/save";
+  public static final String WX_serviceExpert_sign= WX_HOST + "/oto/customer/serviceExpert/sign";
+  public static final String WX_serviceExpert_detail= WX_HOST + "/oto/customer/serviceExpert/detail";
+  public static final String WX_info= WX_HOST + "/oto/user/info";
+  public static final String WX_sign_list= WX_HOST + "/oto/sign/list";
+  public static final String WX_sign_complement= WX_HOST + "/oto/activity/sign/complement";
 
   //*************************销售工作台企微端**********************
   public static final String PHONE_getCustPhase = WORK_HOST + "/kjy/oto/manager/customer/getCustPhase";