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

Feature/20220524 gxh

See merge request !1

pom.xml

@@ -155,7 +155,7 @@
                         </property>
                         <property>
                             <name>listener</name>
-                            <value>com.kjj.config.ExtentTestNGIReporterListener</value>
+                            <value>com.oto.config.ExtentTestNGIReporterListener</value>
                         </property>
                     </properties>
                 </configuration>

src/test/Test.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
-<suite name="直播" verbose="1" thread-count="3">
-
-    <!-->专用于自测</!-->
-
-    <test preserve-order="true" name="直播素材">
-        <classes>
-            <class name="com.kjj.cases.live.liveConfig.LiveMaterial"/>
-        </classes>
-    </test>
-
-    <test preserve-order="true" name="创建直播">
-        <classes>
-            <class name="com.kjj.cases.live.liveConfig.SaveLive"/>
-        </classes>
-    </test>
-    <test preserve-order="true" name="配置代理人邀约奖励">
-    <classes>
-        <class name="com.kjj.cases.live.inviteReward.ManagerRewardConf"/>
-    </classes>
-    </test>
-
-    <test preserve-order="true" name="绑定关系绑定">
-        <classes>
-            <class name="com.kjj.cases.live.liveConfig.LiveBinding"/>
-        </classes>
-    </test>
-
-    <test preserve-order="true" name="代理人首页">
-        <classes>
-            <class name="com.kjj.cases.live.agent.Agent"/>
-        </classes>
-    </test>
-
-    <test preserve-order="true" name="小程序分享">
-        <classes>
-            <class name="com.kjj.cases.live.liveConfig.Share"/>
-        </classes>
-    </test>
-
-    <test preserve-order="true" name="获取抽奖码校验">
-        <classes>
-            <class name="com.kjj.cases.live.lotteryCode.LotteryCode"/>
-        </classes>
-    </test>
-
-    <test preserve-order="true" name="亲友券">
-        <classes>
-            <class name="com.kjj.cases.live.lottery.RelativeLottery"/>
-        </classes>
-    </test>
-
-</suite>
-

src/test/java/com/kjj/bean/admin/TokenUserBean.java

-package com.kjj.bean.admin;
-
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-public class TokenUserBean {
-    /**
-     * 直播用户ID
-     */
-    private Long liveUserId;
-
-    /**
-     * 第三方用户ID 例：客集集用户ID
-     */
-    private String thirdPartUId;
-
-    /**
-     * 代理人ID
-     */
-    private Long agentId;
-
-    /**
-     * 公司ID
-     */
-    private Long companyId;
-
-    /**
-     * 管理员ID
-     */
-    private Long adminId;
-
-    /**
-     * 失效时间. 执行加密算法时自动填充
-     */
-    private Date disableTime;
-
-
-
-
-
-}

src/test/java/com/kjj/bean/agent/AgentBean.java

-package com.kjj.bean.agent;
-
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-public class AgentBean {
-
-    private String liveId;
-    private int liveStatus;
-    private Date noticeTime;
-    private String  picUrl;
-    private String title;
-    private Date broadcastTime;
-    private int  ranking;
-    private int  inviteNum;
-    private int  presentNum;
-    private String  companyName;
-    private String    companyId;
-    private String  companyLogo;
-    private Long    appointmentNum;
-    private int   inviteAuthStatus;
-    private int agentAwardOpenFlag; // 是否开启代理人邀约奖励
-    private int agentNeedInviteNum; // 还需邀请多少人才能开启红包
-    private boolean agentVoucherHasOpen;//代理人赠送优惠券开关
-}

src/test/java/com/kjj/bean/agent/AgentCard.java

-package com.kjj.bean.agent;
-
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class AgentCard {
-
-    private String  sellerName;
-    private String  companyName;
-    private int companyId;
-    private String phoneNumber;
-    private String jobNumber;
-    private String wechatQrCode;
-    private String avatar;
-    private String teamId;
-    private String teamName;
-    private List<CompanyList> companyList;
-
-    @Data
-    class CompanyList{
-        private String companyId;
-        private String teamId;
-        private int companyLevel;
-    }
-
-}
-
-
-

src/test/java/com/kjj/bean/agent/AgentEndList.java

