Commit aa65d808 authored by 张艳玲's avatar 张艳玲

Merge branch 'Feature/20210316_zz' into 'master'

Feature/20210316 zz

See merge request test-group/kejiji!34
parents 900651c2 80cd8c96
...@@ -57,18 +57,6 @@ public class Boss { ...@@ -57,18 +57,6 @@ public class Boss {
} }
//代理人有无上下级判断; //代理人有无上下级判断;
@Test(description="当前代理人角色判断",priority = 3)
public void 当前代理人角色判断() throws IOException{
Map<String, Object> params = new HashMap<String, Object>();
params.put("sellerId",sellerId);
Response response = network.getResponse(params,BOSS_ROLE);
boolean hasSubordinate = response.jsonPath().getBoolean("data.hasSubordinate");//判断是否有下级
boolean hasSuperior = response.jsonPath().getBoolean("data.hasSuperior");//判断是否有上级
Assert.assertFalse(hasSubordinate, network.message(params,BOSS_ROLE,"暂无下级",response.body().asString()));
Assert.assertFalse(hasSuperior,network.message(params,BOSS_ROLE,"暂无上级",response.body().asString()));
}
//分享链接邀请下级加入 //分享链接邀请下级加入
@Test(description="邀请成员加入",priority = 4) @Test(description="邀请成员加入",priority = 4)
public void 邀请成员加入() throws IOException{ public void 邀请成员加入() throws IOException{
......
...@@ -122,6 +122,6 @@ public class GreetingCard { ...@@ -122,6 +122,6 @@ public class GreetingCard {
apiCount += 8; apiCount += 8;
// 删除账号 // 删除账号
BaseUtils.disableUser(); // BaseUtils.disableUser();
} }
} }
...@@ -16,7 +16,7 @@ public class BasicConfig { ...@@ -16,7 +16,7 @@ public class BasicConfig {
public static String AUTH_KEY = null; public static String AUTH_KEY = null;
// 代理人 TKU // 代理人 TKU
public static String AGENT_TKU = "T3gM31f18jCFEcjx6v7mD76F8nif3vckMd7iDZzf5mTmhFD4xVkfSnFrAe9uMcqHr92ZAoir6Qfb3MnTR6"; public static String AGENT_TKU = "T3gM31f18jCFEcfoYxvVk1LsF5T1YkcBNDbUaryi3TgvwatuP6mroJjZ2k7iCHjC9Srujh7k311i3vFuZm";
// 访客 TKU // 访客 TKU
public static String VISITOR_TKU = "T3gM31f18jCGvqvoyJRzyMTdpcPDJWUJJP4VQje7p9sfHcRNmyhTEzEbfmwrGFy5doVEinb1k3SVwreYQE"; public static String VISITOR_TKU = "T3gM31f18jCGvqvoyJRzyMTdpcPDJWUJJP4VQje7p9sfHcRNmyhTEzEbfmwrGFy5doVEinb1k3SVwreYQE";
...@@ -91,6 +91,11 @@ public class BasicConfig { ...@@ -91,6 +91,11 @@ public class BasicConfig {
public static final String MOBILE_AgentEditCardInfo = MOBILE_HOST + "/kjy/live/agent/card/edit"; public static final String MOBILE_AgentEditCardInfo = MOBILE_HOST + "/kjy/live/agent/card/edit";
public static final String MOBILE_AgentPersonalCharts = MOBILE_HOST + "/kjy/live/agent/personalCharts";
public static final String MOBILE_TeamTeamCharts = MOBILE_HOST + "/kjy/live/team/teamCharts";
public static final String MOBILE_AgentPersonalTeamCharts = MOBILE_HOST + "/kjy/live/agent/personalTeamCharts";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment