Merge branch 'master' into feat/20211015-xmc

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

@@ -115,18 +115,21 @@ public class Agent implements Authorization {
 
     @Test(description = "获取直播列表 ", priority = 7)
     public void 获取直播列表() {
-
         Map<String, Object> params = new HashMap<>();
         params.put("pageIndex", 1);
-        params.put("pageSize", 10);
+        params.put("pageSize", 20);
         Response response = network.getResponse(params, BasicConfig.MOBILE_Procurator);
         List<AgentBean> agentBeans = JsonUtil.parseResponseToPageBean(response, AgentBean.class);
         if (agentBeans.size() > 0) {
-            AgentBean bean = agentBeans.get(0);
-            System.out.println(JSON.toJSONString(agentBeans));
-            Assert.assertNotNull(bean, network.message(params, BasicConfig.MOBILE_Procurator, "查询直播列表失败", response.body().asString()));
-            // 判断代理人邀约奖励openFlag是否为开
-            Assert.assertEquals(bean.getAgentAwardOpenFlag(), 1, network.message(params, MOBILE_Procurator, "代理人邀约奖励开启状态错误", response.body().asString()));
+            for (AgentBean item:agentBeans) {
+                if(item.getLiveId().equals(LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()))){
+                    System.out.println(JSON.toJSONString(item));
+                    Assert.assertNotNull(item, network.message(params, BasicConfig.MOBILE_Procurator, "查询直播列表失败", response.body().asString()));
+                    // 判断代理人邀约奖励openFlag是否为开
+                    Assert.assertEquals(item.getAgentAwardOpenFlag(), 1, network.message(params, MOBILE_Procurator, "代理人邀约奖励开启状态错误", response.body().asString()));
+                    break;
+                }
+            }
         }
     }
 

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

@@ -104,7 +104,7 @@ public class LiveBinding implements Authorization {
         token();
     }
 
-    //用户任务完成
+
     @Test(description = "访客H分享直播间", priority = 6)
     public void 访客H分享直播间() {
         visitorAuth9();

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

@@ -316,8 +316,8 @@ public class Lottery implements Authorization {
 
     }
 
-    @Test(description = "访客B获取好运红包领取记录", priority = 28)
-    public void 访客B获取好运红包领取记录() {
+    @Test(description = "访客M获取好运红包领取", priority = 28)
+    public void 访客M获取好运红包领取() {
         visitorAuth13();
         ThreadSleepUtils.sleep(2000);
         Map<String, Object> Params = new HashMap<>();
@@ -333,12 +333,12 @@ public class Lottery implements Authorization {
         response = network.getResponse(Params, BasicConfig.MOBILE_receiveRecord);
         System.out.println( response.body().asString());
         Object data = response.jsonPath().getJsonObject("data");
-        Assert.assertNull(data, network.message(Params, BasicConfig.MOBILE_receiveRecord, "访客B获取好运红包领取记录不为空", response.body().asString()));
+        Assert.assertNull(data, network.message(Params, BasicConfig.MOBILE_receiveRecord, "访客M获取好运红包领取记录为空", response.body().asString()));
 
     }
 
-    @Test(description = "访客B领取好运红包", priority = 29)
-    public void 访客B领取好运红包() {
+    @Test(description = "访客M领取好运红包", priority = 29)
+    public void 访客M领取好运红包() {
         visitorAuth13();
         Map<String, Object> Params = new HashMap<>();
         Params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
@@ -346,12 +346,12 @@ public class Lottery implements Authorization {
         Response response = network.postResponse(Params, BasicConfig.MOBILE_receiverOpen);
         System.out.println( response.body().asString());
         boolean data = response.jsonPath().getBoolean("data");
-        Assert.assertTrue(data, network.message(Params, BasicConfig.MOBILE_receiverOpen, "访客B领取好运红包失败", response.body().asString()));
+        Assert.assertTrue(data, network.message(Params, BasicConfig.MOBILE_receiverOpen, "访客M领取好运红包失败", response.body().asString()));
 
     }
 
-    @Test(description = "访客B参与记录", priority = 30)
-    public void 访客B参与记录() {
+    @Test(description = "访客M参与记录", priority = 30)
+    public void 访客M参与记录() {
         visitorAuth13();
         ThreadSleepUtils.sleep(3000);
         Map<String, Object> Params = new HashMap<>();
@@ -368,8 +368,8 @@ public class Lottery implements Authorization {
 
     }
 
-    @Test(description = "访客A获取好运红包领取记录", priority = 31)
-    public void 访客A获取好运红包领取记录() {
+    @Test(description = "访客M获取好运红包领取记录", priority = 31)
+    public void 访客M获取好运红包领取记录() {
         visitorAuth13();
         ThreadSleepUtils.sleep(500);
         Map<String, Object> Params = new HashMap<>();
@@ -1095,8 +1095,8 @@ public class Lottery implements Authorization {
 
 
     //不在公司指定区域内的用户
-    @Test(description = "团队指定访客F是否中奖", priority = 92)
-    public void 团队指定访客F是否中奖() {
+    @Test(description = "团队指定访客非区域F是否中奖", priority = 92)
+    public void 非团队指定访客F是否中奖() {
         visitorAuth6();
         ThreadSleepUtils.sleep(3000);
         Map<String, Object> hasEndParam = new HashMap<>();

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

@@ -266,13 +266,14 @@ public class BasicConfig {
   public static final String MOBILE_finishStatus= MOBILE_HOST + "/kjy/live/flip/word/user/finishStatus";
   public static final String MOBILE_redOpen= MOBILE_HOST + "/kjy/live/flip/word/red/open";
   public static final String MOBILE_redOpenState= MOBILE_HOST + "/kjy/live/flip/word/red/open/state";
-  public static final String MOBILE_abort= MOBILE_HOST + "/kjy/live/flip/word/red/abort";
   public static final String MOBILE_appointment= MOBILE_HOST + "/kjy/live/user/appointment";
   public static final String MOBILE_tasks= MOBILE_HOST + "/kjy/live/flip/word/user/tasks";
   public static final String MOBILE_record= MOBILE_HOST + "/kjy/live/flip/word/user/record";
   public static final String MOBILE_turn= MOBILE_HOST + "/kjy/live/flip/word/turn";
   public static final String MOBILE_turnState= MOBILE_HOST + "/kjy/live/flip/word/turn/state";
   public static final String MOBILE_confV2= MOBILE_HOST +"/kjy/live/flip/word/conf/v2";
+  public static final String MOBILE_userLucky= MOBILE_HOST +"/kjy/live/flip/word/user/lucky";
+  public static final String MOBILE_helpDetail= MOBILE_HOST + "/kjy/live/flip/word/user/helpDetail";
   // ***************  直播间过渡视频  ***************
   public static final String MANAGER_confCaveOrUpdate = MANAGER_HOST + "/kjy/manager/live/trans/video/conf/saveOrUpdate";
   public static final String MANAGER_videoSwitch = MANAGER_HOST + "/kjy/manager/live/trans/video/conf/status/switch";