-package com.kjj.bean.agent;
-
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-public class AgentEndList {
-    private String liveId;
-    private String picUrl;
-    private String title;
-    private Date startTime;
-    private String hasPlayBack;
-    private String liveEndNeedShowRank;
-    private int liveStatus;
-    private int clueCount;
-    private int notFollowedClueCount;
-    private String companyName;
-    private String companyId;
-    private String companyLogo;
-    private int inviteAuthStatus;
-}

src/test/java/com/kjj/bean/agent/AgentVideo.java

-package com.kjj.bean.agent;
-import lombok.Data;
-import java.util.List;
-
-@Data
-public class AgentVideo {
-
-    private int pageIndex;
-    private int pageSize;
-    private String totalCount;
-    private List<videoList> list;
-    private boolean hasNext;
-    private String totalPage;
-
-    @Data
-    public static class videoList{
-        private String id;
-        private String videoTitle;
-        private String videoTag;
-        private String videoTop;
-        private String videoFirstImg;
-        private String watchNum;
-        private String gmtCreate;
-    }
-}

src/test/java/com/kjj/bean/agent/CustOrigins.java

-package com.kjj.bean.agent;
-
-import lombok.Data;
-
-@Data
-public class CustOrigins {
-    private String avatar;
-    private String name;
-    private long UserId;
-}

src/test/java/com/kjj/bean/agent/CustomerList.java

-package com.kjj.bean.agent;
-
-import lombok.Data;
-
-@Data
-public class CustomerList {
-    private String customerId;
-
-}

src/test/java/com/kjj/bean/agent/GrabWelfares.java

-package com.kjj.bean.agent;
-
-import lombok.Data;
-
-@Data
-public class GrabWelfares {
-
-    private Boolean specifyAward;
-}

src/test/java/com/kjj/bean/agent/LiveUserList.java

-package com.kjj.bean.agent;
-
-import lombok.Data;
-
-@Data
-public class LiveUserList {
-    private String liveUserId;
-}

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/AddReward.java

-package com.kjj.bean.answer;
-
-import lombok.Data;
-
-@Data
-public class AddReward {
-    private int amount;
-    private int showAmount;
-    private int num;
-}

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

-package com.kjj.bean.answer;
-
-import lombok.Data;
-
-@Data
-public class AddWelfareConf {
-    private int welfareId;
-    private int num;
-
-}

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/QuesList.java

-package com.kjj.bean.answer;
-
-import lombok.Data;
-
-
-@Data
-public class QuesList {
-    private String quesId;
-    private String id;
-
-
-}

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

-package com.kjj.bean.answer;
-
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class QuestionList {
-
-    public List<QuestionList.question> list;
-
-    @Data
-    public static class question {
-        private String id;
-        private int optionType;
-        private String optionDetail;
-    }
-}

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<QuseRewardList.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/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/RewardList.java

-package com.kjj.bean.answer;
-
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class RewardList {
-    private List<RewardList.Reward_List> list;
-@Data
-    public static class Reward_List{
-        private int id;
-        private String question;
-        private int quesType;
-        private int num;
-        private int amount;
-        private int showAmount;
-        private String rewardName;
-        private int rewardStatus;
-    }
-
-}
-

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/bean/card/GoodMajor.java

-package com.kjj.bean.card;
-
-import lombok.Data;
-
-@Data
-public class GoodMajor {
-    String code;
-    String desc;
-    boolean choose;
-    String type;
-}

src/test/java/com/kjj/bean/card/WechatCard.java

-package com.kjj.bean.card;
-
-import lombok.Data;
-
-@Data
-public class WechatCard {
-    String avatar;
-    String address;
-    String addressLocation;
-    int avatarStyle;
-    int companyId;
-    String jobPost;
-    String phoneNumber;
-    String sellerName;
-    String wechatNumber;
-}

src/test/java/com/kjj/bean/choice/Ansernum.java

-package com.kjj.bean.choice;
-
-import lombok.Data;
-
-@Data
-public class Ansernum {
-
-    private String answerId;
-    private int num;
-
-}

src/test/java/com/kjj/bean/choice/AnswerList.java

-package com.kjj.bean.choice;
-
-import lombok.Data;
-
-@Data
-public class AnswerList {
-    private String answer;
-    private int num;
-    private String resourceTitle;
-}

src/test/java/com/kjj/bean/choice/AnswerVosList.java

-package com.kjj.bean.choice;
-
-import lombok.Data;
-
-@Data
-public class AnswerVosList {
-    private String id;
-    private String answer;
-    private String relationResourcePushVo;
-
-}

src/test/java/com/kjj/bean/choice/ChoiceList.java

-package com.kjj.bean.choice;
-
-import lombok.Data;
-
-@Data
-public class ChoiceList {
-    private String answer;
-    private String relationResourceId;
-
-}

src/test/java/com/kjj/bean/choice/GetChoiceArray.java

-package com.kjj.bean.choice;
-
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public  class GetChoiceArray {
-    private String id;
-    private String question;
-    private List<AnswerList> answerList;
-    private String resourceTitleList;
-}
\ No newline at end of file

src/test/java/com/kjj/bean/choice/GetChoiceList.java

-package com.kjj.bean.choice;
-
-import lombok.Data;
-
-@Data
-public  class GetChoiceList {
-    private GetChoiceArray list;
-    private boolean hasNext;
-
-}

src/test/java/com/kjj/bean/choice/GetChoiceQues.java

-package com.kjj.bean.choice;
-
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class GetChoiceQues {
-    private QuestionVo questionVo;
-    private List<AnswerVosList> answerVos;
-}

src/test/java/com/kjj/bean/choice/QuestionVo.java

-package com.kjj.bean.choice;
-
-import lombok.Data;
-
-@Data
-public class QuestionVo {
-    private String id;
-    private String question;
-
-}

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

-package com.kjj.bean.choice;
-
-import lombok.Data;
-
-@Data
-public class answer {
-    private String answer;
-    private int num;
-    private String resourceTitle;
-}

src/test/java/com/kjj/bean/corp/Auth.java

-package com.kjj.bean.corp;
-
-import lombok.Data;
-
-@Data
-public class Auth {
-    private String authName;
-    private Long id;
-    private int totalCount;
-}

src/test/java/com/kjj/bean/corp/BizTypeBean.java

-package com.kjj.bean.corp;
-
-import lombok.Data;
-
-@Data
-public class BizTypeBean {
-    private long bizCompanyId;
-    private int bizType;
-}

src/test/java/com/kjj/bean/corp/Corp.java

-package com.kjj.bean.corp;
-
-import lombok.Data;
-
-@Data
-public class Corp {
-    private Integer companyEnable;
-    private String companyName;
-    private long id;
-}

src/test/java/com/kjj/bean/corp/Page.java

-package com.kjj.bean.corp;
-
-import lombok.Data;
-
-@Data
-public class Page {
-    private long authId;
-    private int hideState;
-    private long id;
-    private String pageName;
-}

src/test/java/com/kjj/bean/corp/Staff.java

-package com.kjj.bean.corp;
-
-import lombok.Data;
-
-@Data
-public class Staff {
-    private long authId;
-    private long id;
-    private int staffEnable;
-    private String staffName;
-    private String staffPhone;
-}

src/test/java/com/kjj/bean/issue/Dialogue.java

-package com.kjj.bean.issue;
-
-import lombok.Data;
-
-import java.util.ArrayList;
-
-@Data
-public class Dialogue {
-    private ArrayList<String> quesList;
-    private String agentConclusion;
-    private String agentGreet;
-    private String promiseTitle;
-    private String promiseButton;
-    private int inviteType;
-
-    public Dialogue(ArrayList<String> quesList, String agentConclusion, String agentGreet, String promiseTitle, String promiseButton, int inviteType) {
-        this.quesList = quesList;
-        this.agentConclusion = agentConclusion;
-        this.agentGreet = agentGreet;
-        this.promiseTitle = promiseTitle;
-        this.promiseButton = promiseButton;
-        this.inviteType = inviteType;
-    }
-}

src/test/java/com/kjj/bean/issue/HistoryList.java

-package com.kjj.bean.issue;
-
-import lombok.Data;
-
-@Data
-public class HistoryList {
-    private String id;
-    private String question;
-    private String askNum;
-}

src/test/java/com/kjj/bean/issue/LastList.java

-package com.kjj.bean.issue;
-
-import lombok.Data;
-
-@Data
-public class LastList {
-    private String id;
-    private String question;
-    private String askNum;
-}

src/test/java/com/kjj/bean/issue/QuestionList.java

-package com.kjj.bean.issue;
-
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class QuestionList {
-    private List<HistoryList> historyList;
-    private List<LastList> lastList;
-
-}

src/test/java/com/kjj/bean/issue/SpokeList.java

-package com.kjj.bean.issue;
-
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class SpokeList {
-    private long now;
-    private List<Vo> vo;
-}

src/test/java/com/kjj/bean/issue/Spolist.java

-package com.kjj.bean.issue;
-
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class Spolist {
-    private String now;
-    private List<VoList> list;
-}

src/test/java/com/kjj/bean/issue/Vo.java

-package com.kjj.bean.issue;
-
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class Vo {
-    private long time;
-    private List<VoList> list;
-}

src/test/java/com/kjj/bean/issue/VoList.java

-package com.kjj.bean.issue;
-
-import lombok.Data;
-
-@Data
-public class VoList {
-    private String name;
-    private String msg;
-    private String replyUserId;
-    private String replyName;
-}

src/test/java/com/kjj/bean/issue/issuelist.java

-package com.kjj.bean.issue;
-
-import lombok.Data;
-
-@Data
-public class issuelist {
-    private String id;
-    private String question;
-    private String askNum;
-}

src/test/java/com/kjj/bean/jmterbean/OtoTokenCookie.java

-package com.kjj.bean.jmterbean;
-
-import lombok.Data;
-
-/**
- * OTO-销售工作台token
- *
- * @author ZhangJun
- * @date 2022/1/8 5:00 下午
- */
-@Data
-public class OtoTokenCookie {
-
-    /**
-     * 登录用户id
-     */
-    private String loginId;
-
-    /**
-     * 登录手机号
-     */
-    private String phoneNumber;
-
-    /**
-     * 过期时间
-     */
-    private Long expiredTime;
-}

src/test/java/com/kjj/bean/lottery/CondDetail.java

-package com.kjj.bean.lottery;
-
-
-public class CondDetail {
-    //宝箱id
-    private String treasureConfId;
-    //奖品领取状态
-    private boolean finishFlag;
-
-
-
-    public String getTreasureConfId() {
-        return treasureConfId;
-    }
-
-    public void setTreasureConfId(String treasureConfId) {
-        this.treasureConfId = treasureConfId;
-    }
-
-    /**
-     * 获取是否完成标记
-     * @return 是否完成标记
-     */
-    public boolean isFinishFlag() {
-        return finishFlag;
-    }
-
-    public void setFinishFlag(boolean finishFlag) {
-        this.finishFlag = finishFlag;
-    }
-}

src/test/java/com/kjj/bean/lottery/ConfIdList.java

-package com.kjj.bean.lottery;
-
-import lombok.Data;
-
-@Data
-public class ConfIdList {
-    private String welfareConfId;
-    private Integer confId;
-    private Integer specifyStatus;
-    private Integer afterMin;
-    private Integer specNum;
-    private String importExcelUrl;
-    private Integer teamConfStatus;
-    private Integer areaConfStatus;
-    private String name;
-    private Long broadcastTime;
-}

src/test/java/com/kjj/bean/lottery/LotteryList.java

-package com.kjj.bean.lottery;
-
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class LotteryList {
-    private List<List_Lottery> LotteryList;
-    private String welfareId;
-    private String configId;
-
-    @Data
-    public static class List_Lottery
-    {
-        private String id;
-        private String name;
-    }
-
-
-}

src/test/java/com/kjj/bean/manager/AnswerBean.java

-package com.kjj.bean.manager;
-
-
-import lombok.Data;
-
-@Data
-public class AnswerBean {
-    private String optionDetail;
-    private int optionType;
-
-
-}

src/test/java/com/kjj/bean/manager/AnswerListBean.java

-package com.kjj.bean.manager;
-import lombok.Data;
-
-import java.util.List;
-@Data
-public class AnswerListBean {
-    private String questionDetail;
-    private List<AnswerBean> optionList;
-
-
-}

src/test/java/com/kjj/bean/manager/CaseList.java

-package com.kjj.bean.manager;
-
-import lombok.Data;
-
-@Data
-public class CaseList {
-
-    private long id;
-    private long sellerId;
-
-}

src/test/java/com/kjj/bean/manager/EvaluationDetail.java

