Merge branch 'master' into feat/20211014-xmc

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

@@ -81,7 +81,7 @@ public interface Authorization {
     }
 
     //访客A（志勇）授权，代理人指定中奖用户，ID：107
-    default void visitorAuth() {
+    default void visitorAuth1() {
         network.agentCookies.put("authKey", visitorAuth);
         System.out.println("用户AUTH_KEY：" + visitorAuth);
     }

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

@@ -15,7 +15,7 @@ public class Potential  implements Authorization {
     public String bizConfId;
 
     @BeforeClass
-    public void setUp() { visitorAuth(); }
+    public void setUp() { visitorAuth1(); }
 
     @Test(description = "直播间名片", priority =1)
     public void 直播间名片() {

src/test/java/com/kjj/cases/live/anchor/LiveVisitors.java

@@ -5,17 +5,14 @@ import com.alibaba.fastjson.JSONObject;
 import com.kjj.bean.manager.EvaluationDetail;
 import com.kjj.bean.resources.*;
 import com.kjj.cases.admin.Authorization;
-import com.kjj.cases.live.liveConfig.EvaluationConf;
 import com.kjj.cases.live.liveConfig.LiveMaterial;
 import com.kjj.config.BasicConfig;
 import com.kjj.constants.LiveConstants;
-import com.kjj.utils.BaseUtils;
 import com.kjj.utils.IdMakeUtil;
 import com.kjj.utils.JsonUtil;
 import com.kjj.utils.ThreadSleepUtils;
 import io.restassured.response.Response;
 import org.testng.Assert;
-import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
 import java.util.*;
@@ -71,7 +68,7 @@ public class LiveVisitors implements Authorization
     public void 访客端权益列表()
     {
         ThreadSleepUtils.sleep(3000);
-        visitorAuth();
+        visitorAuth1();
         Map<String, Object> params = new HashMap<>();
         params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
         Response response = network.getResponse(params, BasicConfig.MOBILE_Resource);
@@ -111,7 +108,7 @@ public class LiveVisitors implements Authorization
     @Test(description = "访客端表单资料查询", priority = 4)
     public ResourceForm 访客端系统表单资料查询()
     {
-        visitorAuth();
+        visitorAuth1();
         Map<String, Object> params = new HashMap<>();
         params.put("confId",confId_form);
         Response response = network.getResponse(params, BasicConfig.MOBILE_Form);
@@ -126,7 +123,7 @@ public class LiveVisitors implements Authorization
     @Test(description = "访客端表单资料提交", priority = 5)
     public void 访客端系统表单资料提交()
     {
-        visitorAuth();
+        visitorAuth1();
         ResourceForm list = 访客端系统表单资料查询();
         Map<String, Object> params = new HashMap<>();
         params.put("confId", confId_form);
@@ -168,7 +165,7 @@ public class LiveVisitors implements Authorization
     @Test(description = "访客端免费领资料查询", priority = 7)
     public void 访客端免费领资料查询()
     {
-        visitorAuth();
+        visitorAuth1();
         Map<String, Object> params = new HashMap<>();
         params.put("confId", confId_free);
         params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
@@ -182,7 +179,7 @@ public class LiveVisitors implements Authorization
     @Test(description = "访客端免费领资料领取", priority = 8)
     public void 访客端免费领资料领取()
     {
-        visitorAuth();
+        visitorAuth1();
         Map<String, Object> params = new HashMap<>();
         params.put("confId", confId_free);
         params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
@@ -212,7 +209,7 @@ public class LiveVisitors implements Authorization
     /*访客端参与测试权益*/
     @Test(description = "访客端获取测试权益详情", priority = 10)
     public void 访客端获取测试权益详情() {
-        visitorAuth();
+        visitorAuth1();
         ThreadSleepUtils.sleep(3000);
         Map<String, Object> evaDetailPar = new HashMap<>();
         evaDetailPar.put("confId", confId_eva);
@@ -311,7 +308,7 @@ public class LiveVisitors implements Authorization
 
     @Test(description = "访客领取关联测试表单", priority = 16)
     public void 访客领取关联测试表单() {
-        visitorAuth();
+        visitorAuth1();
         ResourceForm list = 访客端系统表单资料查询();
         Map<String, Object> params = new HashMap<>();
         params.put("confId", confId_formWithEva);
@@ -337,7 +334,7 @@ public class LiveVisitors implements Authorization
 
     @Test(description = "访客端获取关联测试表单权益详情", priority = 17)
     public void 访客端获取关联测试表单权益详情() {
-        visitorAuth();
+        visitorAuth1();
         Map<String, Object> params = new HashMap<>();
         params.put("confId",confId_formWithEva);
         Response response = network.getResponse(params, BasicConfig.MOBILE_Form);
@@ -356,7 +353,7 @@ public class LiveVisitors implements Authorization
 
     @Test(description = "访客端获取关联测试免费领权益详情", priority = 18)
     public void 访客端获取关联测试免费领权益详情() {
-        visitorAuth();
+        visitorAuth1();
         Map<String, Object> params = new HashMap<>();
         params.put("confId", confId_freeWithEva);
         params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
@@ -377,7 +374,7 @@ public class LiveVisitors implements Authorization
 
     @Test(description = "领取关联测试免费领", priority = 19)
     public void 领取关联测试免费领() {
-        visitorAuth();
+        visitorAuth1();
         Map<String, Object> params = new HashMap<>();
         params.put("confId", confId_freeWithEva);
         params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
@@ -392,7 +389,7 @@ public class LiveVisitors implements Authorization
     @Test(description = "访客端链接资料查询", priority = 20)
     public void 访客端链接小程序资料查询()
     {
-        visitorAuth();
+        visitorAuth1();
         Map<String, Object> params = new HashMap<>();
         params.put("confId", confId_link);
         Response response = network.getResponse(params, BasicConfig.MOBILE_Link1);
@@ -406,7 +403,7 @@ public class LiveVisitors implements Authorization
     @Test(description = "访客端链接资料领取", priority = 21)
     public void 访客端链接小程序资料领取()
     {
-        visitorAuth();
+        visitorAuth1();
         Map<String, Object> params = new HashMap<>();
         params.put("confId", confId_link);
         params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
@@ -533,7 +530,7 @@ public class LiveVisitors implements Authorization
     public void 访客获取贴片信息()
     {
         ThreadSleepUtils.sleep(1000);
-        visitorAuth();
+        visitorAuth1();
         Map<String, Object> params = new HashMap<>();
         params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
         Response response = network.getResponse(params, BasicConfig.MOBILE_pasterInfo);

src/test/java/com/kjj/cases/live/anchor/OpenLive.java

@@ -3,11 +3,13 @@ import com.kjj.cases.admin.Authorization;
 import com.kjj.config.BasicConfig;
 import com.kjj.constants.LiveConstants;
 import com.kjj.utils.ThreadSleepUtils;
-import com.sun.org.apache.xalan.internal.xsltc.trax.XSLTCSource;
 import io.restassured.response.Response;
 import org.testng.Assert;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -23,7 +25,7 @@ public class OpenLive implements Authorization {
     @Test(description = "结束直直播中或断流中的场次", priority = 1)
     public void 结束直直播中或断流中的场次() {
         int totalCount2 = 0;
-        long liveid = 0L;
+        long liveId = 0L;
         Map<String, Object> ConfDetailParam = new HashMap<>();
         ConfDetailParam.put("companyId", 101);
         ConfDetailParam.put("liveStatus", 3);
@@ -41,16 +43,16 @@ public class OpenLive implements Authorization {
             totalCount2 = ConfDetailRes.jsonPath().getInt("data.totalCount");
             if (totalCount2 == 1) {
                 System.out.println("有一场直播正在直播中");
-                liveid = ConfDetailRes.jsonPath().getLong("data.list.get(0).id");
+                liveId = ConfDetailRes.jsonPath().getLong("data.list.get(0).id");
             }
         }else{
             System.out.println("有一场直播正在断流中");
-            liveid = ConfDetailRes.jsonPath().getLong("data.list.get(0).id");
+            liveId = ConfDetailRes.jsonPath().getLong("data.list.get(0).id");
         }
         if(totalCount1 == 1 || totalCount2 == 1){
             adminAuth();
             Map<String, Object> closeParam = new HashMap<>();
-            closeParam.put("liveid", liveid);
+            closeParam.put("liveid", liveId);
             closeParam.put("cid", 101);
             Response closeRes = network.postResponse(closeParam, BasicConfig.ANCHOR_CLOSE);
             Object data = closeRes.jsonPath().getJsonObject("data");
@@ -82,4 +84,52 @@ public class OpenLive implements Authorization {
         Assert.assertNotNull(data, network.message(openParam, BasicConfig.ANCHOR_OPEN, "开启直播失败", openRes.body().asString()));
         ThreadSleepUtils.sleep(10000);
     }
+
+
+    public void connectSuccess() {
+        Map<String, Object> connectSuccessParam = new HashMap<>();
+        connectSuccessParam.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
+        Response response = network.getResponse(connectSuccessParam, BasicConfig.USER_connectSuccess);
+        boolean success = response.jsonPath().getBoolean("success");
+        Assert.assertTrue(success, network.message(connectSuccessParam, BasicConfig.USER_connectSuccess, "访客到场请求失败", response.body().asString()));
+    }
+
+    @Test(description = "用户到场", priority = 3)
+    public void 用户到场() throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
+        agentAuth();
+        connectSuccess();
+
+        visitorAuth1();
+        connectSuccess();
+
+        visitorAuth2();
+        connectSuccess();
+
+        visitorAuth3();
+        connectSuccess();
+
+        visitorAuth4();
+        connectSuccess();
+
+        visitorAuth5();
+        connectSuccess();
+
+        visitorAuth6();
+        connectSuccess();
+
+        visitorAuth7();
+        connectSuccess();
+
+        visitorAuth8();
+        connectSuccess();
+
+        visitorAuth9();
+        connectSuccess();
+
+        visitorAuth10();
+        connectSuccess();
+
+        visitorAuth11();
+        connectSuccess();
+    }
 }

src/test/java/com/kjj/cases/live/choice/Choice.java

@@ -105,7 +105,7 @@ public class Choice implements Authorization {
     public void 访客端获取正在答题中的选择题()
     {
         ThreadSleepUtils.sleep(5000);
-        visitorAuth();
+        visitorAuth1();
         Map<String, Object> params = new HashMap<>();
         params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
         Response response = network.getResponse(params, BasicConfig.MOBILE_GetChoiceQuestion);
@@ -122,7 +122,7 @@ public class Choice implements Authorization {
     @Test(description = "访客端提交答案", priority = 6)
     public void 访客端提交答案()
     {
-        visitorAuth();
+        visitorAuth1();
         Map<String, Object> params = new HashMap<>();
         params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
         params.put("answerId", answerid);
@@ -137,7 +137,7 @@ public class Choice implements Authorization {
     @Test(description = "访客端获取答案的数量", priority = 7)
     public void 访客端获取答案的数量()
     {
-        visitorAuth();
+        visitorAuth1();
         Map<String, Object> params = new HashMap<>();
         params.put("questionId", questionid);
         params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));

src/test/java/com/kjj/cases/live/customer/AfterLive.java

@@ -3,7 +3,6 @@ package com.kjj.cases.live.customer;
 import com.kjj.cases.admin.Authorization;
 import com.kjj.cases.live.agent.Agent;
 import com.kjj.cases.live.anchor.LiveVisitors;
-import com.kjj.cases.live.liveConfig.LiveMaterial;
 import com.kjj.cases.live.lottery.Lottery;
 import com.kjj.config.BasicConfig;
 import com.kjj.constants.LiveConstants;
@@ -21,7 +20,7 @@ public class AfterLive implements Authorization {
     private String encodeLiveId;
 
     @BeforeClass
-    public void SetUp(){ visitorAuth(); }
+    public void SetUp(){ visitorAuth1(); }
 
     // 获取访客直播结束页样式
     @Test(description = "获取访客直播结束页样式", priority = 1)

src/test/java/com/kjj/cases/live/customer/PersonalPage.java

@@ -28,7 +28,8 @@ public class PersonalPage implements Authorization {
     private String sourceRecordId; // 资料领取记录id
 
     @BeforeClass
-    public void setUp(){visitorAuth();
+    public void setUp(){
+        visitorAuth1();
         BaseUtils.ssoLogin();
     }
 

src/test/java/com/kjj/cases/live/guess/LiveGuess.java

@@ -145,7 +145,6 @@ public class LiveGuess implements Authorization {
         userDetailParam.put("confId",ConfId);
         Response response = network.postResponse(userDetailParam, BasicConfig.MOBILE_guess);
         HashMap data =response.jsonPath().getJsonObject("data");
-        System.out.println(data);
         Assert.assertNotNull(data, network.message(userDetailParam, BasicConfig.MOBILE_guess, "访客H第1次参与猜数字红包失败", response.body().asString()));
         this.guessMaxNum=(Integer) data.get("guessMaxNum");
         this.guessMinNum = (Integer) data.get("guessMinNum");

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

 package com.kjj.cases.live.liveConfig;
 
-import com.alibaba.fastjson.JSON;
 import com.kjj.bean.issue.SpokeList;
 import com.kjj.bean.issue.Spolist;
 import com.kjj.bean.issue.VoList;
@@ -49,7 +48,7 @@ public class Comment implements Authorization {
     //访客端
     @Test(description = "访客A发表评论", priority = 2)
     public void 访客A发表评论() {
-        visitorAuth();
+        visitorAuth1();
         Map<String, Object> Params = new HashMap<>();
         Params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
         Params.put("msg", "希望能好运");
@@ -126,7 +125,7 @@ public class Comment implements Authorization {
 
     @Test(description = "访客A获取历史所有评论", priority = 8)
     public void 访客A获取历史所有评论() {
-        visitorAuth();
+        visitorAuth1();
         sleep(20000);
         Map<String, Object> Params = new HashMap<>();
         Params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
@@ -146,7 +145,7 @@ public class Comment implements Authorization {
 
     @Test(description = "访客A获取实时评论", priority = 9)
     public void 访客A获取实时评论() {
-        visitorAuth();
+        visitorAuth1();
         Map<String, Object> Params = new HashMap<>();
         Params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
         Params.put("time", time);

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

+package com.kjj.cases.live.liveConfig;
+
+import com.kjj.cases.admin.Authorization;
+import com.kjj.config.BasicConfig;
+import com.kjj.constants.LiveConstants;
+import com.kjj.utils.BaseUtils;
+import com.kjj.utils.ThreadSleepUtils;
+import io.restassured.response.Response;
+import org.testng.Assert;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static com.kjj.config.BasicConfig.MOBILE_binding;
+import static com.kjj.config.BasicConfig.MOBILE_sign;
+import static com.kjj.utils.ThreadSleepUtils.sleep;
+
+public class LiveBinding implements Authorization {
+
+    @BeforeClass
+    public void setUp() {
+        BaseUtils.ssoLogin();
+    }
+
+    public String shareSign=null;
+
+    public void binding(String shareParam) {
+        Map<String, Object> bindingParam = new HashMap<>();
+        bindingParam.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
+        bindingParam.put("shareSign",shareParam);
+        Response bindingRes = network.postResponse(bindingParam, BasicConfig.MOBILE_binding);
+        boolean success = bindingRes.jsonPath().getJsonObject("success");
+        Assert.assertTrue(success, network.message(bindingParam, BasicConfig.MOBILE_binding, "绑定失败", bindingRes.body().asString()));
+    }
+
+    public void token() {
+        ThreadSleepUtils.sleep(2000);
+        Map<String, Object> tokenParam = new HashMap<>();
+        tokenParam.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
+        Response tokenRes = network.getResponse(tokenParam, BasicConfig.MOBILE_Token);
+        Integer type = tokenRes.jsonPath().getInt("data.type");
+        Assert.assertTrue(type==3, network.message(tokenParam, BasicConfig.MOBILE_Token, "未获取到绑定结果", tokenRes.body().asString()));
+    }
+
+    public String share() {
+        Map<String, Object> signParam = new HashMap<>();
+        signParam.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
+        signParam.put("shareType",1);
+        Response signRes = network.getResponse(signParam, BasicConfig.MOBILE_sign);
+        String data = signRes.jsonPath().getString("data");
+        Assert.assertNotNull(data, network.message(signParam, BasicConfig.MOBILE_sign, "分享失败", signRes.body().asString()));
+        return data;
+    }
+
+
+    /**
+     * 添加代理人绑定关系
+     */
+    @Test(description = "代理人绑定", priority = 1)
+    public void 代理人绑定() {
+        agentAuth();
+        binding(this.shareSign);;
+
+        agentAuth1();
+        binding(this.shareSign);;
+
+    }
+
+    @Test(description = "代理人A分享直播间", priority = 2)
+    public void 代理人A分享直播间() {
+        agentAuth();
+        this.shareSign=share();
+    }
+
+    @Test(description = "代理人A与访客A邀请关系绑定", priority = 3)
+    public void 代理人A与访客A邀请关系绑定() {
+        visitorAuth1();
+        binding(this.shareSign);
+        token();
+
+        visitorAuth9();
+        binding(this.shareSign);;
+        token();
+
+        visitorAuth10();
+        binding(this.shareSign);;
+        token();
+
+    }
+    //不同团队代理人绑定邀请关系
+    @Test(description = "代理人B分享直播间", priority = 4)
+    public void 代理人B分享直播间() {
+        agentAuth1();
+        this.shareSign =share();
+    }
+
+
+    @Test(description = "访客I关系绑定", priority = 5)
+    public void 访客I关系绑定() {
+        visitorAuth8();
+        binding(this.shareSign);;
+        token();
+    }
+
+    //用户任务完成
+    @Test(description = "访客H分享直播间", priority = 6)
+    public void 访客H分享直播间() {
+        visitorAuth9();
+        this.shareSign =share();
+
+    }
+    @Test(description = "访客邀请关系绑定", priority = 7)
+    public void 访客邀请关系绑定() {
+        visitorAuth22();
+        binding(this.shareSign);;
+        token();
+
+        visitorAuth25();
+        binding(this.shareSign);;
+        token();
+
+        visitorAuth2();
+        binding(this.shareSign);;
+        token();
+
+        visitorAuth11();
+        binding(this.shareSign);;
+        token();
+
+        visitorAuth12();
+        binding(this.shareSign);;
+        token();
+
+        visitorAuth13();
+        binding(this.shareSign);;
+        token();
+
+        visitorAuth16();
+        binding(this.shareSign);;
+        token();
+
+        visitorAuth17();
+        binding(this.shareSign);;
+        token();
+
+    }
+
+    @Test(description = "访客J_分享直播间", priority = 8)
+    public void 访客J_分享直播间() {
+        visitorAuth10();
+        this.shareSign = share();
+    }
+
+    @Test(description = "邀请Xmz关系绑定", priority = 9)
+    public void 邀请Xmz关系绑定() {
+        visitorAuth26();
+        binding(this.shareSign);;
+        token();
+    }
+
+
+    @Test(description = "访客A_分享直播间", priority = 10)
+    public void 访客A_分享直播间() {
+        visitorAuth1();
+        this.shareSign =share();
+
+    }
+
+    @Test(description = "邀请C关系绑定", priority = 11)
+    public void 邀请C关系绑定() {
+        visitorAuth3();
+        binding(this.shareSign);;
+        token();
+    }
+
+    @Test(description = "访客B直播中分享直播间", priority = 12)
+    public void 访客B直播中分享直播间() {
+        visitorAuth2();
+        this.shareSign =share();
+
+    }
+
+    @Test(description = "幸运任务邀请D关系绑定", priority = 13)
+    public void 幸运任务邀请D关系绑定() {
+        visitorAuth4();
+        binding(this.shareSign);;
+        token();
+
+        visitorAuth5();
+        binding(this.shareSign);;
+        token();
+
+        visitorAuth6();
+        binding(this.shareSign);;
+        token();
+
+        visitorAuth7();
+        binding(this.shareSign);;
+        token();
+    }
+
+    @Test(description = "访客M获取分享加密串", priority = 14)
+    public void 访客M获取分享加密串() {
+        visitorAuth13();
+        this.shareSign =share();
+
+    }
+    @Test(description = "访客M与访客N邀请关系绑定", priority = 15)
+    public void 访客M与访客N邀请关系绑定() {
+        visitorAuth14();
+        binding(this.shareSign);;
+        token();
+
+        visitorAuth18();
+        binding(this.shareSign);;
+        token();
+    }
+
+    @Test(description = "访客N获取分享加密串", priority = 16)
+    public void 访客N获取分享加密串() {
+        visitorAuth14();
+        this.shareSign =share();
+    }
+
+    @Test(description = "访客N与访客O邀请关系绑定", priority = 17)
+    public void 访客N与访客O邀请关系绑定() {
+        visitorAuth15();
+        binding(this.shareSign);;
+        token();
+    }
+}

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

@@ -25,7 +25,7 @@ public class RelativeLottery implements Authorization {
 
     @BeforeClass
     public void setUp(){
-            visitorAuth9();
+            visitorAuth10();
     }
 
     @Test(description = "查询亲友配置开启状态", priority = 1)
@@ -42,7 +42,7 @@ public class RelativeLottery implements Authorization {
 
     @Test(description = "仅一度用户可以领取抽奖券", priority = 2)
     public void 仅一度用户可以领取抽奖券() {
-        visitorAuth9();
+        visitorAuth10();
         Map<String, Object> getLiveAwardListParam = new HashMap<>();
         getLiveAwardListParam.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
         Response response = network.getResponse(getLiveAwardListParam, MOBILE_confLottery);
@@ -52,7 +52,7 @@ public class RelativeLottery implements Authorization {
         int receiverInfoList = response.jsonPath().getInt("data.userDetail.receiverInfoList.size()");
         int lotteryNum = response.jsonPath().getInt("data.confDetail.lotteryNum");
         Assert.assertEquals(isAcceptable, 1,network.message(getLiveAwardListParam, MOBILE_confLottery, "一度用户没有亲友券领取资格", response.body().asString()));
-        Assert.assertEquals(userAcceptStatus, 1,network.message(getLiveAwardListParam, MOBILE_confLottery, "一度用户已领取亲友券", response.body().asString()));
+        Assert.assertEquals(userAcceptStatus, 0,network.message(getLiveAwardListParam, MOBILE_confLottery, "一度用户未预约已领取亲友券", response.body().asString()));
         Assert.assertEquals(receiverInfoList, 0,network.message(getLiveAwardListParam, MOBILE_confLottery, "亲友配置券已接受人数错误", response.body().asString()));
         Assert.assertEquals(lotteryNum, 3,network.message(getLiveAwardListParam, MOBILE_confLottery, "亲友配置券数量错误", response.body().asString()));
         confId = response.jsonPath().getString("data.confDetail.id");
@@ -66,19 +66,35 @@ public class RelativeLottery implements Authorization {
         Assert.assertEquals(isAcceptable, 0,network.message(getLiveAwardListParam, MOBILE_confLottery, "非一度用户有亲友券领取资格", response.body().asString()));
     }
 
+    @Test(description = "访客J预约直播间", priority = 3)
+    public void 访客J预约直播间() {
+        visitorAuth10();
+        Map<String, Object> sycParam = new HashMap<>();
+        sycParam.put("bizId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
+        sycParam.put("bizType", 1);
+        List<Long> markIds1 = new ArrayList<>();
+        markIds1.add(142L);
+        markIds1.add(143L);
+        markIds1.add(140L);
+        sycParam.put("markIds", markIds1);
+        Response sycRes = network.postResponse(sycParam, BasicConfig.USER_SYCAPPOINTMENT);
+        Object data = sycRes.jsonPath().getJsonObject("data");
+        System.out.println(data);
+        Assert.assertNotNull(data, network.message(sycParam, BasicConfig.USER_SYCAPPOINTMENT, "预约失败", sycRes.body().asString()));
+    }
 
-    @Test(description = "访客H收下抽奖券", priority = 3)
-    public void 访客H收下抽奖券() {
-        visitorAuth9();
+    @Test(description = "访客H收下抽奖券", priority = 4)
+    public void 访客J收下抽奖券() {
+        visitorAuth10();
         Map<String, Object> bindingParam = new HashMap<>();
         bindingParam.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
         Response bindingRes = network.postResponse(bindingParam, MOBILE_acceptLottery);
         boolean success = bindingRes.jsonPath().getJsonObject("success");
-        Assert.assertTrue(success, network.message(bindingParam, MOBILE_acceptLottery, "绑定失败", bindingRes.body().asString()));
+        Assert.assertTrue(success, network.message(bindingParam, MOBILE_acceptLottery, "收下亲友券失败", bindingRes.body().asString()));
     }
 
-    @Test(description = "访客H_分享直播间", priority = 5)
-    public void 访客H_分享直播间() {
+    @Test(description = "访客J_分享直播间", priority = 5)
+    public void 访客J_分享直播间() {
         sleep(1000);
         Map<String, Object> signParam = new HashMap<>();
         signParam.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
@@ -103,8 +119,8 @@ public class RelativeLottery implements Authorization {
         Assert.assertEquals(mpShareTitle,"亲友抽奖券分享文案", network.message(params, BasicConfig.MOBILE_helpInfo, "根据分享类型获取分享内容", response.body().asString()));
     }
 
-    @Test(description = "访客H_获取小程序分享码", priority = 7)
-    public void 访客H_获取小程序分享码() {
+    @Test(description = "访客J_获取小程序分享码", priority = 7)
+    public void 访客J_获取小程序分享码() {
         sleep(1000);
         Map<String, Object> signParam = new HashMap<>();
         signParam.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
@@ -120,8 +136,8 @@ public class RelativeLottery implements Authorization {
         Assert.assertNotNull(qrCodeUrl, network.message(signParam, MOBILE_codeDetailLottery, "分享失败", response.body().asString()));
     }
 
-    @Test(description = "访客H获取直播所有的订阅消息模板", priority = 8)
-    public void 访客H获取直播所有的订阅消息模板() {
+    @Test(description = "访客J获取直播所有的订阅消息模板", priority = 8)
+    public void 访客J获取直播所有的订阅消息模板() {
         visitorAuth9();
         Map<String, Object> sycParam = new HashMap<>();
         sycParam.put("appid","wx4d7276f866bd24c8");
@@ -131,30 +147,6 @@ public class RelativeLottery implements Authorization {
         Assert.assertNotNull(data, network.message(sycParam, BasicConfig.USER_wxIdAllList, "获取订阅消息失败", sycRes.body().asString()));
     }
 
-    @Test(description = "邀请Xmz关系绑定", priority = 9)
-    public void 邀请Xmz关系绑定() {
-        visitorAuth26();
-        Map<String, Object> bindingParam = new HashMap<>();
-        bindingParam.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
-        bindingParam.put("shareSign", shareSign);
-        Response bindingRes = network.postResponse(bindingParam, MOBILE_binding);
-        boolean success = bindingRes.jsonPath().getJsonObject("success");
-        Assert.assertTrue(success, network.message(bindingParam, MOBILE_binding, "绑定失败", bindingRes.body().asString()));
-    }
-
-
-    @Test(description = "查询访客Xmz绑定结果和绑定凭证", priority = 10)
-    public void 查询访客Xmz绑定结果和绑定凭证() {
-        visitorAuth26();
-        sleep(2000);
-        Map<String, Object> tokenParam = new HashMap<>();
-        tokenParam.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
-        Response tokenRes = network.getResponse(tokenParam, BasicConfig.MOBILE_Token);
-        boolean success = tokenRes.jsonPath().getJsonObject("success");
-        Integer type = tokenRes.jsonPath().getInt("data.type");
-        Assert.assertTrue(type==3, network.message(tokenParam, BasicConfig.MOBILE_Token, "未获取到绑定结果", tokenRes.body().asString()));
-    }
-
     @Test(description = "访客A预约直播间", priority = 11)
     public void 访客A预约直播间() {
         visitorAuth26();
@@ -172,8 +164,8 @@ public class RelativeLottery implements Authorization {
         Assert.assertNotNull(data, network.message(sycParam, BasicConfig.USER_SYCAPPOINTMENT, "预约失败", sycRes.body().asString()));
     }
 
-    @Test(description = "访客Xmz给访客H助力", priority = 12)
-    public void 访客Xmz给访客H助力() {
+    @Test(description = "访客Xmz给访客J助力", priority = 12)
+    public void 访客Xmz给访客J助力() {
         visitorAuth26();
         sleep(2000);
         //获取授权配置助力弹窗
@@ -198,13 +190,15 @@ public class RelativeLottery implements Authorization {
 
     @Test(description = "查询亲友券被领取1张", priority = 13)
     public void 查询亲友券被领取1张() {
-        visitorAuth9();
+        visitorAuth10();
         Map<String, Object> getLiveAwardListParam = new HashMap<>();
         getLiveAwardListParam.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
         Response response = network.getResponse(getLiveAwardListParam, MOBILE_confLottery);
         System.out.println(response.body().asString());
+        int userAcceptStatus = response.jsonPath().getInt("data.userDetail.userAcceptStatus");
         int receiverInfoList = response.jsonPath().getInt("data.userDetail.receiverInfoList.size()");
         String nickname = response.jsonPath().getString("data.userDetail.receiverInfoList.get(0).nickname");
+        Assert.assertEquals(userAcceptStatus, 1,network.message(getLiveAwardListParam, MOBILE_confLottery, "一度用户未领取亲友券", response.body().asString()));
         Assert.assertEquals(receiverInfoList, 1,network.message(getLiveAwardListParam, MOBILE_confLottery, "亲友配置券已接受人数错误", response.body().asString()));
         Assert.assertEquals(nickname, "小米粥",network.message(getLiveAwardListParam, MOBILE_confLottery, "亲友配置券领取人错误", response.body().asString()));
     }

src/test/java/com/kjj/cases/live/lotteryCode/SignIn.java

@@ -21,7 +21,7 @@ import static com.kjj.config.BasicConfig.visitorAuth;
 
 public class SignIn implements Authorization {
     @BeforeClass
-    public void setUp() { visitorAuth(); }
+    public void setUp() { visitorAuth1(); }
 
     @Test(description = "访客签到", priority = 1)
     public void 访客签到() {
@@ -73,7 +73,7 @@ public class SignIn implements Authorization {
 
 
 
-    }
+}
 
 
 

src/test/java/com/kjj/cases/live/question/Question.java

@@ -2,14 +2,11 @@ package com.kjj.cases.live.question;
 
 import com.alibaba.fastjson.JSON;
 import com.kjj.bean.issue.QuestionList;
-import com.kjj.bean.issue.SpokeList;
-import com.kjj.bean.issue.Spolist;
 import com.kjj.bean.issue.issuelist;
 import com.kjj.cases.admin.Authorization;
 import com.kjj.config.BasicConfig;
 import com.kjj.constants.LiveConstants;
 import com.kjj.utils.JsonUtil;
-import com.kjj.utils.ThreadSleepUtils;
 import io.restassured.response.Response;
 import org.testng.Assert;
 import org.testng.annotations.Test;
@@ -74,7 +71,7 @@ public class Question implements Authorization {
     @Test(description = "访客端查询问题列表", priority = 4)
     public void 访客端查询问题列表()
     {
-        visitorAuth();
+        visitorAuth1();
         Map<String, Object> params = new HashMap<>();
         params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
         Response response = network.getResponse(params, BasicConfig.MOBILE_QuesClueList);
@@ -88,7 +85,7 @@ public class Question implements Authorization {
     @Test(description = "访客端发起问题", priority = 5)
     public void 访客端发起问题()
     {
-        visitorAuth();
+        visitorAuth1();
         Map<String, Object> params = new HashMap<>();
         params.put("questionId", questionId);
         params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
@@ -158,7 +155,7 @@ public class Question implements Authorization {
     @Test(description = "访客端公告查询", priority = 10)
     public void 访客端公告查询()
     {
-        visitorAuth();
+        visitorAuth1();
         Map<String, Object> params = new HashMap<>();
         params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
         Response response = network.getResponse(params, BasicConfig.MOBILE_ClueNotice);

src/test/java/com/kjj/cases/live/secondKill/SecondKill.java

@@ -8,7 +8,6 @@ import com.kjj.constants.LiveConstants;
 import com.kjj.utils.BaseUtils;
 import com.kjj.utils.IdMakeUtil;
 import com.kjj.utils.JsonUtil;
-import com.kjj.utils.ThreadSleepUtils;
 import io.restassured.response.Response;
 import org.testng.Assert;
 import org.testng.annotations.BeforeClass;
@@ -107,7 +106,7 @@ public class SecondKill implements Authorization {
      */
     @Test(description = "获取秒杀商品列表", priority = 7)
     public void 获取秒杀商品列表() {
-        visitorAuth();
+        visitorAuth1();
         Map<String, Object> goodsListPar = new HashMap<>();
         goodsListPar.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
         Response goodsListRes = network.getResponse(goodsListPar, BasicConfig.MOBILE_secondKill_getGoodsList);
@@ -187,8 +186,8 @@ public class SecondKill implements Authorization {
     // 切换访客
     @Test(description = "查看当前秒杀商品", priority = 11)
     public void 查看当前秒杀商品() {
-        visitorAuth();
-        sleep(3000);
+        visitorAuth1();
+        sleep(10000);
         Map<String, Object> goodsFirstPar = new HashMap<>();
         goodsFirstPar.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
         Response goodsFirstRes = network.getResponse(goodsFirstPar, BasicConfig.MOBILE_secondKill_goodsFirst);
@@ -225,6 +224,8 @@ public class SecondKill implements Authorization {
     @Test(description = "代理人下单", priority = 13)
     public void 代理人下单() {
         agentAuth();
+
+        sleep(5000);
         Map<String, Object> orderPar = new HashMap<>();
         orderPar.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
         orderPar.put("confId", ConfSecondKill.skIdFirst);
@@ -332,7 +333,7 @@ public class SecondKill implements Authorization {
      */
     @Test(description = "正常用户下单", priority = 19)
     public void 正常用户下单() {
-        visitorAuth();
+        visitorAuth1();
         Map<String, Object> orderPar = new HashMap<>();
         orderPar.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
         orderPar.put("confId", ConfSecondKill.skIdFirst);
@@ -376,7 +377,7 @@ public class SecondKill implements Authorization {
 
     @Test(description = "正常用户下单0元秒杀商品", priority = 21)
     public void 正常用户下单0元秒杀商品() {
-        visitorAuth();
+        visitorAuth1();
         Map<String, Object> orderPar = new HashMap<>();
         orderPar.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
         orderPar.put("confId", ConfSecondKill.skIdThird);
@@ -588,7 +589,7 @@ public class SecondKill implements Authorization {
 
     @Test(description = "用户下单无库存秒杀失败", priority = 29)
     public void 用户下单无库存秒杀() {
-        visitorAuth();
+        visitorAuth1();
         Map<String, Object> orderPar = new HashMap<>();
         orderPar.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
         orderPar.put("confId", ConfSecondKill.skIdSecond);
@@ -751,7 +752,7 @@ public class SecondKill implements Authorization {
 
     @Test(description = "用户成功支付", priority = 34)
     public void 用户成功支付() {
-        visitorAuth();
+        visitorAuth1();
         // 新建订单
         Map<String, Object> orderPar = new HashMap<>();
         orderPar.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));

src/test/java/com/kjj/cases/live/treasure/TimeRed.java

@@ -416,7 +416,6 @@ public class TimeRed  implements Authorization {
         ThreadSleepUtils.sleep(3000);
         Response redRes = network.postResponse(Params, BasicConfig.ANCHOR_redOpen);
         boolean data1 = redRes.jsonPath().getBoolean("data");
-        System.out.println(data1);
         Assert.assertTrue(data1, network.message(Params, BasicConfig.ANCHOR_redOpen, "访客I开启第4轮红包失败", redRes.body().asString()));
     }
 
@@ -430,9 +429,7 @@ public class TimeRed  implements Authorization {
         ThreadSleepUtils.sleep(3000);
         Response response = network.getResponse(Params, BasicConfig.ANCHOR_openState);
         Object data =response.jsonPath().getJsonObject("data");
-        System.out.println(data);
         Integer state = response.jsonPath().getInt("data.state");
-        System.out.println(state);
         Assert.assertTrue(state==2, network.message(Params, BasicConfig.ANCHOR_openState, "访客H未领取第4轮红包", response.body().asString()));
 
         visitorAuth8();
@@ -499,7 +496,6 @@ public class TimeRed  implements Authorization {
         ThreadSleepUtils.sleep(3000);
         Response response = network.postResponse(Params, BasicConfig.ANCHOR_redOpen);
         boolean data = response.jsonPath().getBoolean("data");
-        System.out.println(data);
         Assert.assertTrue(data, network.message(Params, BasicConfig.ANCHOR_redOpen, "访客H开启第4轮红包失败", response.body().asString()));
 
         visitorAuth8();

src/test/java/com/kjj/utils/NetworkUtils.java

@@ -60,6 +60,7 @@ public class NetworkUtils {
         if (!Objects.equals(response.statusCode(),200)){
             System.out.println("请求状态码错误，path=【"+path+"】 code=【"+response.statusCode()+"】");
         }
+        System.out.println(response.body().asString());
         return response;
     }
 
@@ -73,6 +74,7 @@ public class NetworkUtils {
         if (!Objects.equals(response.statusCode(),200)){
             System.out.println("请求状态码错误，path=【"+path+"】 code=【"+response.statusCode()+"】");
         }
+        System.out.println(response.body().asString());
         return response;
     }
 
@@ -85,6 +87,7 @@ public class NetworkUtils {
         if (!Objects.equals(response.statusCode(),200)){
             System.out.println("请求状态码错误，path=【"+path+"】 code=【"+response.statusCode()+"】");
         }
+        System.out.println(response.body().asString());
         return response;
     }
 
@@ -99,6 +102,7 @@ public class NetworkUtils {
         if (!Objects.equals(response.statusCode(),200)){
             System.out.println("请求状态码错误，path=【"+path+"】 code=【"+response.statusCode()+"】");
         }
+        System.out.println(response.body().asString());
         return response;
     }
 
@@ -111,6 +115,7 @@ public class NetworkUtils {
         if (!Objects.equals(response.statusCode(),200)){
             System.out.println("请求状态码错误，path=【"+path+"】 code=【"+response.statusCode()+"】");
         }
+        System.out.println(response.body().asString());
         return response;
     }
 

src/test/liveTestNG.xml

@@ -35,6 +35,12 @@
             <class name="com.kjj.cases.live.secondKill.ConfSecondKill"/>
         </classes>
     </test>
+
+    <test preserve-order="true" name="绑定关系绑定">
+        <classes>
+            <class name="com.kjj.cases.live.liveConfig.LiveBinding"/>
+        </classes>
+    </test>
     <test preserve-order="true" name="配置代理人邀约奖励">
         <classes>
             <class name="com.kjj.cases.live.inviteReward.ManagerRewardConf"/>
@@ -121,6 +127,12 @@
         </classes>
     </test>
 
+    <test preserve-order="true" name="访客签到">
+        <classes>
+            <class name="com.kjj.cases.live.lotteryCode.SignIn"/>
+        </classes>
+    </test>
+
     <test preserve-order="true" name="评论及回复">
         <classes>
             <class name="com.kjj.cases.live.liveConfig.Comment"/>
@@ -132,12 +144,6 @@
         </classes>
     </test>
 
-    <test preserve-order="true" name="访客签到">
-        <classes>
-            <class name="com.kjj.cases.live.lotteryCode.SignIn"/>
-        </classes>
-    </test>
-
     <test preserve-order="true" name="直播中抽奖">
         <classes>
             <class name="com.kjj.cases.live.lottery.Lottery"/>