增加秒杀预告的接口用例

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

@@ -34,8 +34,10 @@ public class RelativeLottery implements Authorization {
         getLiveAwardListParam.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
         Response response = network.getResponse(getLiveAwardListParam, MOBILE_allLottery);
         System.out.println(response.body().asString());
-        int fissionLotteryConfStatus = response.jsonPath().getInt("data.on");
-        Assert.assertEquals(fissionLotteryConfStatus, 1,network.message(getLiveAwardListParam, MOBILE_allLottery, "亲友配置券未开启", response.body().asString()));
+        int on = response.jsonPath().getInt("data.on");
+        String confStr = Integer.toBinaryString(on);
+        char fissionLotteryConfStatus = confStr.charAt(confStr.length()-1);
+        Assert.assertEquals(fissionLotteryConfStatus, '1',network.message(getLiveAwardListParam, MOBILE_allLottery, "亲友配置券未开启", response.body().asString()));
     }
 
     @Test(description = "仅一度用户可以领取抽奖券", priority = 2)

src/test/java/com/kjj/cases/live/preview/Preview.java

@@ -40,7 +40,6 @@ public class Preview implements Authorization{
         visitorAuth22();
         Map<String,Object> params = new HashMap<>();
         params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
-        params.put("liveId","Kj21NDM3OTE");
         Response response = network.postResponse(params,BasicConfig.ANCHOR_watchVideo);
         boolean data = response.jsonPath().getBoolean("data");
         Assert.assertTrue(data,network.message(params,BasicConfig.ANCHOR_watchVideo,"访客观看视频的抽奖码失败",response.body().asString()));

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

@@ -18,6 +18,9 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import static com.kjj.config.BasicConfig.MOBILE_allLottery;
+import static com.kjj.config.BasicConfig.agentAuth;
+
 public class ConfSecondKill implements Authorization {
 
     private final long companyId = 101;
@@ -218,6 +221,7 @@ public class ConfSecondKill implements Authorization {
         Map<String, Object> liveSecKillPar = new HashMap<>();
         liveSecKillPar.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
         Response liveSecKillRes = network.getResponse(liveSecKillPar, BasicConfig.ANCHOR_secondKillLists);
+        System.out.println(liveSecKillRes.body().asString());
         List<AnchorGetSKList> secKillLists;
         try {
             secKillLists = JsonUtil.parseResponseToListBean(liveSecKillRes, AnchorGetSKList.class);
@@ -250,4 +254,143 @@ public class ConfSecondKill implements Authorization {
             Assert.fail(network.message(secKillUpdatePar, BasicConfig.ANCHOR_secondKillUpdate, "未获取到数据", secKillUpdateRes.body().asString()));
         }
     }
+
+    //****************************秒杀预告***************************************
+    @Test(description = "上传预告底图", priority = 11)
+    public void 上传预告底图() {
+        BaseUtils.ssoLogin();
+        Map<String, Object> liveSecKillPar = new HashMap<>();
+        liveSecKillPar.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.LIVE_ID.getKey()));
+        liveSecKillPar.put("preImgUrl", "https://yun.dui88.com/kjy/image/20210907/1631003272237.png");
+        Response liveSecKillRes = network.postResponse(liveSecKillPar, BasicConfig.MANAGER_skGoodsSavePreImg);
+        System.out.println(liveSecKillRes.body().asString());
+        try {
+            boolean data = liveSecKillRes.jsonPath().getBoolean("data");
+            Assert.assertTrue(data, network.message(liveSecKillPar, BasicConfig.MANAGER_skGoodsSavePreImg, "上传底图失败", liveSecKillRes.body().asString()));
+        }catch (Exception e){
+            e.printStackTrace();
+            Assert.fail(network.message(liveSecKillPar, BasicConfig.MANAGER_skGoodsSavePreImg, "未获取到数据", liveSecKillRes.body().asString()));
+        }
+    }
+
+    @Test(description = "开启秒杀预告配置", priority = 12)
+    public void 开启秒杀预告配置() {
+        Map<String, Object> liveSecKillPar = new HashMap<>();
+        liveSecKillPar.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.LIVE_ID.getKey()));
+        liveSecKillPar.put("confStatus", 1);
+        Response liveSecKillRes = network.postResponse(liveSecKillPar, BasicConfig.MANAGER_skGoodsSwitchStatus);
+        System.out.println(liveSecKillRes.body().asString());
+        try {
+            boolean data = liveSecKillRes.jsonPath().getBoolean("data");
+            Assert.assertTrue(data, network.message(liveSecKillPar, BasicConfig.MANAGER_skGoodsSwitchStatus, "开启秒杀预告失败", liveSecKillRes.body().asString()));
+        }catch (Exception e){
+            e.printStackTrace();
+            Assert.fail(network.message(liveSecKillPar, BasicConfig.MANAGER_skGoodsSwitchStatus, "未获取到数据", liveSecKillRes.body().asString()));
+        }
+    }
+
+    @Test(description = "获取秒杀预告配置详情", priority = 13)
+    public void 获取秒杀预告配置详情() {
+        Map<String, Object> liveSecKillPar = new HashMap<>();
+        liveSecKillPar.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.LIVE_ID.getKey()));
+        Response liveSecKillRes = network.getResponse(liveSecKillPar, BasicConfig.MANAGER_skGoodsSwitchDetail);
+        System.out.println(liveSecKillRes.body().asString());
+        try {
+            int confStatus = liveSecKillRes.jsonPath().getInt("data.confStatus");
+            String preImg = liveSecKillRes.jsonPath().getString("data.preImg");
+            Assert.assertEquals(confStatus ,1, network.message(liveSecKillPar, BasicConfig.MANAGER_skGoodsSwitchDetail, "秒杀预告状态错误", liveSecKillRes.body().asString()));
+            Assert.assertNotNull(preImg , network.message(liveSecKillPar, BasicConfig.MANAGER_skGoodsSwitchDetail, "秒杀预告底图为空", liveSecKillRes.body().asString()));
+        }catch (Exception e){
+            e.printStackTrace();
+            Assert.fail(network.message(liveSecKillPar, BasicConfig.MANAGER_skGoodsSwitchDetail, "未获取到数据", liveSecKillRes.body().asString()));
+        }
+    }
+
+    //************************访客端********************************
+    @Test(description = "查询秒杀预告开启状态", priority = 14)
+    public void 查询秒杀预告开启状态() {
+        visitorAuth9();
+        Map<String, Object> getLiveAwardListParam = new HashMap<>();
+        getLiveAwardListParam.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
+        Response response = network.getResponse(getLiveAwardListParam, BasicConfig.MOBILE_allLottery);
+        System.out.println(response.body().asString());
+        try{
+            int on = response.jsonPath().getInt("data.on");
+            String confStr = Integer.toBinaryString(on);
+            char confStatus = confStr.charAt(confStr.length()-2);
+            Assert.assertEquals(confStatus, '1',network.message(getLiveAwardListParam, BasicConfig.MOBILE_allLottery, "秒杀预告未开启", response.body().asString()));
+        }catch (Exception e){
+            e.printStackTrace();
+            Assert.fail(network.message(getLiveAwardListParam, BasicConfig.MANAGER_skGoodsSwitchDetail, "未获取到数据", response.body().asString()));
+        }
+    }
+
+    @Test(description = "获取秒杀预告配置图片", priority = 15)
+    public void 获取秒杀预告配置图片() {
+        visitorAuth9();
+        Map<String, Object> getLiveAwardListParam = new HashMap<>();
+        getLiveAwardListParam.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
+        Response response = network.getResponse(getLiveAwardListParam, BasicConfig.ANCHOR_secondKillLists_goodsImg);
+        System.out.println(response.body().asString());
+        try{
+            String preImg = response.jsonPath().getString("data.preImg");
+            int size = response.jsonPath().getInt("data.goodsList.size()");
+            Assert.assertNotNull(preImg, network.message(getLiveAwardListParam, BasicConfig.ANCHOR_secondKillLists_goodsImg, "预告底图为空", response.body().asString()));
+            Assert.assertTrue(size>0, network.message(getLiveAwardListParam, BasicConfig.ANCHOR_secondKillLists_goodsImg, "秒杀商品数量错误", response.body().asString()));
+        }catch (Exception e){
+            e.printStackTrace();
+            Assert.fail(network.message(getLiveAwardListParam, BasicConfig.ANCHOR_secondKillLists_goodsList, "未获取到数据", response.body().asString()));
+        }
+    }
+
+    @Test(description = "获取秒杀预告商品列表", priority = 16)
+    public void 获取秒杀预告商品列表() {
+        visitorAuth9();
+        Map<String, Object> getLiveAwardListParam = new HashMap<>();
+        getLiveAwardListParam.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
+        Response response = network.getResponse(getLiveAwardListParam, BasicConfig.ANCHOR_secondKillLists_goodsList);
+        System.out.println(response.body().asString());
+        try{
+            int size = response.jsonPath().getInt("data.size()");
+            int isAppoint = response.jsonPath().getInt("data.get(0).isAppoint");
+            Assert.assertTrue(size>0, network.message(getLiveAwardListParam, BasicConfig.ANCHOR_secondKillLists_goodsList, "秒杀商品数量错误", response.body().asString()));
+            Assert.assertEquals(isAppoint,0, network.message(getLiveAwardListParam, BasicConfig.ANCHOR_secondKillLists_goodsList, "用户秒杀订阅状态错误", response.body().asString()));
+        }catch (Exception e){
+            e.printStackTrace();
+            Assert.fail(network.message(getLiveAwardListParam, BasicConfig.ANCHOR_secondKillLists_goodsList, "未获取到数据", response.body().asString()));
+        }
+    }
+
+    @Test(description = "订阅秒杀开抢提醒", priority = 17)
+    public void 订阅秒杀开抢提醒() {
+        visitorAuth9();
+        Map<String, Object> getLiveAwardListParam = new HashMap<>();
+        getLiveAwardListParam.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
+        getLiveAwardListParam.put("confId", skIdFirst);
+        Response response = network.postResponse(getLiveAwardListParam, BasicConfig.ANCHOR_secondKillLists_remind);
+        System.out.println(response.body().asString());
+        try{
+            boolean data = response.jsonPath().getBoolean("data");
+            Assert.assertTrue(data,network.message(getLiveAwardListParam, BasicConfig.ANCHOR_secondKillLists_remind, "用户秒杀订阅状态错误", response.body().asString()));
+        }catch (Exception e){
+            e.printStackTrace();
+            Assert.fail(network.message(getLiveAwardListParam, BasicConfig.ANCHOR_secondKillLists_remind, "未获取到数据", response.body().asString()));
+        }
+    }
+
+    @Test(description = "查询秒杀订阅状态", priority = 18)
+    public void 查询秒杀订阅状态() {
+        visitorAuth9();
+        Map<String, Object> getLiveAwardListParam = new HashMap<>();
+        getLiveAwardListParam.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
+        Response response = network.getResponse(getLiveAwardListParam, BasicConfig.ANCHOR_secondKillLists_goodsList);
+        System.out.println(response.body().asString());
+        try{
+            int isAppoint = response.jsonPath().getInt("data.get(0).isAppoint");
+            Assert.assertEquals(isAppoint,1, network.message(getLiveAwardListParam, BasicConfig.ANCHOR_secondKillLists_goodsList, "用户秒杀订阅状态失败", response.body().asString()));
+        }catch (Exception e){
+            e.printStackTrace();
+            Assert.fail(network.message(getLiveAwardListParam, BasicConfig.ANCHOR_secondKillLists_goodsList, "未获取到数据", response.body().asString()));
+        }
+    }
 }

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