-package com.kjj.bean.manager;
-
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class EvaluationDetail {
-    private String backgroundPic;
-    private String defaultResultPic;
-    private String evaluationTitle;
-    private long id;
-    private List<Questions> questions;
-    private List<Results> results;
-
-    @Data
-    public class Questions {
-        private long evaluationId;
-        private long id;
-        private List<Options> options;
-        private String questionTitle;
-        private int questionType;
-        private int questionRequired;
-
-        @Data
-        public class Options {
-            private long id;
-            private int optionScore;
-            private String optionTitle;
-            private long questionId;
-        }
-    }
-
-    @Data
-    public class Results {
-        private int endScore;
-        private long evaluationId;
-        private long id;
-        private String resultPic;
-        private int startScore;
-    }
-}

src/test/java/com/kjj/bean/manager/EvaluationList.java

-package com.kjj.bean.manager;
-
-import lombok.Data;
-
-@Data
-public class EvaluationList {
-    private int evaluationStatus;
-    private String evaluationTitle;
-    private long id;
-}

src/test/java/com/kjj/bean/manager/GuessList.java

-package com.kjj.bean.manager;
-
-import lombok.Data;
-
-@Data
-public class GuessList {
-    private String confId;
-    private Integer redSort;
-    private Integer afterMin;
-    private String id;
-}

src/test/java/com/kjj/bean/manager/Material.java

-package com.kjj.bean.manager;
-
-import lombok.Data;
-
-@Data
-public class Material {
-    private long id;
-    private int agentReceiveType;
-
-    public Material(long l, int i) {
-        this.id = l;
-        this.agentReceiveType = i;
-    }
-}

src/test/java/com/kjj/bean/manager/PassQues.java

-package com.kjj.bean.manager;
-
-import lombok.Data;
-
-@Data
-public class PassQues {
-    private String optionDetail;
-    public Integer optionType;
-    private Integer id;
-}

src/test/java/com/kjj/bean/manager/ProvinceCityCodeList.java

-package com.kjj.bean.manager;
-
-import lombok.Data;
-
-@Data
-public class ProvinceCityCodeList {
-
-    private Integer provinceCode;
-    private Integer cityCode;
-
-
-}

src/test/java/com/kjj/bean/manager/QuesReward.java

-package com.kjj.bean.manager;
-
-import lombok.Data;
-
-@Data
-public class QuesReward {
-
-    private long id;
-}

src/test/java/com/kjj/bean/manager/RedLevelBean.java

-package com.kjj.bean.manager;
-
-
-import lombok.Data;
-
-@Data
-public class RedLevelBean {
-    private int amount;
-    private int num;
-
-}

src/test/java/com/kjj/bean/manager/RedList.java

-package com.kjj.bean.manager;
-
-import lombok.Data;
-
-@Data
-public class RedList {
-
-    private Integer id;
-    private long bizConfId;
-    private int taskType;
-}

src/test/java/com/kjj/bean/manager/RewardPkBean.java

-package com.kjj.bean.manager;
-
-import lombok.Data;
-
-@Data
-public class RewardPkBean {
-
-    private String prizeName;
-
-    private int ranking;
-
-
-}
\ No newline at end of file

src/test/java/com/kjj/bean/manager/RuleBean.java

-package com.kjj.bean.manager;
-
-import lombok.Data;
-
-@Data
-public class RuleBean {
-
-    public Integer cityCode;
-    public Integer provinceCode;
-    public Integer totalNum;
-}

src/test/java/com/kjj/bean/manager/SaveLimitBean.java

-package com.kjj.bean.manager;
-
-import lombok.Data;
-
-@Data
-public class SaveLimitBean {
-    public Integer confName;
-    public String confValue;
-}

src/test/java/com/kjj/bean/manager/SaveRewardConfig.java

-package com.kjj.bean.manager;
-
-import lombok.Data;
-
-@Data
-public class SaveRewardConfig {
-   private Integer confName;
-   private Integer confValue;
-
-
-}

src/test/java/com/kjj/bean/manager/TeamAssignmentList.java

-package com.kjj.bean.manager;
-
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class TeamAssignmentList {
-
-    private List<TeamAssignmentList.team_List> list;
-
-    @Data
-    public static class team_List {
-        private long id;
-
-
-    }
-}

