Merge branch 'master' into feature/20211020-xmc

src/test/java/com/kjj/bean/agent/AgentBean.java

@@ -21,4 +21,6 @@ public class AgentBean {
     private String  companyLogo;
     private Long    appointmentNum;
     private int   inviteAuthStatus;
+    private int agentAwardOpenFlag; // 是否开启代理人邀约奖励
+    private int agentNeedInviteNum; // 还需邀请多少人才能开启红包
 }

src/test/java/com/kjj/bean/issue/Dialogue.java

@@ -10,19 +10,15 @@ public class Dialogue {
     private String agentConclusion;
     private String agentGreet;
     private String promiseTitle;
-    private String promiseDesc;
     private String promiseButton;
-    private String customerActionPromise;
     private int inviteType;
 
-    public Dialogue(ArrayList<String> quesList, String agentConclusion, String agentGreet, String promiseTitle, String promiseDesc, String promiseButton, String customerActionPromise, int inviteType) {
+    public Dialogue(ArrayList<String> quesList, String agentConclusion, String agentGreet, String promiseTitle, String promiseButton, int inviteType) {
         this.quesList = quesList;
         this.agentConclusion = agentConclusion;
         this.agentGreet = agentGreet;
         this.promiseTitle = promiseTitle;
-        this.promiseDesc = promiseDesc;
         this.promiseButton = promiseButton;
-        this.customerActionPromise = customerActionPromise;
         this.inviteType = inviteType;
     }
 }

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/assistant/homePage/HomePage.java

@@ -38,6 +38,7 @@ public class HomePage implements Authorization {
     public String visitId;          //用户的visitId
     public String activityScid;          //测评对应的scid
     public long articleId;          //解密后的的文章id
+    public int totalCount;        //视频数量
 
     @BeforeClass
     public void setUp() {
@@ -289,8 +290,8 @@ public class HomePage implements Authorization {
         params.put("secondTagId",724); //二级标签
         params.put("contentType","video");
         Response response = network.getResponse(params,HOME_getContentList);
-        Object obj = response.jsonPath().getJsonObject("data.totalCount");
-        Assert.assertEquals(obj,3,network.message(params,HOME_getContentList,"获取首页视频列表失败",response.body().asString()));
+        totalCount = response.jsonPath().getInt("data.totalCount");
+        Assert.assertTrue(totalCount>0,network.message(params,HOME_getContentList,"获取首页视频列表失败",response.body().asString()));
     }
 
     //验证视频是否下架成功
@@ -313,8 +314,8 @@ public class HomePage implements Authorization {
         params.put("secondTagId",724);
         params.put("contentType","video");
         Response response = network.getResponse(params,HOME_getContentList);
-        Object obj = response.jsonPath().getJsonObject("data.totalCount");
-        Assert.assertEquals(obj,2,network.message(params,HOME_getContentList,"获取首页视频列表失败",response.body().asString()));
+        int obj = response.jsonPath().getInt("data.totalCount");
+        Assert.assertEquals(obj,totalCount-1,network.message(params,HOME_getContentList,"获取首页视频列表失败",response.body().asString()));
     }
 
     //管理后台新增公司专区内容

src/test/java/com/kjj/cases/assistant/markettools/GameLottery.java

@@ -150,7 +150,7 @@ public class GameLottery implements Authorization {
         //获取客户列表
         Map<String, Object> params = new HashMap<String, Object>();
         params.put("pageIndex",1);
-        params.put("pageSize",20);
+        params.put("pageSize",50);
         params.put("visitorNickname","");
         Response response = network.getResponse(params, LOTTERRY_customerList);
         boolean success = response.jsonPath().getBoolean("success");
@@ -298,7 +298,7 @@ public class GameLottery implements Authorization {
     @Test(description="访客_打开抽奖链接",priority = 13)
     public void 访客_打开抽奖链接(){
         //切换为访客-请勿打扰
-        // userTku1();
+         userTku1();
 
         //添加访问记录
         Map<String, Object> params = new HashMap<String, Object>();
@@ -362,7 +362,7 @@ public class GameLottery implements Authorization {
         int state = response.jsonPath().getInt("data.state");
         int prizeType = response.jsonPath().getInt("data.prizeType");
         Assert.assertTrue(state==2,network.message(params,LOTTERRY_getOrderStatus,"订单出奖状态错误",response.body().asString()));
-        Assert.assertTrue(prizeType==1 || prizeType==2,network.message(params,LOTTERRY_getOrderStatus,"抽奖结果错误",response.body().asString()));
+        Assert.assertTrue(prizeType==1 || prizeType==2|| prizeType==4,network.message(params,LOTTERRY_getOrderStatus,"抽奖结果错误",response.body().asString()));
     }
 
     @Test(description="访客_指定客户中奖",priority = 15)
@@ -550,7 +550,7 @@ public class GameLottery implements Authorization {
     @Test(description="访客_第二个客户未中奖",priority = 21)
     public void 访客_第二个客户未中奖(){
         //切换为请勿打扰
-        // userTku1();
+         userTku1();
 
         //添加访问记录
         Map<String, Object> params = new HashMap<String, Object>();
@@ -588,7 +588,7 @@ public class GameLottery implements Authorization {
         int state = response.jsonPath().getInt("data.state");
         int prizeType = response.jsonPath().getInt("data.prizeType");
         Assert.assertTrue(state==2,network.message(params,LOTTERRY_getOrderStatus,"订单出奖状态错误",response.body().asString()));
-        Assert.assertTrue(prizeType==1 || prizeType==2,network.message(params,LOTTERRY_getOrderStatus,"抽奖结果错误",response.body().asString()));
+        Assert.assertTrue(prizeType==1 || prizeType==2|| prizeType==4,network.message(params,LOTTERRY_getOrderStatus,"抽奖结果错误",response.body().asString()));
     }
 
     @Test(description="代理人_查询发起抽奖列表",priority = 22)

src/test/java/com/kjj/cases/assistant/pay/Pay.java

@@ -253,5 +253,5 @@ public class Pay implements Authorization {
     }
 
 
-    }
+}
 

src/test/java/com/kjj/cases/assistant/whoSawMe/ForwardAndRead.java

@@ -22,7 +22,6 @@ public class ForwardAndRead implements Authorization {
     private String articleScId;
     private Long sellerId;
     private String jjvisitId;
-    private String insuranceId;
     private long forwardTime;
     private String questionId;
     public static Map<String, Integer> custClueStatistics;
@@ -42,11 +41,9 @@ public class ForwardAndRead implements Authorization {
         param.put("userId", userId);
         response = network.getResponse(param, BasicConfig.CLUESTATISTICS);
         int drawMaterial = response.jsonPath().getInt("data.drawMaterial");
-        int drawPresentInsuranceCount = response.jsonPath().getInt("data.drawPresentInsuranceCount");
         int grassCount = response.jsonPath().getInt("data.grassCount");
         int visitCount = response.jsonPath().getInt("data.visitCount");
         custClueStatistics.put("drawMaterial", drawMaterial);
-        custClueStatistics.put("drawPresentInsuranceCount", drawPresentInsuranceCount);
         custClueStatistics.put("grassCount", grassCount);
         custClueStatistics.put("visitCount", visitCount);
     }
@@ -99,28 +96,6 @@ public class ForwardAndRead implements Authorization {
         Assert.assertNotNull(jjvisitId, network.message(param, BasicConfig.CONTENT_READ, "visitId为空", response.body().asString()));
     }
 
-    @Test(description = "访客领取赠险", priority = 5)
-    public void 领取赠险() throws IOException{
-        // 获取赠险insuranceId
-        param = new HashMap<>();
-        param.put("scid", articleScId);
-        response = network.getResponse(param, BasicConfig.SELLERCARD_RECOMMENDLISTV3);
-        Assert.assertTrue(response.jsonPath().getBoolean("success"), network.message(param, BasicConfig.SELLERCARD_RECOMMENDLISTV3, "接口调用失败", response.body().asString()));
-        insuranceId = response.jsonPath().getString("data.insuranceVos[0].id");
-
-        // 领取赠险
-        param = new HashMap<>();
-        param.put("clueTypeName", "WELFARE_INSURANCE");
-        param.put("insuranceId", insuranceId);
-        param.put("locationSource", 1);
-        param.put("scId", articleScId);
-        param.put("sourceId", articleScId);
-        param.put("sourceType", 1);
-        response = network.postResponse(param, BasicConfig.SELLERCARD_SENDPUSHFORSCAN);
-        Assert.assertTrue(response.jsonPath().getBoolean("success"), network.message(param, BasicConfig.SELLERCARD_SENDPUSHFORSCAN, "接口调用失败", response.body().asString()));
-        String data = response.jsonPath().getString("data");
-        Assert.assertEquals(data, "success", network.message(param, BasicConfig.SELLERCARD_SENDPUSHFORSCAN, "领取赠险失败", response.body().asString()));
-    }
 
     @Test(description = "访客转发文章", priority = 6)
     public void 访客转发文章()  throws IOException{
@@ -151,22 +126,6 @@ public class ForwardAndRead implements Authorization {
         Assert.assertTrue(response.jsonPath().getBoolean("success"), network.message(param, BasicConfig.CONTENT_READ, "接口调用失败", response.body().asString()));
     }
 
-    // 新用户领取赠险
-    @Test(description = "新用户领取赠险", priority = 8)
-    public void 新用户领取赠险() throws IOException{
-        param.clear();
-        param.put("clueTypeName", "WELFARE_INSURANCE");
-        param.put("insuranceId", insuranceId);
-        param.put("locationSource", 1);
-        param.put("scId", articleScId);
-        param.put("sourceId", articleScId);
-        param.put("sourceType", 1);
-        response = network.postResponse(param, BasicConfig.SELLERCARD_SENDPUSHFORSCAN);
-        System.out.println(response.body().asString());
-        String data = response.jsonPath().getString("data");
-        Assert.assertEquals(data, "success", network.message(param, BasicConfig.SELLERCARD_SENDPUSHFORSCAN, "领取赠险失败", response.body().asString()));
-    }
-
     @Test(description = "二度访客阅读文章", priority = 9)
     public void 二度访客阅读文章() throws IOException{
         ThreadSleepUtils.sleep(5000);
@@ -190,21 +149,6 @@ public class ForwardAndRead implements Authorization {
         Assert.assertTrue(response.jsonPath().getBoolean("data"), network.message(param, BasicConfig.DYNAMIC_ADDVISIT, "添加访问记录失败", response.body().asString()));
     }
 
-    @Test(description = "二度访客领取赠险", priority = 11)
-    public void 二度访客领取赠险() throws IOException{
-        param = new HashMap<>();
-        param.put("clueTypeName", "WELFARE_INSURANCE");
-        param.put("insuranceId", insuranceId);
-        param.put("locationSource", 1);
-        param.put("scId", articleScId);
-        param.put("sourceId", articleScId);
-        param.put("sourceType", 1);
-        response = network.postResponse(param, BasicConfig.SELLERCARD_SENDPUSHFORSCAN);
-        Assert.assertTrue(response.jsonPath().getBoolean("success"), network.message(param, BasicConfig.SELLERCARD_SENDPUSHFORSCAN, "接口调用失败", response.body().asString()));
-        String data = response.jsonPath().getString("data");
-        Assert.assertEquals(data, "success", network.message(param, BasicConfig.SELLERCARD_SENDPUSHFORSCAN, "领取赠险失败", response.body().asString()));
-    }
-
     @Test(description = "获取文章FAQs", priority = 12)
     public void 获取文章FAQs() throws IOException{
         param.clear();

src/test/java/com/kjj/cases/assistant/whoSawMe/MyCustomer.java

@@ -355,11 +355,9 @@ public class MyCustomer implements Authorization {
         response = network.getResponse(param, BasicConfig.CLUESTATISTICS);
         Assert.assertTrue(response.jsonPath().getBoolean("success"), network.message(param, BasicConfig.CLUESTATISTICS, "接口请求失败", response.body().asString()));
         ClueStatistics clueStatistics = JsonUtil.parseResponseToBean(response, ClueStatistics.class);
-        int drawPresentInsuranceCount = clueStatistics.getDrawPresentInsuranceCount();
         int grassCount = clueStatistics.getGrassCount();
         int visitCount = clueStatistics.getVisitCount();
         int drawMaterial = clueStatistics.getDrawMaterial();
-        Assert.assertEquals(drawPresentInsuranceCount, ForwardAndRead.custClueStatistics.get("drawPresentInsuranceCount") + 1, network.message(param, BasicConfig.CLUESTATISTICS, "访客领取赠险记录次数未正确增加", response.body().asString()));
         Assert.assertEquals(grassCount, ForwardAndRead.custClueStatistics.get("grassCount") + 1, network.message(param, BasicConfig.CLUESTATISTICS, "访客阅读种草文章记录次数未正确增加", response.body().asString()));
         Assert.assertEquals(visitCount, ForwardAndRead.custClueStatistics.get("visitCount") + 1, network.message(param, BasicConfig.CLUESTATISTICS, "访客来访记录次数未正确增加", response.body().asString()));
         Assert.assertEquals(drawMaterial, ForwardAndRead.custClueStatistics.get("drawMaterial") + 1, network.message(param, BasicConfig.CLUESTATISTICS, "访客领取资料次数未正确增加", response.body().asString()));
@@ -405,7 +403,7 @@ public class MyCustomer implements Authorization {
         String contentId = recordsOfContent.getContentId();
         int clueType = recordsOfClue.getClueType();
         Assert.assertEquals(contentId, BasicConfig.ARTICLE_CONTENTID, network.message(param ,BasicConfig.CUSTVISITLIST, "访问记录详情有误", response.body().asString()));
-        Assert.assertEquals(clueType, 31, network.message(param, BasicConfig.CUSTVISITLIST, "访问记录详情有误", response.body().asString()));
+        Assert.assertEquals(clueType, 29, network.message(param, BasicConfig.CUSTVISITLIST, "访问记录详情有误", response.body().asString()));
     }
 
     // 客户线索跟进

src/test/java/com/kjj/cases/assistant/whoSawMe/WhoSawMe.java

@@ -144,7 +144,7 @@ public class WhoSawMe implements Authorization {
         Assert.assertTrue(success, network.message(BasicConfig.VISITHEADER, "接口请求失败", response.body().asString()));
         int todayClueNum = response.jsonPath().getInt("data.todayClueNum");
         int todayVisitNum = response.jsonPath().getInt("data.todayVisitNum");
-        Assert.assertTrue(todayClueNum >= 2, network.message(BasicConfig.VISITHEADER, "获取今日线索数有误", response.body().asString()));
+        Assert.assertTrue(todayClueNum >= 0, network.message(BasicConfig.VISITHEADER, "获取今日线索数有误", response.body().asString()));
         Assert.assertTrue(todayVisitNum >= 2, network.message(BasicConfig.VISITHEADER, "获取今日访问数有误", response.body().asString()));
     }
 
@@ -842,7 +842,7 @@ public class WhoSawMe implements Authorization {
         int visitClueType = response.jsonPath().getInt("data.visitClueType");
         Long custUserId = response.jsonPath().getLong("data.custUserId");
         String contentScid = response.jsonPath().getString("data.fromContent.scid");
-        Assert.assertEquals(visitClueType, 31, network.message(param, BasicConfig.CLUEINFO, "线索类型错误", response.body().asString()));
+        Assert.assertEquals(visitClueType, 29, network.message(param, BasicConfig.CLUEINFO, "线索类型错误", response.body().asString()));
         Assert.assertEquals(custUserId, ForwardAndRead.decodeTku(VISITOR1_TKU).get("userId"), network.message(param, BasicConfig.CLUEINFO, "线索来源访客userId错误", response.body().asString()));
         Assert.assertEquals(contentScid, ForwardAndRead.getContentScId(BasicConfig.ARTICLE_CONTENTID), network.message(param, BasicConfig.CLUEINFO, "线索来源素材id错误", response.body().asString()));
     }

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

@@ -115,16 +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()));
+            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/agent/Customer.java

@@ -23,15 +23,19 @@ public class Customer implements Authorization {
 
     @Test(description = "客户数量统计", priority = 1)
     public void 客户数量统计() {
-        Response response = network.getResponse(BasicConfig.MOBILE_potentialCount);
-        System.out.println(response.body().asString());
-        int sumCount=response.jsonPath().getInt("data.sumCount");
-        Assert.assertTrue(sumCount>26, network.message(BasicConfig.MOBILE_potentialCount, "总客户数量不对", response.body().asString()));
-        int lastLiveCount = response.jsonPath().getJsonObject("data.lastLiveCount");
-        Assert.assertTrue(lastLiveCount>1, network.message(BasicConfig.MOBILE_potentialCount, "最近一场直播客户数量为null", response.body().asString()));
-        int potentialCount = response.jsonPath().getJsonObject("data.potentialCount");
-        Assert.assertTrue(potentialCount>1, network.message(BasicConfig.MOBILE_potentialCount, "准客户数量为null", response.body().asString()));
-        lastLiveId=response.jsonPath().getString("data.lastLiveId");
+        Response cusStatRes = network.getResponse(BasicConfig.MOBILE_cusStat);
+        try{
+            int total = cusStatRes.jsonPath().getInt("data.totalCustomer");
+            int award = cusStatRes.jsonPath().getInt("data.awardNum");
+            int purchase = cusStatRes.jsonPath().getInt("data.purchaseNum");
+            int indirectNum = cusStatRes.jsonPath().getInt("data.indirectNum");
+            if (total < 0 || award < 0 || purchase < 0 || indirectNum < 0){
+                Assert.fail(network.message(BasicConfig.MOBILE_cusStat, "客户数量有误", cusStatRes.body().asString()));
+            }
+        }catch (NullPointerException e){
+            e.printStackTrace();
+            Assert.fail(network.message(BasicConfig.MOBILE_cusStat, "获取数据失败", cusStatRes.body().asString()));
+        }
 
     }
     @Test(description = "代理人最近一场直播客户列表", priority = 2)
@@ -76,8 +80,28 @@ public class Customer implements Authorization {
 
     }
 
+    @Test(description = "查询代理人转介绍客户列表", priority = 5)
+    public void 查询代理人转介绍客户列表() {
+        Map<String, Object> custListPar = new HashMap<>();
+        custListPar.put("actionTypeList", 31);
+        Response custListRes = network.getResponse(custListPar, BasicConfig.MOBILE_custList);
+        try {
+            List<Map<String, Object>> cL = custListRes.jsonPath().getList("data.list");
+            if (cL.size() > 0){
+                for (Map<String, Object> cust : cL){
+                    Assert.assertEquals((int)cust.get("firstInvitedFlag"), 0, network.message(custListPar, BasicConfig.MOBILE_custList, "有非转介绍客户", custListRes.body().asString()));
+                }
+            }else {
+                Assert.fail(network.message(custListPar, BasicConfig.MOBILE_custList, "转介绍客户数量错误", custListRes.body().asString()));
+            }
+        }catch (NullPointerException e){
+            e.printStackTrace();
+            Assert.fail(network.message(custListPar, BasicConfig.MOBILE_custList, "获取数据失败", custListRes.body().asString()));
+        }
+    }
+
 
-    @Test(description = "查询客户直播线索汇总信息", priority = 5)
+    @Test(description = "查询客户直播线索汇总信息", priority = 6)
     public void 查询客户直播线索汇总信息() {
         Map<String, Object> Params = new HashMap<>();
         Params.put("customerId",customerId);
@@ -91,7 +115,7 @@ public class Customer implements Authorization {
     }
 
 
-    @Test(description = "编辑客户基本信息", priority = 6)
+    @Test(description = "编辑客户基本信息", priority = 7)
     public void 编辑客户基本信息() {
         Map<String, Object> Params = new HashMap<>();
         Params.put("customerId",customerId);
@@ -168,7 +192,7 @@ public class Customer implements Authorization {
     }
 
 
-    @Test(description = "查询客户基本信息", priority = 7)
+    @Test(description = "查询客户基本信息", priority = 8)
     public void 查询客户基本信息() {
         Map<String, Object> Params = new HashMap<>();
         Params.put("customerId",customerId);
@@ -179,7 +203,7 @@ public class Customer implements Authorization {
 
     }
 
-    @Test(description = "查询客户详情头像信息栏", priority = 8)
+    @Test(description = "查询客户详情头像信息栏", priority = 9)
     public void 查询客户详情头像信息栏() {
         Map<String, Object> Params = new HashMap<>();
         Params.put("customerId",customerId);
@@ -194,7 +218,7 @@ public class Customer implements Authorization {
 
     }
 
-    @Test(description = "查询客户直播场次详情信息", priority = 9)
+    @Test(description = "查询客户直播场次详情信息", priority = 10)
     public void 查询客户直播场次详情信息() {
         Map<String, Object> Params = new HashMap<>();
         Params.put("customerId",customerId);
@@ -208,7 +232,7 @@ public class Customer implements Authorization {
     }
 
 
-    @Test(description = "修改客户备注名", priority = 10)
+    @Test(description = "修改客户备注名", priority = 11)
     public void 修改客户备注名() {
         Map<String, Object> Params = new HashMap<>();
         Params.put("liveUserId",customerId);
@@ -220,7 +244,7 @@ public class Customer implements Authorization {
 
     }
 
-    @Test(description = "跟进机会列表", priority = 11)
+    @Test(description = "跟进机会列表", priority = 12)
     public void 跟进机会列表() {
         Map<String, Object> Params = new HashMap<>();
         Params.put("liveVisitorId",customerId);
@@ -233,7 +257,7 @@ public class Customer implements Authorization {
 
     }
 
-    @Test(description = "获取跟进机会回复建议", priority = 12)
+    @Test(description = "获取跟进机会回复建议", priority = 13)
     public void 获取跟进机会回复建议() {
         Map<String, Object> Params = new HashMap<>();
         Params.put("liveVisitorId",customerId);
@@ -245,7 +269,7 @@ public class Customer implements Authorization {
     }
 
 
-    @Test(description = "跟进机会详情", priority = 12)
+    @Test(description = "跟进机会详情", priority = 14)
     public void 跟进机会详情() {
         Map<String, Object> Params = new HashMap<>();
         Params.put("id",id);

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

@@ -117,7 +117,8 @@ public class LiveLater implements Authorization {
     }
 
 
-
+    // 代理人端改版，客户页不再调用clueList接口
+/*
     // 获取直播结束我的客户页面直接邀请tab；
     @Test(description="直接邀请tab数据",priority = 6)
     public void 直接邀请tab数据()  {
@@ -185,6 +186,7 @@ public class LiveLater implements Authorization {
 
     }
 
+
     // 获取直播结束我的客户页面观看20分钟+tab；
     @Test(description="观看20分钟+tab数据",priority = 10)
     public void 观看20分钟以上tab数据() {
@@ -201,6 +203,43 @@ public class LiveLater implements Authorization {
 
     }
 
+ */
+
+
+
+    @Test(description = "获取本场直播客户统计", priority = 8)
+    public void 获取本场直播客户统计() {
+        Map<String, Object> custStatPar = new HashMap<>();
+        custStatPar.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
+        Response custStatRes = network.getResponse(custStatPar, BasicConfig.MOBILE_custStat);
+        try {
+            int totalNum = custStatRes.jsonPath().getInt("data.totalNum");
+            int awardNum = custStatRes.jsonPath().getInt("data.awardNum");
+            int purchaseNum = custStatRes.jsonPath().getInt("data.purchaseNum");
+            int indirectNum = custStatRes.jsonPath().getInt("data.indirectNum");
+            if (totalNum < 0 || awardNum < 0 || purchaseNum < 0 || indirectNum < 0){
+                Assert.fail(network.message(custStatPar, BasicConfig.MOBILE_custStat, "本场直播客户统计数错误", custStatRes.body().asString()));
+            }
+        }catch (NullPointerException e){
+            e.printStackTrace();
+            Assert.fail(network.message(custStatPar, BasicConfig.MOBILE_custStat, "数据获取失败", custStatRes.body().asString()));
+        }
+    }
+
+    @Test(description = "直播中客户列表", priority = 9)
+    public void 直播中客户列表() {
+        Map<String, Object> custListPar = new HashMap<>();
+        custListPar.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
+        Response custListRes = network.getResponse(custListPar, BasicConfig.MOBILE_liveCustList);
+        try {
+            List<Map<String, Object>> visitorLists = custListRes.jsonPath().getList("data.list");
+            List<String> goodsList = (List<String>) visitorLists.get(0).get("goodsList");
+            Assert.assertTrue(goodsList.get(0).equals("自动化专用商品"), network.message(custListPar, BasicConfig.MOBILE_liveCustList, "客户购买商品名称错误", custListRes.body().asString()));
+        }catch (NullPointerException e){
+            e.printStackTrace();
+            Assert.fail(network.message(custListPar, BasicConfig.MOBILE_liveCustList, "获取数据失败", custListRes.body().asString()));
+        }
+    }
 
     //查看客户线索详情
     @Test(description="客户A线索已读",priority = 11)

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,7 +3,6 @@ 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;
@@ -23,7 +22,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 +40,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");
@@ -61,6 +60,7 @@ public class OpenLive implements Authorization {
 
     @Test(description = "获取直播配置详情", priority = 2)
     public void 获取直播配置详情() {
+        adminAuth();
         Map<String, Object> ConfDetailParam = new HashMap<>();
         ConfDetailParam.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
         Response ConfDetailRes = network.getResponse(ConfDetailParam, BasicConfig.ANCHOR_getConfDetail);
@@ -81,4 +81,6 @@ public class OpenLive implements Authorization {
         Assert.assertNotNull(data, network.message(openParam, BasicConfig.ANCHOR_OPEN, "开启直播失败", openRes.body().asString()));
         ThreadSleepUtils.sleep(10000);
     }
+
+
 }

src/test/java/com/kjj/cases/live/answer/Answer.java

@@ -256,8 +256,8 @@ public class Answer implements Authorization {
         params.put("quesConfId", this.quesConfId.get(0).getQuesConfId());
         params.put("optionId", this.wronganswer.getId());
         Response response = network.postResponse(params, BasicConfig.MOBILE_QuesParticipate);
+        System.out.println(response.body().asString());
         boolean openResult=response.jsonPath().getBoolean("data.openResult");
-        System.out.println(openResult);
         Assert.assertTrue(openResult, network.message(params, BasicConfig.MOBILE_QuesParticipate, "用户参与失败", response.body().asString()));
 
         boolean result=response.jsonPath().getBoolean("data.result");
@@ -300,7 +300,7 @@ public class Answer implements Authorization {
         System.out.println(" 查询用户A领取答题红包结果 timestamp:"+new Date().getTime()+"quesConfId:"+quesConfId);
         Response response = network.getResponse(params, BasicConfig.MOBILE_QuesParticipateInfo);
         boolean result=response.jsonPath().getBoolean("data.result");
-        System.out.println(result);
+        System.out.println(response.body().asString());
         Assert.assertTrue(result, network.message(params, BasicConfig.MOBILE_QuesParticipateInfo, "用户答题结果获取失败", response.body().asString()));
 
         Integer amount = response.jsonPath().getJsonObject("data.amount");
@@ -481,14 +481,10 @@ public class Answer implements Authorization {
         params.put("quesConfId",this.quesConfId.get(1).getQuesConfId() );
         Response response = network.getResponse(params, BasicConfig.MOBILE_QuesParticipateInfo);
         boolean result=response.jsonPath().getBoolean("data.result");
-        System.out.println(result);
+        System.out.println(response.body().asString());
         Assert.assertTrue(result, network.message(params, BasicConfig.MOBILE_QuesParticipateInfo, "答题失败", response.body().asString()));
-
         Object amount = response.jsonPath().getJsonObject("data.amount");
-        System.out.println(amount);
-        Assert.assertNull(amount,network.message(params, BasicConfig.MOBILE_QuesParticipateInfo, "领取失败", response.body().asString()));
-
-
+        Assert.assertNull(amount, network.message(params, BasicConfig.MOBILE_QuesParticipateInfo, "答题失败", response.body().asString()));
     }
 
     //*****************有奖答题福利类型*****************//

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/liveConfig/SaveLive.java

@@ -1348,8 +1348,8 @@ public class SaveLive implements Authorization {
         Map<String, Object> Params = new HashMap<>();
         Params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.LIVE_ID.getKey()));
         ArrayList<Dialogue> dialogues = new ArrayList<>();
-        dialogues.add(new Dialogue(new ArrayList<>(Arrays.asList("一度问题1","一度问题2","一度问题3")),"一度代理人结束语","一度代理人欢迎语","一度承诺标题","一度承诺描述","一度承诺按钮文案","一度行动承诺",1));
-        dialogues.add(new Dialogue(new ArrayList<>(Arrays.asList("二度问题1","二度问题2","二度问题3")),"二度代理人结束语","二度代理人欢迎语","二度承诺标题","二度承诺描述","二度承诺按钮文案","二度行动承诺",0));
+        dialogues.add(new Dialogue(new ArrayList<>(Arrays.asList("一度问题1","一度问题2","一度问题3")),"一度代理人结束语","一度代理人欢迎语","一度承诺标题","一度承诺按钮文案",1));
+        dialogues.add(new Dialogue(new ArrayList<>(Arrays.asList("二度问题1","二度问题2","二度问题3")),"二度代理人结束语","二度代理人欢迎语","二度承诺标题","二度承诺按钮文案",0));
         Params.put("dialogues", dialogues);
         Response response = network.postResponse(Params, BasicConfig.MANAGER_saveDialogue);
         System.out.println(Params);

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/ConfSecondKill.java

@@ -47,6 +47,7 @@ public class ConfSecondKill implements Authorization {
         secKillAddPar.put("goodsAmount", 1);  // 1 == 0.01
         secKillAddPar.put("interactNum", 3);
         secKillAddPar.put("ableAgent", 0);  // 代理人不可参与
+        secKillAddPar.put("isNeedQualified", 0);  // 不需要秒杀资格
         secKillAddPar.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.LIVE_ID.getKey()));
         Response secKillAddRes = network.postResponse(secKillAddPar, BasicConfig.MANAGER_secondKillSave);
         try{
@@ -65,6 +66,7 @@ public class ConfSecondKill implements Authorization {
         secKillAddPar.put("goodsAmount", 1);  // 1 == 0.01
         secKillAddPar.put("interactNum", 3);
         secKillAddPar.put("ableAgent", 0);
+        secKillAddPar.put("isNeedQualified", 0);  // 不需要秒杀资格
         secKillAddPar.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.LIVE_ID.getKey()));
         Response secKillAddRes;
         boolean data;
@@ -124,6 +126,7 @@ public class ConfSecondKill implements Authorization {
         secKillUpdatePar.put("interactNum", 1);
         secKillUpdatePar.put("id", newSecKillId);
         secKillUpdatePar.put("ableAgent", 0);
+        secKillUpdatePar.put("isNeedQualified", 0);  // 不需要秒杀资格
         Response secKillUpdateRes = network.postResponse(secKillUpdatePar, BasicConfig.MANAGER_secondKillUpdate);
         try{
             boolean data = secKillUpdateRes.jsonPath().getBoolean("data");
@@ -188,6 +191,7 @@ public class ConfSecondKill implements Authorization {
         secKillAddPar.put("goodsAmount", 5);  // 1 == 0.01
         secKillAddPar.put("interactNum", 3);
         secKillAddPar.put("ableAgent", 0);  // 代理人不可参与
+        secKillAddPar.put("isNeedQualified", 0);  // 不需要秒杀资格
         secKillAddPar.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
         Response secKillAddRes = network.postResponse(secKillAddPar, BasicConfig.ANCHOR_secondKillSave);
         try {
@@ -206,6 +210,7 @@ public class ConfSecondKill implements Authorization {
         secKillAddPar.put("goodsAmount", 1);  // 1 == 0.01
         secKillAddPar.put("interactNum", 1);
         secKillAddPar.put("ableAgent", 1);  // 代理人可参与
+        secKillAddPar.put("isNeedQualified", 0);  // 不需要秒杀资格
         secKillAddPar.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
         Response secKillAddRes = network.postResponse(secKillAddPar, BasicConfig.ANCHOR_secondKillSave);
         try {
@@ -224,6 +229,7 @@ public class ConfSecondKill implements Authorization {
         secKillAddPar.put("goodsAmount", 0);  // 1 == 0.01
         secKillAddPar.put("interactNum", 1);
         secKillAddPar.put("ableAgent", 1);  // 代理人可参与
+        secKillAddPar.put("isNeedQualified", 0);  // 不需要秒杀资格
         secKillAddPar.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
         Response secKillAddRes = network.postResponse(secKillAddPar, BasicConfig.ANCHOR_secondKillSave);
         try {
@@ -265,6 +271,7 @@ public class ConfSecondKill implements Authorization {
         secKillUpdatePar.put("interactNum", 3);
         secKillUpdatePar.put("id", skIdFirst);
         secKillUpdatePar.put("ableAgent", 0);
+        secKillUpdatePar.put("isNeedQualified", 0);  // 不需要秒杀资格
         Response secKillUpdateRes = network.postResponse(secKillUpdatePar, BasicConfig.ANCHOR_secondKillUpdate);
         try {
             boolean data = secKillUpdateRes.jsonPath().getBoolean("data");

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/config/BasicConfig.java

@@ -138,6 +138,8 @@ public class BasicConfig {
   public static final String MANAGER_secondKillLists = MANAGER_HOST + "/kjy/manager/live/second/kill/goods/list";
   public static final String MANAGER_secondKillDel = MANAGER_HOST + "/kjy/manager/live/second/kill/goods/delete";
   public static final String MANAGER_secondKillUpdate = MANAGER_HOST + "/kjy/manager/live/second/kill/goods/update";
+  public static final String MANAGER_secondKillSaveLimitGroup = MANAGER_HOST + "/kjy/manager/live/second/kill/goods/saveLimitGroup";
+  public static final String MANAGER_secondKillLimitGroupList = MANAGER_HOST + "/kjy/manager/live/second/kill/goods/limitGroupList";
   public static final String ANCHOR_secondKillSave = MOBILE_HOST + "/conf/live/second/kill/goods/save";
   public static final String ANCHOR_secondKillLists = MOBILE_HOST + "/conf/live/second/kill/goods/list";
   public static final String ANCHOR_secondKillUpdate = MOBILE_HOST + "/conf/live/second/kill/goods/update";
@@ -264,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";
@@ -465,6 +468,7 @@ public class BasicConfig {
 
   //客户管理
   public static final String MOBILE_potentialCount = MOBILE_HOST + "/kjy/live/agent/customer/potentialCount";
+  public static final String MOBILE_cusStat = MOBILE_HOST + "/kjy/live/agent/customer/cusStat";
   public static final String MOBILE_customerList = MOBILE_HOST + "/kjy/live/agent/customer/list";
   public static final String MOBILE_lastLiveList = MOBILE_HOST + "/kjy/live/agent/customer/lastLiveList";
   public static final String MOBILE_basicInfo = MOBILE_HOST + "/kjy/live/agent/customer/basicInfo";
@@ -475,6 +479,10 @@ public class BasicConfig {
   public static final String MOBILE_followChanceList = MOBILE_HOST + "/kjy/live/agent/customer/followChanceList";
   public static final String MOBILE_customerGetReplyAdvice = MOBILE_HOST + "/kjy/live/agent/customer/getReplyAdvice";
   public static final String MOBILE_followChanceDetail = MOBILE_HOST + "/kjy/live/agent/customer/followChanceDetail";
+  public static final String MOBILE_custList = MOBILE_HOST + "/kjy/live/agent/customer/custList";
+  //单场直播线索
+  public static final String MOBILE_custStat = MOBILE_HOST + "/kjy/live/customer/stat";
+  public static final String MOBILE_liveCustList = MOBILE_HOST + "/kjy/live/customer/list";
   // ***************  代理人  ***************
   public static final String MOBILE_recycleSuccessCase = MOBILE_HOST + "/kjy/live/agent/clue/recycleSuccessCase";
   public static final String MOBILE_providerInfo = MOBILE_HOST + "/kjy/live/agent/clue/providerInfo";

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

 package com.kjj.utils;
 
+import com.kjj.config.BasicConfig;
+import com.kjj.constants.LiveConstants;
 import com.kjj.sql.KjyUserDB;
 import com.kjj.sql.UserSqlFactory;
 import io.restassured.response.Response;
 import org.testng.Assert;
+import org.testng.annotations.Test;
 
 import java.sql.SQLException;
 import java.text.SimpleDateFormat;
@@ -144,4 +147,39 @@ public class BaseUtils {
         Assert.assertTrue(success,network.message(params,MANAGER_updateTypeOrDate,"接口返回失败",response.body().asString()));
         Assert.assertTrue(result,network.message(params,MANAGER_updateTypeOrDate,"返回数据为空",response.body().asString()));
     }
+
+    /*
+    * 访客到场
+    * */
+    public static 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()));
+    }
+
+    /*
+     * 关注直播间
+     * */
+    public static void subscribelive() {
+        Map<String, Object> subscribeParam = new HashMap<>();
+        subscribeParam.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
+        Response subscribeRes = network.postResponse(subscribeParam, BasicConfig.USER_SUBSCRIBE);
+        boolean data = subscribeRes.jsonPath().getBoolean("data");
+        System.out.println(data);
+        Assert.assertTrue(data, network.message(subscribeParam, BasicConfig.USER_SUBSCRIBE, "关注失败", subscribeRes.body().asString()));
+    }
+
+    /*
+     * 抽奖码数量校验
+     * */
+    public static void codeCount(int num) {
+        ThreadSleepUtils.sleep(500);
+        Map<String, Object> myCountParam = new HashMap<>();
+        myCountParam.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
+        Response myCountRes = network.getResponse(myCountParam, BasicConfig.USER_myCount);
+        int data = myCountRes.jsonPath().getInt("data");
+        Assert.assertEquals(data, num ,network.message(myCountParam, BasicConfig.USER_myCount, "获取抽奖码数量失败", myCountRes.body().asString()));
+    }
 }

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"/>