Merge branch 'master' into 2021072201-gxh

src/test/java/com/kjj/cases/live/agent/Agent.java

@@ -89,6 +89,7 @@ public class Agent implements Authorization {
         params.put("phoneNumber", "152588101691");
         params.put("jobNumber", "KJJ0000");
         params.put("wechatQrCode", "//yun.dui88.com/kjy/nc/qrcode1/1981ec88d22fe37041feac4724c627670817.png");
+        params.put("avatar", "//yun.dui88.com/kjy/nc/qrcode1/1981ec88d22fe37041feac4724c627670817.png");
         Response response = network.postResponse(params, BasicConfig.MOBILE_AgentEditCardInfo);
         Boolean data = response.jsonPath().getBoolean("data");
         System.out.println(data);

src/test/java/com/kjj/cases/live/flipCard/FlipCard.java

@@ -219,18 +219,21 @@ public class FlipCard implements Authorization {
     //预约
     @Test(description = "翻牌集字_预约", priority = 12)
     public void 翻牌集字_预约() {
+
         Map<String, Object> params = new HashMap<>();
         params.put("bizType",1);
         params.put("bizId",LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
         params.put("markIds",Collections.singleton(144));
 
         visitorAuth9();
+        ThreadSleepUtils.sleep(2000);
         Response response = network.postResponse(params, BasicConfig.MOBILE_appointment);
         boolean data = response.jsonPath().getBoolean("data");
         System.out.println(data);
         Assert.assertTrue(data, network.message(params, BasicConfig.MOBILE_appointment, "预约失败", response.body().asString()));
 
         visitorAuth22();
+        ThreadSleepUtils.sleep(2000);
         Response appointmentRes = network.postResponse(params, BasicConfig.MOBILE_appointment);
         boolean data1 = appointmentRes.jsonPath().getBoolean("data");
         System.out.println(data1);

src/test/java/com/kjj/cases/live/liveConfig/SaveLive.java

@@ -1476,6 +1476,7 @@ public class SaveLive implements Authorization {
         Map<String, Object> Params = new HashMap<>();
         Params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.LIVE_ID.getKey()));
         Params.put("transitionVideoUrl","https://yun.dui88.com/kjy/media/file/20210619/bb4a63f026ee228ad99b2367cfa83229.mp4");
+        Params.put("transitionVideoUrl2","https://yun.dui88.com/kjy/media/file/20210722/c8b13c0316456c5f43b8713ed4b5cae2.mp4");
         Params.put("videoDelayTime", 5);
         Response response = network.postResponse(Params, BasicConfig.MANAGER_confCaveOrUpdate);
         boolean data = response.jsonPath().getBoolean("data");
@@ -1517,11 +1518,11 @@ public class SaveLive implements Authorization {
         Response response = network.getResponse(Params, BasicConfig.MANAGER_getConfDetail);
         boolean transitionVideoConfBuildStatus = response.jsonPath().getBoolean("data.transitionVideoConfBuildStatus");
         System.out.println(transitionVideoConfBuildStatus);
-        Assert.assertTrue(transitionVideoConfBuildStatus, network.message(Params, BasicConfig.MANAGER_getConfDetail, "未配置翻牌", response.body().asString()));
+        Assert.assertTrue(transitionVideoConfBuildStatus, network.message(Params, BasicConfig.MANAGER_getConfDetail, "未配置过渡视频", response.body().asString()));
 
         boolean transitionVideoConfStatus = response.jsonPath().getBoolean("data.transitionVideoConfStatus");
         System.out.println(transitionVideoConfStatus);
-        Assert.assertTrue(transitionVideoConfStatus, network.message(Params, BasicConfig.MANAGER_getConfDetail, "未开启翻牌", response.body().asString()));
+        Assert.assertTrue(transitionVideoConfStatus, network.message(Params, BasicConfig.MANAGER_getConfDetail, "未开启过渡视频", response.body().asString()));
 
 
     }

src/test/java/com/kjj/cases/live/lottery/Lottery.java

@@ -404,6 +404,7 @@ public class Lottery implements Authorization {
     @Test(description = "访客B参与记录", priority = 30)
     public void 访客B参与记录() {
         visitorAuth13();
+        ThreadSleepUtils.sleep(3000);
         Map<String, Object> Params = new HashMap<>();
         Params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
         Params.put("shareUserId","Kj20ODYz");
@@ -421,6 +422,7 @@ public class Lottery implements Authorization {
     @Test(description = "访客A获取好运红包领取记录", priority = 31)
     public void 访客A获取好运红包领取记录() {
         visitorAuth13();
+        ThreadSleepUtils.sleep(500);
         Map<String, Object> Params = new HashMap<>();
         Params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
         Params.put("shareUserId","Kj20ODYz");
@@ -433,12 +435,9 @@ public class Lottery implements Authorization {
         int amount = response.jsonPath().getJsonObject("data.amount");
         Assert.assertTrue(amount==30, network.message(Params, BasicConfig.MOBILE_joinRecord, "领取金额为null", response.body().asString()));
 
-
     }
 
 
-
-
     @Test(description = "访客A抽奖券列表", priority = 32)
     public void 访客A抽奖券列表() {
         visitorAuth();

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

@@ -385,7 +385,7 @@ public class BasicConfig {
     public static final String MOBILE_AgentPersonalTeamCharts = MOBILE_HOST + "/kjy/live/agent/personalTeamCharts";
     public static final String MOBILE_AgentOwnCharts = MOBILE_HOST + "/kjy/live/agent/ownCharts";
 
-    public static final String MOBILE_MyCustomerList = MOBILE_HOST + "/kjy/live/agent/clue/myCustomerList";
+
     public static final String MOBILE_VideoList = MOBILE_HOST + "/kjy/live/company/video/list";
     public static final String MOBILE_VideoGetDetail = MOBILE_HOST + "/kjy/live/company/video/getDetail";
     public static final String MOBILE_VideoShareInfo = MOBILE_HOST + "/kjy/live/company/video/shareInfo";
@@ -400,7 +400,12 @@ public class BasicConfig {
     public static final String MOBILE_feedbackSave = MOBILE_HOST + "/kjy/live/user/feedback/save";
     public static final String MOBILE_agentInfo = MOBILE_HOST + "/kjy/live/share/help/agent/info";
 
-   //直播中线索
+    //直播前线索
+    public static final String MOBILE_customerStat = MOBILE_HOST + "/kjy/live/agent/clue/customerStat";
+    public static final String MOBILE_MyCustomerList = MOBILE_HOST + "/kjy/live/agent/clue/myCustomerList";
+    public static final String MOBILE_hasInviteAuth = MOBILE_HOST + "/kjy/live/agent/hasInviteAuth";
+
+    //直播中线索
     public static final String MOBILE_clueList = MOBILE_HOST + "/kjy/live/agent/clue/list";
     public static final String MOBILE_livingClueStatistic = MOBILE_HOST + "/kjy/live/agent/clue/livingClueStatistic";
     public static final String MOBILE_hasInviteAuth = MOBILE_HOST + "/kjy/live/agent/hasInviteAuth";