src/test/java/com/kjj/bean/manager/TeamList.java

-package com.kjj.bean.manager;
-
-import lombok.Data;
-
-@Data
-public class TeamList {
-    private Integer id;
-
-}

src/test/java/com/kjj/bean/manager/TestAB.java

-package com.kjj.bean.manager;
-
-import lombok.Data;
-
-@Data
-public class TestAB {
-    private String appointmentImg;
-    private String baseInfoImg;
-    private String helpImg;
-    private String phoneImg;
-}

src/test/java/com/kjj/bean/manager/TreasureAward.java

-package com.kjj.bean.manager;
-
-import lombok.Data;
-
-@Data
-public class TreasureAward {
-    private String awardName;
-    private long welfareId;
-    private Integer totalNum;
-    private long relatedId;
-    private long bizConfId;
-    private Integer treasureType;
-    private Integer ruleType;
-    private Integer fixedNum;
-    private Integer maxNum;
-    private Integer treasureProbability;
-    private Integer winLimitCount;
-    private Integer isLimit;
-
-}

src/test/java/com/kjj/bean/manager/TreasureCode.java

-package com.kjj.bean.manager;
-
-import lombok.Data;
-
-@Data
-public class TreasureCode {
-    private long relatedId;
-    private long bizConfId;
-    private Integer treasureType;
-    private Integer ruleType;
-    private Integer fixedNum;
-    private Integer maxNum;
-    private Integer treasureProbability;
-    private Integer winLimitCount;
-
-
-}

src/test/java/com/kjj/bean/manager/TreasureList.java

-package com.kjj.bean.manager;
-
-import lombok.Data;
-
-@Data
-public class TreasureList {
-    private long treasureConfId;
-    private Integer treasureSort;
-    private Integer receiveNum;
-    private Integer totalNum;
-}

src/test/java/com/kjj/bean/manager/TreasureRed.java

-package com.kjj.bean.manager;
-
-import lombok.Data;
-
-@Data
-public class TreasureRed {
-    private  Integer redTotalAmount;
-    private  Integer totalNum;
-    private  long relatedId;
-    private  long bizConfId;
-    private Integer treasureType;
-    private Integer ruleType;
-    private Integer fixedNum;
-    private Integer maxNum;
-    private Integer treasureProbability;
-    private Integer winLimitCount;
-    private Integer showAmount;
-
-}

src/test/java/com/kjj/bean/manager/UsedList.java

-package com.kjj.bean.manager;
-
-import lombok.Data;
-
-@Data
-public class UsedList {
-    private long id;
-    private String resourceTitle;
-}

src/test/java/com/kjj/bean/manager/VideoBean.java

-package com.kjj.bean.manager;
-
-import lombok.Data;
-
-@Data
-public class VideoBean {
-
-    private Integer id;
-}

src/test/java/com/kjj/bean/manager/VoteBean.java

-package com.kjj.bean.manager;
-
-import lombok.Data;
-
-@Data
-public class VoteBean {
-
-    private int id;
-    private  String name;
-    private int resourceType;
-
-}

src/test/java/com/kjj/bean/manager/VoteListBean.java

-package com.kjj.bean.manager;
-
-import com.kjj.bean.manager.VoteBean;
-import lombok.Data;
-
-@Data
-public class VoteListBean {
-
-    private String answer;
-    private int relationResourceId;
-    private VoteBean relationResource;
-
-}

src/test/java/com/kjj/bean/manager/WelfareBean.java

-package com.kjj.bean.manager;
-
-import lombok.Data;
-
-@Data
-public class WelfareBean {
-private int id;
-
-}

src/test/java/com/kjj/bean/manager/WelfareList.java

-package com.kjj.bean.manager;
-
-import lombok.Data;
-
-@Data
-public class WelfareList {
-    private long id;
-
-}

src/test/java/com/kjj/bean/manager/WelfareListBean.java

-package com.kjj.bean.manager;
-
-import com.kjj.bean.manager.WelfareBean;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class WelfareListBean {
-private int totalCount;
-private List<WelfareBean> list;
-}

src/test/java/com/kjj/bean/marketTools/Activity.java

-package com.kjj.bean.marketTools;
-
-import lombok.Data;
-
-@Data
-public class Activity {
-    private String title;
-    private  long id;
-    private  int status;
-}

