Merge branch 'Feature/20220305-gxh' into 'master'

fix

See merge request test-group/kejiji!231

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

@@ -698,7 +698,7 @@ public class SecondKill implements Authorization {
             Assert.fail(network.message(orderPar, BasicConfig.MOBILE_secondKill_goodsOrder, "未获取到数据", orderRes.body().asString()));
         }
 
-        orderResult(ConfSecondKill.QualifiedId,1);
+        orderResult(ConfSecondKill.QualifiedId,2);
     }
 
     @Test(description = "管理后台查看秒杀资格商品进度",priority = 46)

src/test/java/com/kjj/cases/otoseller/Manager.java

@@ -29,7 +29,7 @@ public class Manager {
         int size = response.jsonPath().getInt("data.list.size()");
         Assert.assertTrue(size>0,network.message(params,BasicConfig.MANAGER_oto_sellerList,"销售列表为空",response.body().asString()));
 
-        int workStatus = response.jsonPath().getInt("data.list.find{it.id == "+ 35+"}.workStatus");
+        int workStatus = response.jsonPath().getInt("data.list.find{it.id == "+ 40+"}.workStatus");
         Assert.assertEquals(workStatus,1,network.message(params,BasicConfig.MANAGER_oto_searchSeller,"工作状态错误",response.body().asString()));
     }
 
@@ -48,7 +48,6 @@ public class Manager {
     public void 修改销售信息(){
         HashMap<String,Object> params = new HashMap<>();
         params.put("id", sellerId);
-        params.put("id", 35);
         params.put("sellerName", "勿动-自动化更新销售");
         params.put("phoneNumber", "18852895892");
         params.put("roleType", 1);
@@ -110,7 +109,7 @@ public class Manager {
     @Test(description = "不可修改总监为普通",priority = 6)
     public void 不可修改总监为普通(){
         HashMap<String,Object> params = new HashMap<>();
-        params.put("id", sellerId);
+        params.put("id", 36);
         params.put("sellerName", "勿动-自动化测试销售");
         params.put("phoneNumber", "18852895892");
         params.put("roleType", 3);

src/test/java/com/kjj/cases/otoseller/Work.java

@@ -126,7 +126,7 @@ public class Work implements Authorization {
         HashMap<String,Object> params = new HashMap<>();
         String str= String.valueOf(System.currentTimeMillis());
         params.put("customerId",custId);
-        params.put("sellerId", 35);
+        params.put("sellerId", 40);
         Response response = network.postResponse(params,BasicConfig.MANAGER_oto_assignSeller);
         boolean data = response.jsonPath().getBoolean("data");
         Assert.assertTrue(data,network.message(params,BasicConfig.MANAGER_oto_assignSeller,"分配客户失败",response.body().asString()));
@@ -596,7 +596,7 @@ public class Work implements Authorization {
     @Test(description = "公域引流_关闭销售呼叫权限",priority = 42)
     public void 公域引流_关闭销售呼叫权限(){
         HashMap<String,Object> params = new HashMap<>();
-        params.put("id", 35);
+        params.put("id", 40);
         params.put("callPermission", 0);
         Response response = network.postResponse(params,BasicConfig.MANAGER_oto_switchCallPermissio);
         boolean data = response.jsonPath().getBoolean("data");
@@ -612,7 +612,7 @@ public class Work implements Authorization {
         Assert.assertFalse(success,network.message(params,BasicConfig.WORK_call,"关闭呼叫权限后呼叫成功",response.body().asString()));
 
         params.clear();
-        params.put("id", 35);
+        params.put("id", 40);
         params.put("callPermission", 1);
         response = network.postResponse(params,BasicConfig.MANAGER_oto_switchCallPermissio);
         boolean data = response.jsonPath().getBoolean("data");
@@ -622,7 +622,7 @@ public class Work implements Authorization {
     @Test(description = "公域引流_禁用销售账号",priority = 44)
     public void 公域引流_禁用销售账号(){
         HashMap<String,Object> params = new HashMap<>();
-        params.put("id", 35);
+        params.put("id", 40);
         params.put("sellerStatus", 0);
         Response response = network.postResponse(params,BasicConfig.MANAGER_oto_switchSellerStatus);
         boolean data = response.jsonPath().getBoolean("data");
@@ -640,7 +640,7 @@ public class Work implements Authorization {
         Assert.assertFalse(success,network.message(params,BasicConfig.WORK_customerList,"关闭销售权限后访问成功",response.body().asString()));
 
         params.clear();
-        params.put("id", 35);
+        params.put("id", 40);
         params.put("sellerStatus", 1);
         response = network.postResponse(params,BasicConfig.MANAGER_oto_switchSellerStatus);
         boolean data = response.jsonPath().getBoolean("data");
@@ -754,7 +754,7 @@ public class Work implements Authorization {
     @Test(description = "总监修改名下销售工作状态",priority = 56)
     public void 总监修改名下销售工作状态(){
         HashMap<String,Object> params = new HashMap<>();
-        params.put("sellerId", 35);
+        params.put("sellerId", 40);
         params.put("workStatus", 0);
         Response response = network.postResponse(params, BasicConfig.WORK_switchWorkStatus);
         boolean data = response.jsonPath().getBoolean("data");