Merge branch 'master' into feature/20210907-xmc

src/test/java/com/kjj/cases/assistant/homePage/SignRed.java

@@ -102,6 +102,8 @@ public class SignRed implements Authorization {
             Assert.assertEquals(nickname, "吉吉",network.message(PAY_accDetail, "签到用户名称错误", response.body().asString()));
             Assert.assertEquals(bizType, 16,network.message(PAY_accDetail, "收益明细类型错误", response.body().asString()));
             Assert.assertEquals(changeMoney, String.format("%.2f",attendAmount/100),network.message(PAY_accDetail, "收益金额错误", response.body().asString()));
+        }else{
+            System.out.println("代理人今日已签到");
         }
 
     }

src/test/java/com/kjj/cases/assistant/menu/PersonalCenter.java

@@ -264,7 +264,14 @@ public class PersonalCenter implements Authorization{
         Assert.assertTrue(success,network.message(params,SELLERCONFIG_EDITCONFIG,"接口返回失败",response.body().asString()));
         Assert.assertTrue(data,network.message(params,SELLERCONFIG_EDITCONFIG,"关闭底部名片",response.body().asString()));
 
-        //娇艳是否关闭成功
+        params.put("configKey", "card_show_on_top");
+        response = network.postResponse(params,SELLERCONFIG_EDITCONFIG);
+        success = response.jsonPath().getBoolean("success");
+        data = response.jsonPath().getBoolean("data");
+        Assert.assertTrue(success,network.message(params,SELLERCONFIG_EDITCONFIG,"接口返回失败",response.body().asString()));
+        Assert.assertTrue(data,network.message(params,SELLERCONFIG_EDITCONFIG,"关闭底部名片",response.body().asString()));
+
+        //校验是否关闭成功
         response = network.getResponse(SELLERCARD_GETSELLERCARDCONFIG);
         success = response.jsonPath().getBoolean("success");
         Object result = response.jsonPath().getJsonObject("data");
@@ -273,7 +280,7 @@ public class PersonalCenter implements Authorization{
 
         int size = response.jsonPath().getInt("data.findAll{it.val == false}.size()");
         System.out.println("size:"+size);
-        Assert.assertTrue(size==1,network.message(SELLERCARD_GETSELLERCARDCONFIG,"接口返回失败",response.body().asString()));
+        Assert.assertTrue(size==2,network.message(SELLERCARD_GETSELLERCARDCONFIG,"接口返回失败",response.body().asString()));
 
         //开启向客户展示底部和顶部名片
         params.clear();
@@ -286,6 +293,14 @@ public class PersonalCenter implements Authorization{
         Assert.assertTrue(success,network.message(params,SELLERCONFIG_EDITCONFIG,"接口返回失败",response.body().asString()));
         Assert.assertTrue(data,network.message(params,SELLERCONFIG_EDITCONFIG,"返回数据为空",response.body().asString()));
 
+        params.put("configKey", "card_show_on_top");
+        response = network.postResponse(params,SELLERCONFIG_EDITCONFIG);
+        System.out.println(response.body().asString());
+        success = response.jsonPath().getBoolean("success");
+        data = response.jsonPath().getBoolean("data");
+        Assert.assertTrue(success,network.message(params,SELLERCONFIG_EDITCONFIG,"接口返回失败",response.body().asString()));
+        Assert.assertTrue(data,network.message(params,SELLERCONFIG_EDITCONFIG,"返回数据为空",response.body().asString()));
+
         response = network.getResponse(SELLERCARD_GETSELLERCARDCONFIG);
         success = response.jsonPath().getBoolean("success");
         result = response.jsonPath().getJsonObject("data");
@@ -293,7 +308,7 @@ public class PersonalCenter implements Authorization{
         Assert.assertNotNull(result,network.message(params,SELLERCARD_GETSELLERCARDCONFIG ,"配置列表为空",response.body().asString()));
 
         size = response.jsonPath().getInt("data.findAll{it.val == true}.size()");
-        Assert.assertTrue(size==1,network.message(USINGSTRATAGY_index,"接口返回失败",response.body().asString()));
+        Assert.assertTrue(size==2,network.message(USINGSTRATAGY_index,"接口返回失败",response.body().asString()));
     }
 
     @Test(description = "关闭理财类互动区展示设置",priority = 10)