Merge remote-tracking branch 'origin/master' into gitfeature/20210917-gxh

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

@@ -177,6 +177,7 @@ public class FlipCard implements Authorization {
 
     }
 
+    /*
 
     @Test(description = "已登录查询分享人头像昵称", priority = 11)
     public void 已登录查询分享人头像昵称() {
@@ -201,7 +202,6 @@ public class FlipCard implements Authorization {
 
     }
 
-/*
 
     @Test(description = "访客H获得助力", priority = 12)
     public void 访客H获得助力() {

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

@@ -1886,6 +1886,7 @@ public class SaveLive implements Authorization {
         Params.put("redAmount",30);
         Params.put("redProbability",100);
         Params.put("ruleType",1);
+        Params.put("showType", 0); // 取消红包封面最高66元标签展示
         Response response = network.postResponse(Params, BasicConfig.MANAGER_redSaveOrUpdate);
         System.out.println(response.body().asString());
         boolean data=response.jsonPath().getBoolean("data");

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

@@ -361,9 +361,8 @@ public class Lottery implements Authorization {
         Assert.assertTrue(firstGet, network.message(Params, BasicConfig.ANCHOR_getRed, "非第1次获取好运红包", response.body().asString()));
         int redNum = response.jsonPath().getInt("data.redNum");
         Assert.assertTrue(redNum>1, network.message(Params, BasicConfig.ANCHOR_getRed, "红包个数不对", response.body().asString()));
-
-
-
+        int showtype = response.jsonPath().getInt("data.showType");
+        Assert.assertEquals(showtype, 0, network.message(Params, BasicConfig.ANCHOR_getRed, "红包封面图标签展示状态不对", response.body().asString()));
     }
 
     @Test(description = "访客A分享好运红包给访客B", priority = 27)

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

@@ -205,7 +205,7 @@ public class SecondKill implements Authorization {
         Response downgradeGoodsRes = network.getResponse(downgradeGoodsPar, BasicConfig.MOBILE_secondKill_downgradeGoodsFirst);
         try {
             String confId = downgradeGoodsRes.jsonPath().getString("data.confId");
-            Assert.assertEquals(confId, ConfSecondKill.skIdFirst, network.message(downgradeGoodsPar, BasicConfig.MOBILE_secondKill_goodsFirst, "当前秒杀商品配置ID错误", downgradeGoodsRes.body().asString()));
+            Assert.assertEquals(confId, ConfSecondKill.skIdSecond, network.message(downgradeGoodsPar, BasicConfig.MOBILE_secondKill_goodsFirst, "当前秒杀商品配置ID错误", downgradeGoodsRes.body().asString()));
         }catch (NullPointerException e){
             e.printStackTrace();
             Assert.fail(network.message(downgradeGoodsPar, BasicConfig.MOBILE_secondKill_goodsFirst, "未获取到数据", downgradeGoodsRes.body().asString()));