Merge branch '20210412bxl' into 'master'

红包

See merge request test-group/kejiji!48

src/test/java/com/kjj/bean/RedFindDetail.java

+package com.kjj.bean;
+
+import lombok.Data;
+
+@Data
+public class RedFindDetail {
+    private String confId;
+    private String totalAmount;
+    private String totalNum;
+    private String luckAmount;
+    private String luckNum;
+    private String luckHelpNum;
+    private String generalNum;
+    private String showAmount;
+    private String afterMin;
+}

src/test/java/com/kjj/bean/RedHelpQuery.java

@@ -5,12 +5,12 @@ import lombok.Data;
 @Data
 public class RedHelpQuery {
     private String avatar;
-    private String end;
-    private String hasConfLuck;
-    private String help;
-    private String helpShareUser;
+    private boolean end;
+    private boolean hasConfLuck;
+    private boolean help;
+    private boolean helpShareUser;
     private String nickname;
-    private String selfShare;
+    private boolean selfShare;
 
 
 }

src/test/java/com/kjj/bean/RedHepDetail.java

@@ -2,8 +2,10 @@ package com.kjj.bean;
 
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class RedHepDetail {
-    private String helpAvatarList;
+    private List helpAvatarList;
     private int myHelpNum;
 }

src/test/java/com/kjj/bean/RedLuckResult.java

@@ -16,11 +16,10 @@ public class RedLuckResult {
     {
         private String avatar;
         private String nickname;
-        private String receivedAmount;
-
+        private int receivedAmount;
     }
 
-    private String hasNext;
+    private boolean hasNext;
 
 
 

src/test/java/com/kjj/bean/RedNum.java

@@ -5,10 +5,10 @@ import lombok.Data;
 @Data
 public class RedNum {
 
-    private String totalAmount;
+    private int totalAmount;
 
-    private String luckAmount;
+    private int luckAmount;
 
-    private String luckNum;
+    private int luckNum;
 
 }

src/test/java/com/kjj/bean/RedOpendate.java

@@ -6,6 +6,6 @@ import lombok.Data;
 public class RedOpendate {
     private int state;
     private String amount;
-    private String luck;
+    private boolean luck;
     private String code;
 }

src/test/java/com/kjj/bean/RedSultList.java

+package com.kjj.bean;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class RedSultList {
+    private List<resulList> list;
+
+    @Data
+    public static class resulList
+    {
+        private String avatar;
+        private String nickname;
+        private int receivedAmount;
+        private boolean receivedLuck;
+    }
+
+    private boolean hasNext;
+}

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

@@ -137,12 +137,13 @@ public class BasicConfig {
 
     //红包//
     public static final String MOBILE_AnchorRedList = MOBILE_HOST + "/conf/live/red/findRedList";
+    public static final String MOBILE_FindRedList = MOBILE_HOST + "/clue/red/findRedList";
+    public static final String MOBILE_RedFindDetail = MOBILE_HOST + "/conf/live/red/findRedDetail";
     public static final String MOBILE_GetSurplusAmount = MOBILE_HOST + "/conf/live/red/getSurplusAmount";
     public static final String MOBILE_Grounding = MOBILE_HOST + "/conf/live/red/up";
     public static final String MOBILE_RedStart = MOBILE_HOST + "/conf/live/red/start";
     public static final String MOBILE_RedGetSimple = MOBILE_HOST + "/conf/live/red/getSimple";
     public static final String MOBILE_RedSaveOrUpdate = MOBILE_HOST + "/conf/live/red/saveOrUpdate";
-    public static final String MOBILE_FindRedList = MOBILE_HOST + "/clue/red/findRedList";
     public static final String MOBILE_RedFindSimpleDetail = MOBILE_HOST + "/clue/red/findSimpleDetail";
     public static final String MOBILE_RedHelpDetail = MOBILE_HOST + "/kjy/live/user/red/help/detail";
     public static final String MOBILE_GetRedMpShare = MOBILE_HOST + "/kjy/live/share/getRedMpShare";

src/test/liveTestNG.xml

@@ -58,7 +58,7 @@
         </classes>
     </test>
 
-    <test preserve-order="true" name="红包领取">
+    <test preserve-order="true" name="红包">
         <classes>
             <class name="com.kjj.cases.live.LiveVistorRed"/>
         </classes>