src/test/java/com/kjj/bean/marketTools/Gift.java

-package com.kjj.bean.marketTools;
-
-import lombok.Data;
-
-@Data
-public class Gift {
-    String id;
-    String giftName;
-    String giftPicUrl;
-    int giftType;
-}

src/test/java/com/kjj/bean/marketTools/LotteryTable.java

-package com.kjj.bean.marketTools;
-
-import lombok.Data;
-
-@Data
-public class LotteryTable {
-    private int id;
-    private String title;
-    private int status;
-    private int publicly;
-}

src/test/java/com/kjj/bean/marketTools/PrizeDetail.java

-package com.kjj.bean.marketTools;
-
-import lombok.Data;
-
-import java.util.ArrayList;
-
-@Data
-public class PrizeDetail {
-    private int customPrizeRate;
-    private int customPrizeType;
-    private String activityCustomPrizeId;
-    private String prizeImg;
-    private String prizeName;
-    private int totalStock;
-    private ArrayList<String> winnerIds;
-}

src/test/java/com/kjj/bean/marketTools/Visitor.java

-package com.kjj.bean.marketTools;
-
-import lombok.Data;
-
-@Data
-public class Visitor {
-    private String avatar;
-    private String visitorId;
-    private String visitorNickname;
-}

src/test/java/com/kjj/bean/red/AnchorRedList.java

-package com.kjj.bean.red;
-
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class AnchorRedList {
-
-    private String surplusAmount;
-
-    private List<RedList> redList;
-
-    @Data
-    public static class RedList
-    {
-        private String confId;
-        private int totalAmount;
-        private int totalNum;
-        private int luckAmount;
-        private int luckNum;
-        private int luckHelpNum;
-        private int generalNum;
-        private int showAmount;
-        private int totalSurplusNum;
-        private int luckSurplusNum;
-        private int redStatus;
-        private int afterMin;
-    }
-    private String redPackReceiving;
-
-
-}

src/test/java/com/kjj/bean/red/RedConf.java

-package com.kjj.bean.red;
-
-import lombok.Data;
-
-@Data
-public class RedConf {
-    private String bizConfId;
-    private String taskName;
-    private Integer taskType;
-    private String id;
-
-
-}

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

-package com.kjj.bean.red;
-
-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/red/RedGetSimple.java

-package com.kjj.bean.red;
-
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-public class RedGetSimple {
-
-    private Date startTime;
-}

src/test/java/com/kjj/bean/red/RedHelpInfo.java

-package com.kjj.bean.red;
-
-import lombok.Data;
-
-@Data
-public class RedHelpInfo {
-
-    private String avatar;
-
-    private String confId;
-
-    private int myHelpNum;
-
-    private String nickname;
-
-}

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

-package com.kjj.bean.red;
-
-import lombok.Data;
-
-@Data
-public class RedHelpQuery {
-    private String avatar;
-    private boolean end;
-    private boolean hasConfLuck;
-    private boolean help;
-    private boolean helpShareUser;
-    private String nickname;
-    private boolean selfShare;
-
-
-}
-

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

-package com.kjj.bean.red;
-
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class RedHepDetail {
-    private List helpAvatarList;
-    private int myHelpNum;
-}

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

-package com.kjj.bean.red;
-
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class RedLuckResult {
-
-
-    private List<LuckList> list;
-
-
-    @Data
-    public static class LuckList
-    {
-        private String avatar;
-        private String nickname;
-        private int receivedAmount;
-    }
-
-    private boolean hasNext;
-
-
-
-}
-
-

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

-package com.kjj.bean.red;
-
-import lombok.Data;
-
-@Data
-public class RedNum {
-
-    private int totalAmount;
-
-    private int luckAmount;
-
-    private int luckNum;
-
-}

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

-package com.kjj.bean.red;
-
-import lombok.Data;
-
-@Data
-public class RedOpendate {
-    private int state;
-    private String amount;
-    private boolean luck;
-    private String code;
-}

src/test/java/com/kjj/bean/red/RedOrdinary.java

-package com.kjj.bean.red;
-
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-public class RedOrdinary {
-    private String confId;
-    private int redStatus;
-    private Date startTime;
-    private int showAmount;
-    private int luckHelpNum;
-}