企业指定中奖

src/test/java/com/kjj/cases/basics/Pay.java

@@ -195,13 +195,5 @@ public class Pay {
     }
 
 
-    @AfterClass
-    public static void tearDown() throws IOException, InterruptedException {
-        apiCount += 7;
-
-        //延迟2秒
-        Thread.sleep(2000);
-    }
-
 }
 

src/test/java/com/kjj/cases/live/admin/AdminAuthorization.java

@@ -27,7 +27,7 @@ public interface AdminAuthorization {
     }
 
     /**
-    * 访客（嘿保险）授权
+    * 访客A（嘿保险）授权，代理人指定中奖用户 ，ID：907
     */
     default void visitorAuth() {
         network.agentCookies.put("authKey", VISITORKEY);
@@ -35,7 +35,7 @@ public interface AdminAuthorization {
     }
 
     /**
-     * 访客（茶仔）授权
+     * 访客B（茶仔）授权，用户ID：122
      */
     default void visitorAuth2() {
         network.agentCookies.put("authKey", VISITORKEY2);
@@ -43,7 +43,7 @@ public interface AdminAuthorization {
     }
 
     /**
-     * 访客（刘超）授权
+     * 访客C（刘超）授权，用户，用户ID：811
      */
     default void visitorAuth3() {
         network.agentCookies.put("authKey", VISITORKEY3);
@@ -51,14 +51,14 @@ public interface AdminAuthorization {
     }
 
     /**
-     * 访客（周成）授权
+     * 访客D（李执）授权，用户ID：89
      */
     default void visitorAuth4() {
         network.agentCookies.put("authKey", VISITORKEY4);
         System.out.println("用户AUTH_KEY：" + VISITORKEY4);
     }
     /**
-     * 访客（周成）授权，企业指定中奖用户
+     * 访客E（周成）授权，企业指定中奖用户，用户ID：812
      */
     default void visitorAuth5() {
         network.agentCookies.put("authKey", VISITORKEY5);
@@ -66,7 +66,7 @@ public interface AdminAuthorization {
     }
 
     /**
-     * 访客（新强）授权
+     * 访客F（新强）授权，区域指定中奖用户，ID：82
      */
     default void visitorAuth6() {
         network.agentCookies.put("authKey", VISITORKEY6);
@@ -74,7 +74,7 @@ public interface AdminAuthorization {
     }
 
     /**
-     * 访客（熊二）授权
+     * 访客G（熊二）授权，黑名单用户，ID：719
      */
     default void visitorAuth7() {
         network.agentCookies.put("authKey", VISITORKEY7);
@@ -82,7 +82,7 @@ public interface AdminAuthorization {
     }
 
     /**
-     * 访客（喜洋洋）授权
+     * 访客H（喜洋洋）授权
      */
     default void visitorAuth8() {
         network.agentCookies.put("authKey", VISITORKEY8);

src/test/java/com/kjj/cases/live/manager/LiveLottery.java

@@ -48,7 +48,7 @@ public class LiveLottery implements AdminAuthorization {
     }
 
     @Test(description = "获取导入任务结果", priority = 3)
-    public void 获取导入任务结果() {
+    public void 获取导入任务结果() throws InterruptedException {
         Map<String, Object> resultParam = new HashMap<>();
         resultParam.put("taskId", taskId);
         Response response = null;
@@ -57,6 +57,7 @@ public class LiveLottery implements AdminAuthorization {
             boolean hasFinish= response.jsonPath().getBoolean("data.hasFinish");
             System.out.println(hasFinish);
             if(hasFinish) return;
+            Thread.sleep(500);
         }
         Assert.fail(network.message(resultParam, BasicConfig.MANAGER_result, "获取导入任务结果失败", response.body().asString()));
     }
@@ -77,9 +78,10 @@ public class LiveLottery implements AdminAuthorization {
     public void 上传新的企业指定中奖名单() {
         Map<String, Object> importParam = new HashMap<>();
         importParam.put("confId",confId);
-        importParam.put("excelUrl", "https://yun.dui88.com/kjy/media/file/20210420/51716f59605424332f50a26f0a5d531f.xlsx");
+        importParam.put("excelUrl", "https://yun.dui88.com/kjy/media/file/20210421/14cfc6260713bc97e7cd6a9b27b0e763.xlsx");
         importParam.put("fileName", "指定中奖名单");
         Response response = network.postResponse(importParam, BasicConfig.MANAGER_import);
+        System.out.println(response);
         taskId = response.jsonPath().getInt("data");
         System.out.println(taskId);
         Assert.assertNotNull(taskId, network.message(importParam, BasicConfig.MANAGER_import, "上传企业指定中奖名单失败", response.body().asString()));

src/test/java/com/kjj/cases/live/manager/LotteryRule.java

@@ -96,20 +96,33 @@ public class LotteryRule implements AdminAuthorization {
         RuleBean save = new RuleBean();
         save.setProvinceCode(110000);
         save.setCityCode(null);
-        save.setTotalNum(10);
+        save.setTotalNum(40);
         Rule.add(save);
 
         RuleBean save1 = new RuleBean();
-        save1.setProvinceCode(330000);
+        save1.setProvinceCode(350000);
         save1.setCityCode(null);
-        save1.setTotalNum(90);
+        save1.setTotalNum(40);
         Rule.add(save1);
 
         RuleBean save2 = new RuleBean();
-        save2.setProvinceCode(330000);
-        save2.setCityCode(330100);
-        save2.setTotalNum(90);
+        save2.setProvinceCode(350000);
+        save2.setCityCode(350200);
+        save2.setTotalNum(40);
         Rule.add(save2);
+
+        RuleBean save3 = new RuleBean();
+        save3.setProvinceCode(420000);
+        save3.setCityCode(null);
+        save3.setTotalNum(20);
+        Rule.add(save3);
+
+        RuleBean save4 = new RuleBean();
+        save4.setProvinceCode(420000);
+        save4.setCityCode(420900);
+        save4.setTotalNum(20);
+        Rule.add(save4);
+
         saveParam.put("list",Rule);
         Response response = network.postResponse(saveParam, BasicConfig.MANAGER_save);
         boolean data = response.jsonPath().getBoolean("data");

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

@@ -18,10 +18,12 @@ public class BasicConfig {
     public static String VISITORKEY2 ="zFNkBc7JtvLPL6ifAfXbcgYH7WrugVmhv4CXQVq1CN1Y2C8pcBXoPvUPFbkWj7HbdkFpe4oX6SLjczK3ruYpQ8EaQ5";
     //直播访客 （刘超）
     public static String VISITORKEY3 ="LEH7epeHVDJWzhZ6DiexTHnsaP3ed5NWb7fwGDRPzUCcfxMKyEZr5fYSmKv5AZVQu1w2FRoEvz6mP3RzfeKLqjV8Kq1XE";
+    //直播访客 （李执）
+    public static String VISITORKEY4 ="5MgSyboxqzAQZZJEsTf43nVX8FkunrWfgVgxhR9mmo6thaPjMjfgUM62TrCUYvnSdn3kTGsGvJsSaiS4m5LS1up5twWa";
     //直播访客 （志勇）
-    public static String VISITORKEY4 ="zFNkBc7JtvLPL6ifAfXbcgYH7WruadyTs58VQNVezBEHURWFkb861yA3TQfkngLojnBnDenawiYNbNADYRdv1vFcDi";
+    public static String VISITORKEY9 ="zFNkBc7JtvLPL6ifAfXbcgYH7WruadyTs58VQNVezBEHURWFkb861yA3TQfkngLojnBnDenawiYNbNADYRdv1vFcDi";
     //直播访客 （周成）
-    public static String VISITORKEY5 ="zFNkBc7JtvLPL6ifAfXbcgYH7WruadzDMUjR7buv4kTkfKtxsjyzHLTi7V9HNnQ7ia7Reb5rk5k11dFQPNSuMzsEMW";
+    public static String VISITORKEY5 ="LEH7epeHVDJWzhZ6DiexTHnsy28uMFcnMj6a1Nh76ZtqrBohi2vbvjsoksZjyRcqFdSgh5zddoi95S8gKvBbuggy6Bhku";
     //直播访客 （新强）
     public static String VISITORKEY6 ="DyGoVEPj7nANppy7P8NS4Z4v3PAwxeqJodqYrmwYkoHYMsV4yAxbTXwZ5wWmGQTddQgxdWoNCmN43P8fzhcuWRmdE";
     //直播访客 （熊二）