@@ -12,7 +12,7 @@ public class BasicConfig {
   public static String ADMIN_KEY="zFNkBc7JtvLPL6ifAfXbcgXf7k8AofD7jRHCDreREzhP8iW4bahfqRFePosTb9G6ESGPwScVFCQyuZBcc4brtRfaNz";
   // 直播代理人 （艳玲）ID：826
   public static String AUTH_KEY ="LEH7epeHVDJWzhZ6DiexTHnfZVkhkqorGGQahRCuzyKj3hQkSYMpkYma5RmZHQAbv8fiPzFX5BgoJgjF2gUVz175wz3dY";
-  // 直播代理人 （小疙瘩）ID：995
+// 直播代理人 （小疙瘩）ID：995
   public static String agentAuth ="LEH7epeHVDJWzhZ6DiexTHnsaP1faXTzcymSLsZVqAY5WqZQrdzjC38jMagiDc4FuL29DuBPCvuyHwDfmewFfwyW7rFLZ";
   //直播访客 （志勇）ID：107
   public static String visitorAuth="LEH7epeHVDJWzhZ6DiexTHnfZVkhkqorGGQahRL1y3zwSbNpp1aULAhVJCVAEKsjT2ZbJ5DZhH3ZjeaCEGLsecXdXZW6n";
@@ -151,6 +151,12 @@ public class BasicConfig {
   public static final String MOBILE_secondKill_goodsOrder = MOBILE_HOST + "/clue/goods/order";
   public static final String MOBILE_secondKill_goodsOrderResult = MOBILE_HOST + "/clue/goods/order/result";
   public static final String MOBILE_secondKill_killGoods = MOBILE_HOST + "/clue/goods/killGoods";
+  public static final String MANAGER_skGoodsSavePreImg = MANAGER_HOST + "/kjy/manager/live/second/kill/goods/savePreImg";
+  public static final String MANAGER_skGoodsSwitchStatus = MANAGER_HOST + "/kjy/manager/live/second/kill/goods/switchStatus";
+  public static final String MANAGER_skGoodsSwitchDetail = MANAGER_HOST + "/kjy/manager/live/second/kill/goods/switchDetail";
+  public static final String ANCHOR_secondKillLists_goodsImg = MOBILE_HOST + "/kjy/live/second/kill/pre/goodsImg";
+  public static final String ANCHOR_secondKillLists_goodsList = MOBILE_HOST + "/kjy/live/second/kill/pre/goodsList";
+  public static final String ANCHOR_secondKillLists_remind = MOBILE_HOST + "/kjy/live/second/kill/pre/remind";
 
   //客户承诺话术配置
   public static final String MANAGER_saveDialogue = MANAGER_HOST + "/kjy/manager/live/potential/saveDialogue";

src/test/liveTestNG.xml

@@ -29,7 +29,7 @@
             <class name="com.kjj.cases.live.liveConfig.SaveLive"/>
         </classes>
     </test>
-    <test preserve-order="true" name="配置秒杀轮次">
+    <test preserve-order="true" name="配置秒杀轮次及秒杀预告">
         <classes>
             <class name="com.kjj.cases.live.secondKill.ConfSecondKill"/>
         </classes>
@@ -82,7 +82,6 @@
         </classes>
     </test>
 
-
     <test preserve-order="true" name="指定中奖">
         <classes>
             <class name="com.kjj.cases.live.lottery.DesignatedWinner"/>
@@ -94,7 +93,6 @@
         </classes>
     </test>
 
-
     <test preserve-order="true" name="直播前-我的客户页">
         <classes>
             <class name="com.kjj.cases.live.agent.LiveBefore"/>