Merge branch '20210412bxl' into 'master'

有奖答题

See merge request test-group/kejiji!46

src/test/java/com/kjj/bean/answer/AddAnswer.java

+package com.kjj.bean.answer;
+
+import lombok.Data;
+
+@Data
+public class AddAnswer {
+    private int totalAmount;
+    private int showAmount;
+    private int totalNum;
+}

src/test/java/com/kjj/bean/answer/AnswerQues.java

+package com.kjj.bean.answer;
+
+import lombok.Data;
+
+@Data
+public class AnswerQues {
+    private boolean result;
+    private int count;
+}

src/test/java/com/kjj/bean/answer/Option.java

+package com.kjj.bean.answer;
+
+import lombok.Data;
+
+@Data
+public class Option {
+    private String optionDetail;
+    private int optionType;
+    private int answerLen;
+}

src/test/java/com/kjj/bean/answer/ParticipateInfo.java

+package com.kjj.bean.answer;
+
+import lombok.Data;
+
+@Data
+public class ParticipateInfo {
+    private boolean result;
+    private int count;
+    private int quesType;
+    private String amount;
+    private int redReStatus;
+    private int welfareStatus;
+    private String rewardName;
+    private String rewardImg;
+    private String winnerName;
+
+}

src/test/java/com/kjj/bean/answer/QuesConf.java

+package com.kjj.bean.answer;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class QuesConf {
+    private String questionDetail;
+    private List<Option> optionList;
+    private String id;
+}

src/test/java/com/kjj/bean/answer/QuseRewardList.java

+package com.kjj.bean.answer;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class QuseRewardList {
+
+    private List<QuesList> list;
+    @Data
+    public static class QuesList{
+        private String quesConfId;
+        private String question;
+        private int quesType;
+        private int num;
+        private int amount;
+        private int showAmount;
+        private String rewardName;
+        private int rewardStatus;
+        private int sendRedNum;
+        private int drawDownNum;
+    }
+    private String hasNext;
+}

src/test/java/com/kjj/bean/answer/RewardDetail.java

+package com.kjj.bean.answer;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class RewardDetail {
+    private String quesConfId;
+    private String quesType;
+    private RedDetail redDetail;
+
+    @Data
+    public static class RedDetail{
+        private String redConfId;
+        private int showAmount;
+    }
+    private String welfareDetail;
+    private int quesRewardSeconds;
+    private String quesRewardEndTime;
+    private int rewardStatus;
+    private String quesId;
+    private String questionDetail;
+
+    private List<QuestionLists> questionList;
+
+    @Data
+    public static class QuestionLists{
+        private String id;
+        private int optionType;
+        private String optionDetail;
+    }
+
+
+}

src/test/java/com/kjj/bean/answer/RewardGetDetail.java

+package com.kjj.bean.answer;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class RewardGetDetail {
+    private String quesConfId;
+    private String quesType;
+    private String welfareDetail;
+    private RedDetail redDetail;
+
+@Data
+    public static class RedDetail
+    {
+        private String redConfId;
+        private int showAmount;
+        private int totalAmount;
+        private int totalNum;
+    }
+    private QuestionConf questionConf;
+
+    @Data
+    public static class QuestionConf
+    {
+        private String id;
+        private String questionDetail;
+        private List<OptionList> optionList;
+    }
+
+    @Data
+    public static class OptionList
+    {
+        private String id;
+        private String optionDetail;
+        private int optionType;
+    }
+
+
+}

src/test/java/com/kjj/bean/answer/WelfareDetail.java

+package com.kjj.bean.answer;
+
+import lombok.Data;
+
+@Data
+public class WelfareDetail {
+    private String rewardId;
+    private String rewardNum;
+}

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

@@ -138,7 +138,6 @@ public class BasicConfig {
     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_QuesSaveOrUpdate = MOBILE_HOST + "/conf/live/ques/reward/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";
@@ -152,8 +151,15 @@ public class BasicConfig {
     public static final String MOBILE_RedGetShareSign= MOBILE_HOST + "/kjy/live/getShareSign";
     public static final String MOBILE_RedLuckResult = MOBILE_HOST + "/clue/red/luckResultList";
     public static final String MOBILE_RedLuckHelp = MOBILE_HOST + "/kjy/live/user/red/help";
-    public static final String MOBILE_QuesRewardList = MOBILE_HOST + "/conf/live/ques/reward/list";
     public static final String MOBILE_OpenState = MOBILE_HOST + "/clue/red/open/state";
+    public static final String MOBILE_QuesSaveOrUpdate = MOBILE_HOST + "/conf/live/ques/reward/saveOrUpdate";
+    public static final String MOBILE_QuesRewardList = MOBILE_HOST + "/conf/live/ques/reward/list";
+    public static final String MOBILE_QuesRewardUp = MOBILE_HOST + "/conf/live/ques/reward/up";
+    public static final String MOBILE_QuesRewardStart = MOBILE_HOST + "/conf/live/ques/reward/start";
+    public static final String MOBILE_QuesRewardGetDetail = MOBILE_HOST + "/conf/live/ques/reward/getDetail";
+    public static final String MOBILE_QuesDetail = MOBILE_HOST + "/clue/ques/reward/detail";
+    public static final String MOBILE_QuesParticipate = MOBILE_HOST + "/clue/ques/reward/participate";
+    public static final String MOBILE_QuesParticipateInfo = MOBILE_HOST + "/clue/ques/reward/participateInfo";
 
 
 

src/test/liveTestNG.xml

@@ -26,7 +26,6 @@
         </classes>
 
     </test>
-
     <test preserve-order="true" name="访客券码领取">
                 <classes>
                     <class name="com.kjj.cases.live.User"/>
@@ -64,6 +63,11 @@
             <class name="com.kjj.cases.live.LiveVistorRed"/>
         </classes>
     </test>
+    <test preserve-order="true" name="有奖答题">
+        <classes>
+            <class name="com.kjj.cases.live.QuestionAwards"/>
+        </classes>
+    </test>
     <test preserve-order="true" name="助播-结束直播">
         <classes>
             <class name="com.kjj.cases.live.CloseLive"/>