Merge branch 'master' of http://git.dayaedu.com/yonge/cooleshow

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/CourseGroupController.java

@@ -2,6 +2,7 @@ package com.yonge.cooleshow.admin.controller;
 
 import com.yonge.cooleshow.biz.dal.dto.search.CourseGroupDetailSearch;
 import com.yonge.cooleshow.biz.dal.dto.search.CourseGroupSearch;
+import com.yonge.cooleshow.biz.dal.entity.CourseGroup;
 import com.yonge.cooleshow.biz.dal.entity.VideoLessonGroupDetail;
 import com.yonge.cooleshow.biz.dal.service.CourseGroupService;
 import com.yonge.cooleshow.biz.dal.support.PageUtil;
@@ -11,10 +12,13 @@ import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.toolset.base.page.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import javax.validation.constraints.NotNull;
+
 /**
  * @Author: cy
  * @Date: 2022/5/19
@@ -27,51 +31,95 @@ public class CourseGroupController extends BaseController {
     @Autowired
     private CourseGroupService courseGroupService;
 
-    @ApiOperation(value = "课程组管理-陪练课")
+    @ApiOperation(value = "课程组管理-陪练课",notes = "{\n" +
+            "    \"subjectId\":20,\n" +
+            "    \"search\":\"师\",\n" +
+            "    \"status\":\"ING\"\n" +
+            "}")
     @PostMapping(value = "/practice")
     public HttpResponseResult<PageInfo<CourseGroupPracticeVo>> selectPracticeGroup(@RequestBody CourseGroupSearch search) {
         return succeed(PageUtil.pageInfo(courseGroupService.selectPracticeGroup(PageUtil.getPage(search), search)));
     }
 
-    @ApiOperation(value = "课程组管理-陪练课-详情")
+    @ApiOperation(value = "课程组管理-陪练课-详情",notes = "{\n" +
+            "    \"courseGroupId\": 140,\n" +
+            "    \"teacherSign\": 0,\n" +
+            "    \"studentSign\": 0,\n" +
+            "    \"search\": \"游\",\n" +
+            "    \"status\": \"COMPLETE\",\n" +
+            "    \"salaryStatus\": \"NOT_START\",\n" +
+            "    \"startTime\": \"2022-05-21 08:00:00\",\n" +
+            "    \"endTime\": \"\"\n" +
+            "}")
     @PostMapping(value = "/practice/detail")
     public HttpResponseResult<PageInfo<CourseGroupPracticeDetailVo>> selectPracticeGroupDetail(@Validated @RequestBody CourseGroupDetailSearch search) {
         return succeed(PageUtil.pageInfo(courseGroupService.selectPracticeGroupDetail(PageUtil.getPage(search), search)));
     }
 
-    @ApiOperation(value = "课程组管理-直播课")
+    @ApiOperation(value = "课程组管理-直播课",notes = "{\n" +
+            "    \"subjectId\":73,\n" +
+            "    \"search\":\"夏\",\n" +
+            "    \"status\":\"ING\"\n" +
+            "}")
     @PostMapping(value = "/live")
     public HttpResponseResult<PageInfo<CourseGroupLiveVo>> selectLiveGroup(@RequestBody CourseGroupSearch search) {
         return succeed(PageUtil.pageInfo(courseGroupService.selectLiveGroup(PageUtil.getPage(search), search)));
     }
 
-    @ApiOperation(value = "课程组管理-直播课-购买学员")
+    @ApiOperation(value = "课程组管理-直播课-购买学员",notes = "{\n" +
+            "    \"groupId\":140,\n" +
+            "    \"search\":\"游\",\n" +
+            "    \"orderNo\":\"22051615250800001\"\n" +
+            "}")
     @PostMapping(value = "/live/studentPayment")
     public HttpResponseResult<PageInfo<CourseSchedulePaymentVo>> selectLiveGroupStudent(@RequestBody CourseGroupSearch search) {
         return succeed(PageUtil.pageInfo(courseGroupService.selectLiveGroupStudent(PageUtil.getPage(search), search)));
     }
 
-    @ApiOperation(value = "课程组管理-直播课-教学计划")
+    @ApiOperation(value = "课程组管理-直播课-教学计划",notes = "{\n" +
+            "    \"groupId\":140,\n" +
+            "    \"courseId\":\"391\",\n" +
+            "    \"salaryStatus\":\"NOT_START\",\n" +
+            "    \"startTime\":\"2022-05-20 08:00:00\",\n" +
+            "    \"endTime\":null\n" +
+            "}")
     @PostMapping(value = "/live/plan")
     public HttpResponseResult<PageInfo<CourseSchedulePlanVo>> selectLiveGroupPlan(@RequestBody CourseGroupSearch search) {
         return succeed(PageUtil.pageInfo(courseGroupService.selectLiveGroupPlan(PageUtil.getPage(search), search)));
     }
 
-    @ApiOperation(value = "课程组管理-视频课")
+    @ApiOperation(value = "课程组管理-视频课",notes = "{\n" +
+            "    \"subjectId\":21,\n" +
+            "    \"search\":\"老\"\n" +
+            "}")
     @PostMapping(value = "/video")
     public HttpResponseResult<PageInfo<CourseGroupVideoVo>> selectVideoGroup(@RequestBody CourseGroupSearch search) {
         return succeed(PageUtil.pageInfo(courseGroupService.selectVideoGroup(PageUtil.getPage(search), search)));
     }
 
-    @ApiOperation(value = "课程组管理-视频课-购买学员")
+    @ApiOperation(value = "课程组管理-视频课-购买学员",notes = "{\n" +
+            "    \"groupId\":51,\n" +
+            "    \"orderNo\":\"22050720002900001\",\n" +
+            "    \"search\":\"1\",\n" +
+            "    \"startTime\":\"2022-05-07 20:00:29\",\n" +
+            "    \"endTime\":null\n" +
+            "}")
     @PostMapping(value = "/video/studentPayment")
     public HttpResponseResult<PageInfo<CourseGroupStudentVo>> selectVideoGroupStudent(@RequestBody CourseGroupSearch search) {
         return succeed(PageUtil.pageInfo(courseGroupService.selectVideoGroupStudent(PageUtil.getPage(search), search)));
     }
 
-    @ApiOperation(value = "课程组管理-视频课-教学计划")
+    @ApiOperation(value = "课程组管理-视频课-教学计划",notes = "{\n" +
+            "    \"groupId\":18\n" +
+            "}")
     @PostMapping(value = "/video/plan")
     public HttpResponseResult<PageInfo<VideoLessonGroupDetail>> selectVideoGroupPlan(@RequestBody CourseGroupSearch search) {
         return succeed(PageUtil.pageInfo(courseGroupService.selectVideoGroupPlan(PageUtil.getPage(search), search)));
     }
+
+    @ApiOperation(value = "课程组管理-直播课-课程信息")
+    @GetMapping(value = "/live/info")
+    public HttpResponseResult<CourseGroup> selectLiveGroupInfo(@NotNull Long groupId) {
+        return succeed(courseGroupService.selectLiveGroupInfo(groupId));
+    }
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/convert/WithdrawalStatusConvert.java

@@ -26,7 +26,7 @@ public class WithdrawalStatusConvert implements Converter<AuthStatusEnum> {
     @Override
     public AuthStatusEnum convertToJavaData(CellData cellData, ExcelContentProperty excelContentProperty, GlobalConfiguration globalConfiguration) throws Exception {
         try {
-            return AuthStatusEnum.getByName(cellData.getStringValue().trim());
+            return AuthStatusEnum.valueOf(cellData.getStringValue().trim());
         } catch (Exception e) {
             return null;
         }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/SysUserContractRecordDao.java

@@ -18,8 +18,11 @@ public interface SysUserContractRecordDao extends BaseMapper<SysUserContractReco
 
     int insertBatch(@Param("entities") List<SysUserContractRecord> entities);
 
-    Boolean checkContractSign(@Param("userId")Long userId,@Param("contractType") String contractType);
+    Boolean checkContractSign(@Param("userId") Long userId, @Param("contractType") String contractType);
 
-    void contractCallbackUpdate(@Param("param") Map<String, Object> map);
+    void contractCallbackUpdate(@Param("status") String status,
+                                @Param("serialNo") String serialNo,
+                                @Param("url") String url,
+                                @Param("errMsg") String errMsg);
 }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/SysUserContractRecord.java

@@ -3,6 +3,7 @@ package com.yonge.cooleshow.biz.dal.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -26,7 +27,7 @@ public class SysUserContractRecord implements Serializable {
     private Long userId;
 
     @TableField("user_type_")
-    @ApiModelProperty(value = "用户类型")
+    @ApiModelProperty(value = "用户类型 ")
     private String userType;
 
     @TableField("contract_id_")
@@ -37,18 +38,27 @@ public class SysUserContractRecord implements Serializable {
     @ApiModelProperty(value = "协议地址")
     private String url;
 
-    @TableField("created_time_")
-    @ApiModelProperty(value = "创建时间")
-    private Date createdTime;
-
     @TableField("contract_no_")
     @ApiModelProperty(value = "合同编号")
     private String contractNo;
 
+    @TableField("status_")
+    @ApiModelProperty(value = "签署状态 DONG 签署中 SUCCESS 签署完成 FAILED 签署失败")
+    private String status;
+
+    @TableField("err_msg_")
+    @ApiModelProperty(value = "异常消息")
+    private String errMsg;
+
+
     @TableField("remark_")
     @ApiModelProperty(value = "备注")
     private String remark;
 
+    @TableField("created_time_")
+    @ApiModelProperty(value = "创建时间")
+    private Date createdTime;
+
     public Long getId() {
         return id;
     }
@@ -113,5 +123,20 @@ public class SysUserContractRecord implements Serializable {
         this.remark = remark;
     }
 
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public String getErrMsg() {
+        return errMsg;
+    }
+
+    public void setErrMsg(String errMsg) {
+        this.errMsg = errMsg;
+    }
 }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/AccountBizTypeEnum.java

@@ -10,7 +10,6 @@ import com.yonge.toolset.base.enums.BaseEnum;
  * @Data: 2022/4/7 15:48
  */
 public enum AccountBizTypeEnum implements BaseEnum<String, AccountBizTypeEnum> {
-
     PRACTICE("陪练课", InOrOutEnum.IN),
     LIVE("直播课", InOrOutEnum.IN),
     VIDEO("视频课", InOrOutEnum.IN),
@@ -23,33 +22,21 @@ public enum AccountBizTypeEnum implements BaseEnum<String, AccountBizTypeEnum> {
     private InOrOutEnum inOrOut;
 
     AccountBizTypeEnum(String msg, InOrOutEnum inOrOut) {
-        this.code = getCode();
+        this.code = this.name();
         this.msg = msg;
         this.inOrOut = inOrOut;
     }
 
     @Override
     public String getCode() {
-        return this.name();
-    }
-
-    public void setCode(String code) {
-        this.code = code;
+        return this.code;
     }
 
     public String getMsg() {
-        return msg;
-    }
-
-    public void setMsg(String msg) {
-        this.msg = msg;
+        return this.msg;
     }
 
     public InOrOutEnum getInOrOut() {
-        return inOrOut;
-    }
-
-    public void setInOrOut(InOrOutEnum inOrOut) {
-        this.inOrOut = inOrOut;
+        return this.inOrOut;
     }
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/AppVersionStatusEnum.java

@@ -11,7 +11,6 @@ import com.yonge.toolset.base.enums.BaseEnum;
  */
 public enum AppVersionStatusEnum implements BaseEnum<String, AppVersionStatusEnum> {
 
-
     NEWEST("newest","newest"),
     HISTORY("history","history"),
     AUDITING("auditing","auditing");
@@ -30,10 +29,7 @@ public enum AppVersionStatusEnum implements BaseEnum<String, AppVersionStatusEnu
     }
 
     public String getMsg() {
-        return msg;
+        return this.msg;
     }
 
-    public void setMsg(String msg) {
-        this.msg = msg;
-    }
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/AudioTypeEnum.java

@@ -12,15 +12,15 @@ import com.yonge.toolset.base.enums.BaseEnum;
 public enum AudioTypeEnum implements BaseEnum<String,AudioTypeEnum> {
 
 
-    MP3("MP3","mp3"),
-    MIDI("MIDI","midi"),
-    MP3_METRONOME("MP3_METRONOME","mp3_metronome");
+    MP3("mp3"),
+    MIDI("midi"),
+    MP3_METRONOME("mp3_metronome");
     @EnumValue
     private String code;
     private String msg;
 
-    AudioTypeEnum(String code,String msg) {
-        this.code = code;
+    AudioTypeEnum(String msg) {
+        this.code = this.name();
         this.msg = msg;
     }
 
@@ -30,10 +30,6 @@ public enum AudioTypeEnum implements BaseEnum<String,AudioTypeEnum> {
     }
 
     public String getMsg() {
-        return msg;
-    }
-
-    public void setMsg(String msg) {
-        this.msg = msg;
+        return this.msg;
     }
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/AuditEnum.java

@@ -24,16 +24,8 @@ public enum AuditEnum implements BaseEnum<Integer,AuditEnum> {
         this.msg = msg;
     }
 
-    public void setCode(Integer code) {
-        this.code = code;
-    }
-
     public String getMsg() {
-        return msg;
-    }
-
-    public void setMsg(String msg) {
-        this.msg = msg;
+        return this.msg;
     }
 
     @Override

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/AuthStatusEnum.java

@@ -19,33 +19,16 @@ public enum AuthStatusEnum implements BaseEnum<String, AuthStatusEnum> {
     private String name;
 
     AuthStatusEnum(String name) {
-        this.code = getCode();
+        this.code = this.name();
         this.name = name;
     }
 
     @Override
     public String getCode() {
-        return this.name();
-    }
-
-    public void setCode(String code) {
-        this.code = code;
+        return this.code;
     }
 
     public String getName() {
         return name;
     }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public static AuthStatusEnum getByName(String name) {
-        for (AuthStatusEnum statusEnum : AuthStatusEnum.values()) {
-            if (statusEnum.getName().equals(name)) {
-                return statusEnum;
-            }
-        }
-        return null;
-    }
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/BizHttpStatus.java

@@ -1,5 +1,7 @@
 package com.yonge.cooleshow.biz.dal.enums;
 
+import io.swagger.models.auth.In;
+
 /**
  * @Author: liweifan
  * @Data: 2022/4/22 18:06
@@ -8,19 +10,29 @@ public enum BizHttpStatus {
     IMPORT(450, "导入异常"),
     ;
 
-    private final int code;
+    private final Integer code;
     private final String msg;
 
-    private BizHttpStatus(int code, String msg) {
+    BizHttpStatus(Integer code, String msg) {
         this.code = code;
         this.msg = msg;
     }
 
-    public int getCode() {
-        return code;
+    public Integer getCode() {
+        return this.code;
     }
 
     public String getMsg() {
-        return msg;
+        return this.msg;
+    }
+
+    public static BizHttpStatus valueOf(Integer code) {
+        BizHttpStatus[] values = BizHttpStatus.values();
+        for (BizHttpStatus value : values) {
+            if(value.getCode().equals(code)){
+                return value;
+            }
+        }
+        return null;
     }
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/ChargeTypeEnum.java

@@ -9,30 +9,21 @@ import com.yonge.toolset.base.enums.BaseEnum;
  * @author: liujunchi
  * @date: 2022-03-30
  */
-public enum ChargeTypeEnum implements BaseEnum<String,ChargeTypeEnum> {
-
-    FREE("FREE","免费"),
-    VIP("VIP","会员"),
-    CHARGE("CHARGE","单曲收费");
+public enum ChargeTypeEnum implements BaseEnum<String, ChargeTypeEnum> {
+    FREE("免费"),
+    VIP("会员"),
+    CHARGE("单曲收费");
     @EnumValue
     private String code;
     private String msg;
 
-    ChargeTypeEnum(String code, String msg) {
-        this.code = code;
+    ChargeTypeEnum(String msg) {
+        this.code = this.name();
         this.msg = msg;
     }
 
-    public void setCode(String code) {
-        this.code = code;
-    }
-
     public String getMsg() {
-        return msg;
-    }
-
-    public void setMsg(String msg) {
-        this.msg = msg;
+        return this.msg;
     }
 
     @Override

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/ClientEnum.java

@@ -9,18 +9,18 @@ import com.yonge.toolset.base.enums.BaseEnum;
  * @author liujunchi
  * @date 2022-04-28
  */
-public enum ClientEnum implements BaseEnum<String,ClientEnum> {
-    TEACHER("TEACHER", "老师端"),
-    STUDENT("STUDENT", "学生端"),
-    SYSTEM("SYSTEM", "平台端"),
+public enum ClientEnum implements BaseEnum<String, ClientEnum> {
+    TEACHER("老师端"),
+    STUDENT("学生端"),
+    SYSTEM("平台端"),
 
     ;
     @EnumValue
     private String code;
     private String msg;
 
-    ClientEnum(String code, String msg) {
-        this.code = code;
+    ClientEnum( String msg) {
+        this.code = this.name();
         this.msg = msg;
     }
 
@@ -28,15 +28,7 @@ public enum ClientEnum implements BaseEnum<String,ClientEnum> {
         return code;
     }
 
-    public void setCode(String code) {
-        this.code = code;
-    }
-
     public String getMsg() {
         return msg;
     }
-
-    public void setMsg(String msg) {
-        this.msg = msg;
-    }
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/ContractTypeEnum.java

@@ -8,10 +8,10 @@ import com.yonge.toolset.base.enums.BaseEnum;
  */
 public enum ContractTypeEnum implements BaseEnum<String, ContractTypeEnum> {
 
-    REGISTER("REGISTER","注册"),
-    COURSES("COURSES","课程购买"),
-    PRODUCT("PRODUCT","产品"),
-    WITHDRAW("WITHDRAW","用户提现")
+    REGISTER("注册"),
+    COURSES("课程购买"),
+    PRODUCT("产品"),
+    WITHDRAW("用户提现")
     ;
 
     @EnumValue
@@ -19,8 +19,8 @@ public enum ContractTypeEnum implements BaseEnum<String, ContractTypeEnum> {
 
     private String desc;
 
-    ContractTypeEnum(String code,String desc) {
-        this.code = code;
+    ContractTypeEnum(String desc) {
+        this.code = this.name();
         this.desc = desc;
     }
 
@@ -29,15 +29,7 @@ public enum ContractTypeEnum implements BaseEnum<String, ContractTypeEnum> {
         return code;
     }
 
-    public void setCode(String code) {
-        this.code = code;
-    }
-
     public String getDesc() {
         return desc;
     }
-
-    public void setDesc(String desc) {
-        this.desc = desc;
-    }
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/CourseGroupEnum.java

@@ -4,37 +4,29 @@ import com.baomidou.mybatisplus.annotation.EnumValue;
 import com.yonge.toolset.base.enums.BaseEnum;
 
 public enum CourseGroupEnum implements BaseEnum<String,CourseGroupEnum> {
-    ING("ING", "进行中"),//课程已开始进行中
-    COMPLETE("COMPLETE", "已完成"),//课程组课程全部完成
-    DISSOLVE("DISSOLVE", "未成课"),//解散课程
-    CANCEL("CANCEL", "已取消"),//课程已取消
-    APPLY("APPLY", "报名中"),//开售中可以报名
-    NOT_SALE("NOT_SALE", "未开售");//还未到开售日期
+    ING("进行中"),//课程已开始进行中
+    COMPLETE( "已完成"),//课程组课程全部完成
+    DISSOLVE( "未成课"),//解散课程
+    CANCEL("已取消"),//课程已取消
+    APPLY("报名中"),//开售中可以报名
+    NOT_SALE( "未开售");//还未到开售日期
 
     @EnumValue
     private String code;
 
     private String msg;
 
-    CourseGroupEnum(String code, String msg) {
-        this.code = code;
+    CourseGroupEnum(String msg) {
+        this.code = this.name();
         this.msg = msg;
     }
 
     public String getCode() {
-        return code;
-    }
-
-    public void setCode(String code) {
-        this.code = code;
+        return this.code;
     }
 
     public String getMsg() {
-        return msg;
-    }
-
-    public void setMsg(String msg) {
-        this.msg = msg;
+        return this.msg;
     }
 
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/CourseScheduleEnum.java

@@ -11,23 +11,23 @@ import java.util.stream.Collectors;
 /**
  * 课程类型
  */
-public enum CourseScheduleEnum implements BaseEnum<String,CourseScheduleEnum> {
+public enum CourseScheduleEnum implements BaseEnum<String, CourseScheduleEnum> {
     //课程类型
-    PRACTICE("PRACTICE", "陪练课"),
-    LIVE("LIVE", "直播课"),
+    PRACTICE("陪练课"),
+    LIVE("直播课"),
     //课程状态
-    NOT_START("NOT_START", "未开始"),
-    ING("ING", "进行中"),
-    COMPLETE("COMPLETE", "已完成"),
-    CANCEL("CANCEL", "已取消");
+    NOT_START("未开始"),
+    ING("进行中"),
+    COMPLETE("已完成"),
+    CANCEL("已取消");
 
     @EnumValue
     private String code;
 
     private String msg;
 
-    CourseScheduleEnum(String code, String msg) {
-        this.code = code;
+    CourseScheduleEnum(String msg) {
+        this.code = this.name();
         this.msg = msg;
     }
 
@@ -70,18 +70,11 @@ public enum CourseScheduleEnum implements BaseEnum<String,CourseScheduleEnum> {
     }
 
     public String getCode() {
-        return code;
-    }
-
-    public void setCode(String code) {
-        this.code = code;
+        return this.code;
     }
 
     public String getMsg() {
-        return msg;
+        return this.msg;
     }
 
-    public void setMsg(String msg) {
-        this.msg = msg;
-    }
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/DealStatusEnum.java

@@ -0,0 +1,33 @@
+package com.yonge.cooleshow.biz.dal.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import com.yonge.toolset.base.enums.BaseEnum;
+
+/**
+ * 认证审核状态
+ *
+ * @Author: liweifan
+ * @Data: 2022/3/16 10:19
+ */
+public enum DealStatusEnum implements BaseEnum<String, DealStatusEnum> {
+    DOING("处理中"),
+    SCCESS("成功"),
+    FAILED("失败");
+    @EnumValue
+    private String code;
+    private String name;
+
+    DealStatusEnum(String name) {
+        this.code = name;
+        this.name = name;
+    }
+
+    @Override
+    public String getCode() {
+        return this.code;
+    }
+
+    public String getName() {
+        return this.name;
+    }
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/DeviceTypeEnum.java

@@ -3,29 +3,21 @@ package com.yonge.cooleshow.biz.dal.enums;
 import com.yonge.toolset.base.enums.BaseEnum;
 
 public enum DeviceTypeEnum implements BaseEnum<String, DeviceTypeEnum> {
-	IOS("IOS", "苹果"),
-	ANDROID("ANDROID", "安卓"),
-	WEB("WEB", "浏览器");
+	IOS("苹果"),
+	ANDROID( "安卓"),
+	WEB("浏览器");
 
 	private String code;
 
 	private String msg;
 
-	DeviceTypeEnum(String code, String msg) {
-		this.code = code;
+	DeviceTypeEnum(String msg) {
+		this.code = this.name();
 		this.msg = msg;
 	}
 
-	public void setCode(String code) {
-		this.code = code;
-	}
-
 	public String getMsg() {
-		return msg;
-	}
-
-	public void setMsg(String msg) {
-		this.msg = msg;
+		return this.msg;
 	}
 
 	@Override

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/FeatureType.java

@@ -3,25 +3,25 @@ package com.yonge.cooleshow.biz.dal.enums;
 import com.yonge.toolset.base.enums.BaseEnum;
 
 public enum FeatureType implements BaseEnum<String, FeatureType> {
-	CLOUD_STUDY_TRAIN("CLOUD_STUDY_TRAIN", "云教练训练"),
-	CLOUD_STUDY_EVALUATION("CLOUD_STUDY_EVALUATION", "云教练评测");
+    CLOUD_STUDY_TRAIN("云教练训练"),
+    CLOUD_STUDY_EVALUATION("云教练评测");
 
-	private String code;
+    private String code;
 
-	private String desc;
+    private String desc;
 
-	FeatureType(String code, String desc) {
-		this.code = code;
-		this.desc = desc;
-	}
+    FeatureType(String desc) {
+        this.code = this.name();
+        this.desc = desc;
+    }
 
-	@Override
-	public String getCode() {
-		return code;
-	}
+    @Override
+    public String getCode() {
+        return this.code;
+    }
 
-	public String getDesc() {
-		return desc;
-	}
+    public String getDesc() {
+        return this.desc;
+    }
 
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/FrozenTypeEnum.java

@@ -18,24 +18,16 @@ public enum  FrozenTypeEnum implements BaseEnum<String, FrozenTypeEnum> {
     private String msg;
 
     FrozenTypeEnum(String msg) {
-        this.code = getCode();
+        this.code = this.name();
         this.msg = msg;
     }
 
     @Override
     public String getCode() {
-        return this.name();
-    }
-
-    public void setCode(String code) {
-        this.code = code;
+        return this.code;
     }
 
     public String getMsg() {
-        return msg;
-    }
-
-    public void setMsg(String msg) {
-        this.msg = msg;
+        return this.msg;
     }
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/GenderEnum.java

@@ -20,16 +20,8 @@ public enum GenderEnum implements BaseEnum<Integer, GenderEnum> {
         this.msg = msg;
     }
 
-    public void setCode(Integer code) {
-        this.code = code;
-    }
-
     public String getMsg() {
-        return msg;
-    }
-
-    public void setMsg(String msg) {
-        this.msg = msg;
+        return this.msg;
     }
 
     @Override

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/GoodTypeEnum.java

@@ -5,35 +5,27 @@ import com.yonge.toolset.base.enums.BaseEnum;
 
 /**
  * 商品类型
+ *
  * @Author: liweifan
  * @Data: 2022/3/31 14:59
  */
 public enum GoodTypeEnum implements BaseEnum<String, GoodTypeEnum> {
-    VIP("VIP","开通会员"),
-    PRACTICE("PRACTICE","陪练课购买"),
-    LIVE("LIVE","直播课购买"),
-    VIDEO("VIDEO","视频课购买"),
-    MUSIC("MUSIC","单曲点播")
-    ;
+    VIP("开通会员"),
+    PRACTICE("陪练课购买"),
+    LIVE("直播课购买"),
+    VIDEO("视频课购买"),
+    MUSIC("单曲点播");
     @EnumValue
     private String code;
     private String msg;
 
-    GoodTypeEnum(String code, String msg) {
-        this.code = code;
+    GoodTypeEnum(String msg) {
+        this.code = this.name();
         this.msg = msg;
     }
 
-    public void setCode(String code) {
-        this.code = code;
-    }
-
     public String getMsg() {
-        return msg;
-    }
-
-    public void setMsg(String msg) {
-        this.msg = msg;
+        return this.msg;
     }
 
     @Override

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/HeardLevelEnum.java

@@ -3,41 +3,39 @@ package com.yonge.cooleshow.biz.dal.enums;
 import com.yonge.toolset.base.enums.BaseEnum;
 
 public enum HeardLevelEnum implements BaseEnum<String, HeardLevelEnum> {
-	BEGINNER("BEGINNER","入门级", 0.1f, 0.7f, 1.5f),
-    ADVANCED("ADVANCED","进阶级", 1, 0.9f, 1.3f),
-    PERFORMER("PERFORMER","大师级", 3, 0.93f, 1.1f);
+    BEGINNER("入门级", 0.1f, 0.7f, 1.5f),
+    ADVANCED("进阶级", 1, 0.9f, 1.3f),
+    PERFORMER("大师级", 3, 0.93f, 1.1f);
 
     private String code;
 
     private String msg;
 
-    /** 音准音分偏差数 */
+    /**
+     * 音准音分偏差数
+     */
     private float intonationCentsRange;
 
-    /** 节奏评分截取时间占比 */
+    /**
+     * 节奏评分截取时间占比
+     */
     private float cadenceRange;
 
-    /** 完整性 */
+    /**
+     * 完整性
+     */
     private float integrityRange;
 
-    HeardLevelEnum(String code, String msg, float intonationCentsRange, float cadenceRange, float integrityRange) {
-        this.code = code;
+    HeardLevelEnum(String msg, float intonationCentsRange, float cadenceRange, float integrityRange) {
+        this.code = this.name();
         this.msg = msg;
         this.intonationCentsRange = intonationCentsRange;
         this.cadenceRange = cadenceRange;
         this.integrityRange = integrityRange;
     }
 
-    public void setCode(String code) {
-        this.code = code;
-    }
-
     public String getMsg() {
-        return msg;
-    }
-
-    public void setMsg(String msg) {
-        this.msg = msg;
+        return this.msg;
     }
 
     @Override
@@ -46,26 +44,15 @@ public enum HeardLevelEnum implements BaseEnum<String, HeardLevelEnum> {
     }
 
     public float getIntonationCentsRange() {
-        return intonationCentsRange;
-    }
-
-    public void setIntonationCentsRange(float intonationCentsRange) {
-        this.intonationCentsRange = intonationCentsRange;
+        return this.intonationCentsRange;
     }
 
     public float getCadenceRange() {
-        return cadenceRange;
-    }
-
-    public void setCadenceRange(float cadenceRange) {
-        this.cadenceRange = cadenceRange;
+        return this.cadenceRange;
     }
 
     public float getIntegrityRange() {
-        return integrityRange;
+        return this.integrityRange;
     }
 
-    public void setIntegrityRange(float integrityRange) {
-        this.integrityRange = integrityRange;
-    }
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/InOrOutEnum.java

@@ -5,6 +5,7 @@ import com.yonge.toolset.base.enums.BaseEnum;
 
 /**
  * 收入支出枚举
+ *
  * @Author: liweifan
  * @Data: 2022/4/7 15:48
  */
@@ -18,24 +19,16 @@ public enum InOrOutEnum implements BaseEnum<String, InOrOutEnum> {
     private String msg;
 
     InOrOutEnum(String msg) {
-        this.code = getCode();
+        this.code = this.name();
         this.msg = msg;
     }
 
     @Override
     public String getCode() {
-        return this.name();
-    }
-
-    public void setCode(String code) {
-        this.code = code;
+        return this.code;
     }
 
     public String getMsg() {
         return msg;
     }
-
-    public void setMsg(String msg) {
-        this.msg = msg;
-    }
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/IndexDataType.java

@@ -8,85 +8,85 @@ import com.yonge.toolset.base.enums.BaseEnum;
  **/
 public enum IndexDataType implements BaseEnum<String, IndexDataType> {
     //学员数据类型
-    STUDENT_REGISTRATION_NUM("STUDENT_REGISTRATION_NUM", "注册学员", false, false),
-    CHARGE_STUDENT_CHANGE_RATE("CHARGE_STUDENT_CHANGE_RATE", "付费转化率", true, false),
-    ACTIVATION_RATE("ACTIVATION_RATE","激活率", true, false),
+    STUDENT_REGISTRATION_NUM("注册学员", false, false),
+    CHARGE_STUDENT_CHANGE_RATE("付费转化率", true, false),
+    ACTIVATION_RATE("激活率", true, false),
 
     //运营数据类型
-    SCHOOL("SCHOOL","合作单位", false, false),
-    PROGRESS_MUSIC_GROUP_NUM("PROGRESS_MUSIC_GROUP_NUM","进行中乐团", false, false),
-    TRANSACTION_TEACHER_NUM("TRANSACTION_TEACHER_NUM", "衔接老师人数", false, false),
+    SCHOOL("合作单位", false, false),
+    PROGRESS_MUSIC_GROUP_NUM("进行中乐团", false, false),
+    TRANSACTION_TEACHER_NUM("衔接老师人数", false, false),
 
     //人事数据
-    TEACHER_NUM("TEACHER_NUM","老师总数", false, false),
-    FULL_TIME_NUM("FULL_TIME_NUM","全职人数", false, false),
-    PART_TIME_NUM("PART_TIME_NUM","兼职人数", false, false),
+    TEACHER_NUM("老师总数", false, false),
+    FULL_TIME_NUM("全职人数", false, false),
+    PART_TIME_NUM("兼职人数", false, false),
 
-    DIMISSION_NUM("DIMISSION_NUM","离职人数", false, false),
+    DIMISSION_NUM("离职人数", false, false),
 
     //剩余课时
-    SURPLUS_COURSE_NUM("SURPLUS_COURSE_NUM", "剩余课时总数", false, false),
-    SURPLUS_MUSIC_COURSE_NUM("SURPLUS_MUSIC_COURSE_NUM", "剩余乐团课时", false, false),
-    SURPLUS_VIP_COURSE_NUM("SURPLUS_VIP_COURSE_NUM", "剩余VIP课时", false, false),
-    SURPLUS_PRACTICE_COURSE_NUM("SURPLUS_PRACTICE_COURSE_NUM", "剩余网管课时", false, false),
+    SURPLUS_COURSE_NUM("剩余课时总数", false, false),
+    SURPLUS_MUSIC_COURSE_NUM("剩余乐团课时", false, false),
+    SURPLUS_VIP_COURSE_NUM("剩余VIP课时", false, false),
+    SURPLUS_PRACTICE_COURSE_NUM("剩余网管课时", false, false),
 
     //已消耗课时
-    OVER_COURSE_NUM("OVER_COURSE_NUM", "已消耗课时总数", false, false),
-    OVER_MUSIC_COURSE_NUM("OVER_MUSIC_COURSE_NUM", "已消耗乐团课时", false, false),
-    OVER_VIP_COURSE_NUM("OVER_VIP_COURSE_NUM", "已消耗VIP课时", false, false),
-    OVER_PRACTICE_COURSE_NUM("OVER_PRACTICE_COURSE_NUM", "已消耗网管课时", false, false),
+    OVER_COURSE_NUM("已消耗课时总数", false, false),
+    OVER_MUSIC_COURSE_NUM("已消耗乐团课时", false, false),
+    OVER_VIP_COURSE_NUM("已消耗VIP课时", false, false),
+    OVER_PRACTICE_COURSE_NUM("已消耗网管课时", false, false),
 
     //经营数据
-    FINANCE_PAY("FINANCE_PAY","财务支出", false, false),
-    FINANCE_BALANCE_AMOUNT("FINANCE_BALANCE_AMOUNT","余额收入", false, false),
-    FINANCE_AMOUNT("FINANCE_AMOUNT","现金收入", false, false),
-    TOTAL_AMOUNT("TOTAL_AMOUNT","总收入", false, false),
+    FINANCE_PAY("财务支出", false, false),
+    FINANCE_BALANCE_AMOUNT("余额收入", false, false),
+    FINANCE_AMOUNT("现金收入", false, false),
+    TOTAL_AMOUNT("总收入", false, false),
 
     //经营数据详情
-    APPLY_AMOUNT("APPLY_AMOUNT","报名缴费收入", false, false),
-    RENEW_AMOUNT("RENEW_AMOUNT","乐团续费收入", false, false),
-    VIP_AMOUNT("VIP_AMOUNT","VIP课收入", false, false),
-    PRACTICE_AMOUNT("PRACTICE_AMOUNT","网管课收入", false, false),
-    OTHER_AMOUNT("OTHER_AMOUNT","其他收入", false, false),
-    OTHER_AMOUNT_DETAIL("OTHER_AMOUNT_DETAIL","其他收入明细", false, false),
+    APPLY_AMOUNT("报名缴费收入", false, false),
+    RENEW_AMOUNT("乐团续费收入", false, false),
+    VIP_AMOUNT("VIP课收入", false, false),
+    PRACTICE_AMOUNT("网管课收入", false, false),
+    OTHER_AMOUNT("其他收入", false, false),
+    OTHER_AMOUNT_DETAIL("其他收入明细", false, false),
 
     //业务数据
-    HOMEWORK_CREATE_RATE("HOMEWORK_CREATE_RATE","训练布置率", true, true),
-    HOMEWORK_SUBMIT_RATE("HOMEWORK_SUBMIT_RATE","训练提交率", true, true),
-    HOMEWORK_COMMENT_RATE("HOMEWORK_COMMENT_RATE","训练点评率", true, true),
+    HOMEWORK_CREATE_RATE("训练布置率", true, true),
+    HOMEWORK_SUBMIT_RATE("训练提交率", true, true),
+    HOMEWORK_COMMENT_RATE("训练点评率", true, true),
 
     //课程数据
-    MUSIC_GROUP_COURSE("MUSIC_GROUP_COURSE","乐团课", false, true),
-    VIP_GROUP_COURSE("VIP_GROUP_COURSE","VIP课", false, true),
-    VIP_GROUP_ONLINE_COURSE("VIP_GROUP_ONLINE_COURSE","VIP线上课", false, true),
-    VIP_GROUP_OFFLINE_COURSE("VIP_GROUP_OFFLINE_COURSE","VIP线下课", false, true),
-    PRACTICE_GROUP_COURSE("PRACTICE_GROUP_COURSE","网管课", false, true),
+    MUSIC_GROUP_COURSE("乐团课", false, true),
+    VIP_GROUP_COURSE("VIP课", false, true),
+    VIP_GROUP_ONLINE_COURSE("VIP线上课", false, true),
+    VIP_GROUP_OFFLINE_COURSE("VIP线下课", false, true),
+    PRACTICE_GROUP_COURSE("网管课", false, true),
 
     //学员变动
-    ADD_STUDENT_REGISTRATION_NUM("ADD_STUDENT_REGISTRATION_NUM", "新增注册学员", false, true),
-    MUSIC_GROUP_STUDENT("MUSIC_GROUP_STUDENT","乐团在读学员", false, false),
-    NEWLY_STUDENT_NUM("NEWLY_STUDENT_NUM","乐团新增学员", false, true),
-    QUIT_MUSIC_GROUP_STUDENT_NUM("QUIT_MUSIC_GROUP_STUDENT_NUM","退学学员", false, true),
-    VIP_PRACTICE_STUDENT_NUM("VIP_PRACTICE_STUDENT_NUM", "VIP/网管在读", false, false),
-    VIP_PRACTICE_ADD_STUDENT_NUM("VIP_PRACTICE_ADD_STUDENT_NUM", "VIP/网管新增", false, true),
+    ADD_STUDENT_REGISTRATION_NUM("新增注册学员", false, true),
+    MUSIC_GROUP_STUDENT("乐团在读学员", false, false),
+    NEWLY_STUDENT_NUM("乐团新增学员", false, true),
+    QUIT_MUSIC_GROUP_STUDENT_NUM("退学学员", false, true),
+    VIP_PRACTICE_STUDENT_NUM("VIP/网管在读", false, false),
+    VIP_PRACTICE_ADD_STUDENT_NUM("VIP/网管新增", false, true),
 
     //活跃用户统计
-    ORGAN_TOTAL_STUDENT_NUM("ORGAN_TOTAL_STUDENT_NUM", "分部学员总数", false, false),
-    CLOUD_STUDY_LIVELY_STUDENT_NUM("CLOUD_STUDY_LIVELY_STUDENT_NUM", "活跃用户", false, false),
-    CLOUD_STUDY_DAY_USE_STUDENT_NUM("CLOUD_STUDY_DAY_USE_STUDENT_NUM", "团练宝使用用户", false, false),
-    CLOUD_STUDY_NEW_STUDENT_NUM("CLOUD_STUDY_NEW_STUDENT_NUM", "团练宝新增用户", false, false),
-    CLOUD_NEW_STUDENT_NUM("CLOUD_NEW_STUDENT_NUM", "团练宝新用户人数", false, false),
-    MEMBER_STUDENT_NUM("MEMBER_STUDENT_NUM", "会员数量", false, false),
-    EXPERIENCE_MEMBER_STUDENT_NUM("EXPERIENCE_MEMBER_STUDENT_NUM", "试用会员数量", false, false),
-    NEW_MEMBER_STUDENT_NUM("NEW_MEMBER_STUDENT_NUM", "新增会员数量", false, false),
-
-    CLOUD_STUDY_TRAIN_NUM("CLOUD_STUDY_TRAIN_NUM", "团练宝训练次数", false, false),
-    CLOUD_STUDY_TRAIN_TIME("CLOUD_STUDY_TRAIN_TIME", "团练宝训练时长", false, false),
+    ORGAN_TOTAL_STUDENT_NUM("分部学员总数", false, false),
+    CLOUD_STUDY_LIVELY_STUDENT_NUM("活跃用户", false, false),
+    CLOUD_STUDY_DAY_USE_STUDENT_NUM("团练宝使用用户", false, false),
+    CLOUD_STUDY_NEW_STUDENT_NUM("团练宝新增用户", false, false),
+    CLOUD_NEW_STUDENT_NUM("团练宝新用户人数", false, false),
+    MEMBER_STUDENT_NUM("会员数量", false, false),
+    EXPERIENCE_MEMBER_STUDENT_NUM("试用会员数量", false, false),
+    NEW_MEMBER_STUDENT_NUM("新增会员数量", false, false),
+
+    CLOUD_STUDY_TRAIN_NUM("团练宝训练次数", false, false),
+    CLOUD_STUDY_TRAIN_TIME("团练宝训练时长", false, false),
 
     //小课数据统计
-    STUDENT_VIP_ORDER_NUM("STUDENT_VIP_ORDER_NUM", "学员vip课订单数量", false, false),
-    STUDENT_THEORY_ORDER_NUM("STUDENT_THEORY_ORDER_NUM", "学员乐理课订单数量", false, false),
-    STUDENT_PRACTICE_ORDER_NUM("STUDENT_PRACTICE_ORDER_NUM", "学员网管课订单数量", false, false),
+    STUDENT_VIP_ORDER_NUM("学员vip课订单数量", false, false),
+    STUDENT_THEORY_ORDER_NUM("学员乐理课订单数量", false, false),
+    STUDENT_PRACTICE_ORDER_NUM("学员网管课订单数量", false, false),
     ;
 
     private String code;
@@ -97,8 +97,8 @@ public enum IndexDataType implements BaseEnum<String, IndexDataType> {
 
     private Boolean collect;
 
-    IndexDataType(String code, String msg, Boolean percent, Boolean collect) {
-        this.code = code;
+    IndexDataType(String msg, Boolean percent, Boolean collect) {
+        this.code = this.name();
         this.msg = msg;
         this.percent = percent;
         this.collect = collect;
@@ -106,34 +106,21 @@ public enum IndexDataType implements BaseEnum<String, IndexDataType> {
 
     @Override
     public String getCode() {
-        return code;
+        return this.code;
     }
 
-    public void setCode(String code) {
-        this.code = code;
-    }
 
     public String getMsg() {
-        return msg;
+        return this.msg;
     }
 
-    public void setMsg(String msg) {
-        this.msg = msg;
-    }
 
     public Boolean getCollect() {
-        return collect;
-    }
-
-    public void setCollect(Boolean collect) {
-        this.collect = collect;
+        return this.collect;
     }
 
     public Boolean getPercent() {
-        return percent;
+        return this.percent;
     }
 
-    public void setPercent(Boolean percent) {
-        this.percent = percent;
-    }
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/JobNatureEnum.java

@@ -3,30 +3,22 @@ package com.yonge.cooleshow.biz.dal.enums;
 import com.yonge.toolset.base.enums.BaseEnum;
 
 //工作性质（兼职、全职）
-public enum JobNatureEnum implements BaseEnum<String,JobNatureEnum> {
-    PART_TIME("PART_TIME","兼职"),
-    FULL_TIME("FULL_TIME","全职"),
-    LABOUR("LABOUR","劳务");
+public enum JobNatureEnum implements BaseEnum<String, JobNatureEnum> {
+    PART_TIME("兼职"),
+    FULL_TIME("全职"),
+    LABOUR("劳务");
 
     private String code;
 
     private String msg;
 
-    JobNatureEnum(String code, String msg) {
-        this.code = code;
+    JobNatureEnum(String msg) {
+        this.code = this.name();
         this.msg = msg;
     }
 
-    public void setCode(String code) {
-        this.code = code;
-    }
-
     public String getMsg() {
-        return msg;
-    }
-
-    public void setMsg(String msg) {
-        this.msg = msg;
+        return this.msg;
     }
 
     @Override

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/MessageIconTypeEnum.java

@@ -9,25 +9,23 @@ import com.yonge.toolset.base.enums.BaseEnum;
  * @author liujunchi
  * @date 2022-05-09
  */
-public enum MessageIconTypeEnum implements BaseEnum<String,MessageIconTypeEnum> {
-
-    TEACHER_AUTH("TEACHER_AUTH","老师认证"),
-    MUSICIAN_AUTH("MUSICIAN_AUTH","音乐人认证"),
-    PRACTICE("PRACTICE","陪练课"),
-    LIVE("LIVE","直播课"),
-    VIDEO("VIDEO","视频课"),
-    MUSIC_SHEET("MUSIC_SHEET","乐谱"),
-    COURSE("COURSE","课程"),
-    INCOME("INCOME","收入"),
-    HOMEWORK("HOMEWORK","作业"),
-    EVALUATE("EVALUATE","评价"),
-    GROUP_CHAT("GROUP_CHAT","群聊"),
-    VIP("VIP","会员"),
-
+public enum MessageIconTypeEnum implements BaseEnum<String, MessageIconTypeEnum> {
+    TEACHER_AUTH("老师认证"),
+    MUSICIAN_AUTH("音乐人认证"),
+    PRACTICE("陪练课"),
+    LIVE("直播课"),
+    VIDEO("视频课"),
+    MUSIC_SHEET("乐谱"),
+    COURSE("课程"),
+    INCOME("收入"),
+    HOMEWORK("作业"),
+    EVALUATE("评价"),
+    GROUP_CHAT("群聊"),
+    VIP("会员"),
     ;
 
-    MessageIconTypeEnum(String code, String msg) {
-        this.code = code;
+    MessageIconTypeEnum(String msg) {
+        this.code = this.name();
         this.msg = msg;
     }
 
@@ -36,21 +34,11 @@ public enum MessageIconTypeEnum implements BaseEnum<String,MessageIconTypeEnum>
 
     private String msg;
 
-    public void setCode(String code) {
-        this.code = code;
-    }
-
     public String getMsg() {
-        return msg;
+        return this.msg;
     }
 
-    public void setMsg(String msg) {
-        this.msg = msg;
-    }
-
-
     public String getCode() {
-        return code;
+        return this.code;
     }
-
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/MessageSendMode.java

@@ -19,18 +19,10 @@ public enum MessageSendMode implements BaseEnum<Integer, MessageSendMode> {
 		this.msg = msg;
 	}
 
-	public void setCode(Integer code) {
-		this.code = code;
-	}
-
 	public String getMsg() {
 		return msg;
 	}
 
-	public void setMsg(String msg) {
-		this.msg = msg;
-	}
-
 	@Override
 	public Integer getCode() {
 		return this.code;

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/MessageTypeEnum.java

@@ -1,121 +1,108 @@
 package com.yonge.cooleshow.biz.dal.enums;
 
-
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import com.yonge.toolset.base.enums.BaseEnum;
 
-
 public enum MessageTypeEnum implements BaseEnum<String, MessageTypeEnum> {
-    SMS_VERIFY_CODE_LOGIN("SMS_VERIFY_CODE_LOGIN", "验证码登录"),
-    SMS_VERIFY_CODE_REGISTER("SMS_VERIFY_CODE_REGISTER", "验证码注册"),
-    SMS_VERIFY_CODE_UPDATE_PSW("SMS_VERIFY_CODE_UPDATE_PSW", "密码修改"),
-    SMS_VERIFY_CODE_BANK_CARD("SMS_VERIFY_CODE_BANK_CARD", "银行卡验证"),
-    SMS_VERIFY_CODE("SMS_VERIFY_CODE","验证码"),
-    KAPTCHA_SESSION_KEY("KAPTCHA_SESSION_KEY", "登录图形验证码"),
-    STUDENT_BUY_TEACHER_MUSIC_SHEET("STUDENT_BUY_TEACHER_MUSIC_SHEET","学员购买老师乐谱"),
-    MUSIC_SHEET_AUTH_PASS("MUSIC_SHEET_AUTH_PASS","乐谱审核通过"),
-    MUSIC_SHEET_AUTH_UNPASS("MUSIC_SHEET_AUTH_UNPASS","乐谱审核失败"),
+    SMS_VERIFY_CODE_LOGIN("验证码登录"),
+    SMS_VERIFY_CODE_REGISTER("验证码注册"),
+    SMS_VERIFY_CODE_UPDATE_PSW("密码修改"),
+    SMS_VERIFY_CODE("验证码"),
+    KAPTCHA_SESSION_KEY("登录图形验证码"),
+    STUDENT_BUY_TEACHER_MUSIC_SHEET("学员购买老师乐谱"),
+    MUSIC_SHEET_AUTH_PASS("乐谱审核通过"),
+    MUSIC_SHEET_AUTH_UNPASS("乐谱审核失败"),
+    SMS_VERIFY_CODE_BANK_CARD("银行卡验证"),
 
-    VIDEO_SHEET_AUTH_PASS("VIDEO_SHEET_AUTH_PASS","视频课审核通过"),
-    VIDEO_SHEET_AUTH_UNPASS("VIDEO_SHEET_AUTH_UNPASS","视频课审核失败"),
+    VIDEO_SHEET_AUTH_PASS("视频课审核通过"),
+    VIDEO_SHEET_AUTH_UNPASS("视频课审核失败"),
 
-    STUDENT_BUY_MUSIC_SHEET_SUCCESS("STUDENT_BUY_MUSIC_SHEET_SUCCESS","学员购买乐谱成功"),
-    SMS_STUDENT_BUY_MUSIC_SHEET_SUCCESS("SMS_STUDENT_BUY_MUSIC_SHEET_SUCCESS","学员购买乐谱(短信)"),
+    STUDENT_BUY_MUSIC_SHEET_SUCCESS("学员购买乐谱成功"),
+    SMS_STUDENT_BUY_MUSIC_SHEET_SUCCESS("学员购买乐谱(短信)"),
 
-    TEACHER_DECORATE_HOMEWORK("TEACHER_DECORATE_HOMEWORK","老师布置作业"),
-    TEACHER_REVIEW_HOMEWORK("TEACHER_REVIEW_HOMEWORK","老师点评作业"),
-    STUDENT_SUBMIT_HOMEWORK("STUDENT_SUBMIT_HOMEWORK","学员提交作业"),
+    TEACHER_DECORATE_HOMEWORK("老师布置作业"),
+    TEACHER_REVIEW_HOMEWORK("老师点评作业"),
+    STUDENT_SUBMIT_HOMEWORK("学员提交作业"),
 
-    TEACHER_AUTH_PASS("TEACHER_AUTH_PASS","老师认证通过"),
-    SMS_TEACHER_AUTH_PASS("SMS_TEACHER_AUTH_PASS","老师认证通过(短信)"),
+    TEACHER_AUTH_PASS("老师认证通过"),
+    SMS_TEACHER_AUTH_PASS("老师认证通过(短信)"),
 
-    TEACHER_AUTH_FAIL("TEACHER_AUTH_FAIL","老师认证失败"),
-    SMS_TEACHER_AUTH_FAIL("SMS_TEACHER_AUTH_FAIL","老师认证失败(短信)"),
+    TEACHER_AUTH_FAIL("老师认证失败"),
+    SMS_TEACHER_AUTH_FAIL("老师认证失败(短信)"),
 
-    MUSICIAN_AUTH_PASS("MUSICIAN_AUTH_PASS","音乐人认证通过"),
-    SMS_MUSICIAN_AUTH_PASS("SMS_MUSICIAN_AUTH_PASS","音乐人认证通过(短信)"),
+    MUSICIAN_AUTH_PASS("音乐人认证通过"),
+    SMS_MUSICIAN_AUTH_PASS("音乐人认证通过(短信)"),
 
-    MUSICIAN_AUTH_FAIL("MUSICIAN_AUTH_FAIL","音乐人认证失败"),
-    SMS_MUSICIAN_AUTH_FAIL("SMS_MUSICIAN_AUTH_FAIL","音乐人认证失败(短信)"),
+    MUSICIAN_AUTH_FAIL("音乐人认证失败"),
+    SMS_MUSICIAN_AUTH_FAIL("音乐人认证失败(短信)"),
 
-    STUDENT_BUY_PRACTICE("STUDENT_BUY_PRACTICE","学员购买陪练课"),
-    SMS_STUDENT_BUY_PRACTICE("SMS_STUDENT_BUY_PRACTICE","学员购买陪练课(短信)"),
+    STUDENT_BUY_PRACTICE("学员购买陪练课"),
+    SMS_STUDENT_BUY_PRACTICE("学员购买陪练课(短信)"),
 
-    STUDENT_BUY_LIVE("STUDENT_BUY_LIVE","学员购买直播课"),
-    STUDENT_BUY_VIDEO("STUDENT_BUY_VIDEO","学员购买视频课"),
-    LIVE_COMPLETION_SUCCESS("LIVE_COMPLETION_SUCCESS","直播课成课"),
-    LIVE_COMPLETION_FAIL("LIVE_COMPLETION_FAIL","直播课成课失败"),
-    TOMORROW_COURSE_REMINDER("TOMORROW_COURSE_REMINDER","明日课程提醒（每晚9点）"),
-    STUDENT_PRACTICE_REMINDER("STUDENT_PRACTICE_REMINDER","陪练课提醒（陪练课开始前20分钟）"),
-    LIVE_REMINDER("LIVE_REMINDER","直播课提醒（直播课开始前20分钟）"),
-    COURSE_SETTLEMENT("COURSE_SETTLEMENT","课酬结算（每晚9点）"),
-    NOT_EVALUATE_STUDENT_PRACTICE("NOT_EVALUATE_STUDENT_PRACTICE","当日陪练课未评价/布置作业（每晚9点30，已评价/已布置不发）"),
-    STUDENT_EVALUATE_TEACHER_PRACTICE("STUDENT_EVALUATE_TEACHER_PRACTICE","学员对老师评价"),
-    WITHDRAWAL_SUCCESS("WITHDRAWAL_SUCCESS","提现成功"),
-    STUDENT_JOIN_FANSGROUP("STUDENT_JOIN_FANSGROUP","学员申请加入粉丝群"),
+    STUDENT_BUY_LIVE("学员购买直播课"),
+    STUDENT_BUY_VIDEO("学员购买视频课"),
+    LIVE_COMPLETION_SUCCESS("直播课成课"),
+    LIVE_COMPLETION_FAIL("直播课成课失败"),
+    TOMORROW_COURSE_REMINDER("明日课程提醒（每晚9点）"),
+    STUDENT_PRACTICE_REMINDER("陪练课提醒（陪练课开始前20分钟）"),
+    LIVE_REMINDER("直播课提醒（直播课开始前20分钟）"),
+    COURSE_SETTLEMENT("课酬结算（每晚9点）"),
+    NOT_EVALUATE_STUDENT_PRACTICE("当日陪练课未评价/布置作业（每晚9点30，已评价/已布置不发）"),
+    STUDENT_EVALUATE_TEACHER_PRACTICE("学员对老师评价"),
+    WITHDRAWAL_SUCCESS("提现成功"),
+    STUDENT_JOIN_FANSGROUP("学员申请加入粉丝群"),
 
-    VIP_BUY_SUCCESS("VIP_BUY_SUCCESS","会员购买成功"),
-    SMS_VIP_BUY_SUCCESS("SMS_VIP_BUY_SUCCESS","会员购买成功(短信)"),
+    VIP_BUY_SUCCESS("会员购买成功"),
+    SMS_VIP_BUY_SUCCESS("会员购买成功(短信)"),
 
-    VIP_EXPIRE_THIRTY_DAY("VIP_EXPIRE_THIRTY_DAY","会员到期前30天"),
-    SMS_VIP_EXPIRE_THIRTY_DAY("SMS_VIP_EXPIRE_THIRTY_DAY","会员到期前30天(短信)"),
+    VIP_EXPIRE_THIRTY_DAY("会员到期前30天"),
+    SMS_VIP_EXPIRE_THIRTY_DAY("会员到期前30天(短信)"),
 
-    VIP_EXPIRE("VIP_EXPIRE","会员到期"),
-    SMS_VIP_EXPIRE("SMS_VIP_EXPIRE","会员到期(短信)"),
+    VIP_EXPIRE("会员到期"),
+    SMS_VIP_EXPIRE("会员到期(短信)"),
 
-    PRACTICE_BUY("PRACTICE_BUY","陪练课购买"),
-    SMS_PRACTICE_BUY("SMS_PRACTICE_BUY", "陪练课购买(短信)"),
+    PRACTICE_BUY("陪练课购买"),
+    SMS_PRACTICE_BUY("陪练课购买(短信)"),
 
-    LIVE_BUY("LIVE_BUY","直播课购买"),
-    SMS_LIVE_BUY("SMS_LIVE_BUY","直播课购买"),
+    LIVE_BUY("直播课购买"),
+    SMS_LIVE_BUY("直播课购买"),
 
 
-    VIDEO_BUY("VIDEO_BUY","视频课购买"),
-    SMS_VIDEO_BUY("SMS_VIDEO_BUY","视频课购买(短信)"),
+    VIDEO_BUY("视频课购买"),
+    SMS_VIDEO_BUY("视频课购买(短信)"),
 
-    PRACTICE_REMIND("PRACTICE_REMIND","陪练课提醒（陪练课开始前20分钟）"),
-    LIVE_REMIND("LIVE_REMIND","直播课提醒（直播课开始前20分钟）"),
-    NOT_EVALUATE_TEACHER_PRACTICE("NOT_EVALUATE_TEACHER_PRACTICE","当日陪练课未对老师评价（每晚9点，已评价不发）"),
-    FANSGROUP_APPLY_SUCCESS("FANSGROUP_APPLY_SUCCESS","粉丝群申请通过"),
+    PRACTICE_REMIND("陪练课提醒（陪练课开始前20分钟）"),
+    LIVE_REMIND("直播课提醒（直播课开始前20分钟）"),
+    NOT_EVALUATE_TEACHER_PRACTICE("当日陪练课未对老师评价（每晚9点，已评价不发）"),
+    FANSGROUP_APPLY_SUCCESS("粉丝群申请通过"),
 
-    TEACHER_STYLE_VIDEO_SUCCESS("TEACHER_STYLE_VIDEO_SUCCESS","个人风采审核通过"),
-    TEACHER_STYLE_VIDEO_FAIL("TEACHER_STYLE_VIDEO_FAIL","个人风采审核失败"),
+    TEACHER_STYLE_VIDEO_SUCCESS("个人风采审核通过"),
+    TEACHER_STYLE_VIDEO_FAIL("个人风采审核失败"),
 
-    TEACHER_WITHDRAW_SUCCESS("TEACHER_WITHDRAW_SUCCESS","老师提现成功"),
+    TEACHER_WITHDRAW_SUCCESS("老师提现成功"),
 
     //------短信模板------
-    SMS_BUY_LIVE("SMS_BUY_LIVE","直播课购买成功"),
-    SMS_LIVE_COMPLETION_SUCCESS("SMS_LIVE_COMPLETION_SUCCESS","直播课成课"),
-    SMS_LIVE_COMPLETION_FAIL("LIVE_COMPLETION_FAIL","直播课成课失败"),
-    SMS_TOMORROW_COURSE_REMINDER("SMS_TOMORROW_COURSE_REMINDER", "明日课程提醒（每晚9点）(短信)");
+    SMS_BUY_LIVE("直播课购买成功"),
+    SMS_LIVE_COMPLETION_SUCCESS("直播课成课"),
+    SMS_LIVE_COMPLETION_FAIL("直播课成课失败"),
+    SMS_TOMORROW_COURSE_REMINDER("明日课程提醒（每晚9点）(短信)");
 
-    MessageTypeEnum(String code, String msg) {
-        this.code = code;
+    MessageTypeEnum(String msg) {
+        this.code = this.name();
         this.msg = msg;
     }
 
-
     @EnumValue
     private String code;
 
     private String msg;
 
-
-    public void setCode(String code) {
-        this.code = code;
-    }
-
     public String getMsg() {
-        return msg;
+        return this.msg;
     }
 
-    public void setMsg(String msg) {
-        this.msg = msg;
-    }
-
-
     public String getCode() {
-        return code;
+        return this.code;
     }
 
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/OpenContractEnum.java

@@ -18,11 +18,7 @@ public enum OpenContractEnum implements BaseEnum<String, OpenContractEnum> {
     }
 
     public String getMsg() {
-        return msg;
-    }
-
-    public void setMsg(String msg) {
-        this.msg = msg;
+        return this.msg;
     }
 
     @Override

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/OrderStatusEnum.java

@@ -5,35 +5,28 @@ import com.yonge.toolset.base.enums.BaseEnum;
 
 /**
  * 订单状态 WAIT_PAY 待支付 PAYING 支付中  PAID 已付款 CLOSE 已关闭
+ *
  * @Author: liweifan
  * @Data: 2022/3/31 14:59
  */
 public enum OrderStatusEnum implements BaseEnum<String, OrderStatusEnum> {
-    WAIT_PAY("WAIT_PAY","待支付"),
-    PAYING("PAYING","支付中"),
-    PAID("PAID","已付款"),
-    CLOSE("CLOSE","已关闭"),
-    FAIL("FAIL","支付失败"),
+    WAIT_PAY("待支付"),
+    PAYING("支付中"),
+    PAID("已付款"),
+    CLOSE("已关闭"),
+    FAIL("支付失败"),
     ;
     @EnumValue
     private String code;
     private String msg;
 
-    OrderStatusEnum(String code, String msg) {
-        this.code = code;
+    OrderStatusEnum(String msg) {
+        this.code = this.name();
         this.msg = msg;
     }
 
-    public void setCode(String code) {
-        this.code = code;
-    }
-
     public String getMsg() {
-        return msg;
-    }
-
-    public void setMsg(String msg) {
-        this.msg = msg;
+        return this.msg;
     }
 
     @Override

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/OrderTypeEnum.java

@@ -5,35 +5,27 @@ import com.yonge.toolset.base.enums.BaseEnum;
 
 /**
  * 订单类型
+ *
  * @Author: liweifan
  * @Data: 2022/3/31 14:59
  */
 public enum OrderTypeEnum implements BaseEnum<String, OrderTypeEnum> {
-    VIP("VIP","开通会员"),
-    PRACTICE("PRACTICE","陪练课购买"),
-    LIVE("LIVE","直播课购买"),
-    VIDEO("VIDEO","视频课购买"),
-    MUSIC("MUSIC","单曲点播")
-    ;
+    VIP("开通会员"),
+    PRACTICE("陪练课购买"),
+    LIVE("直播课购买"),
+    VIDEO("视频课购买"),
+    MUSIC("单曲点播");
     @EnumValue
     private String code;
     private String msg;
 
-    OrderTypeEnum(String code, String msg) {
-        this.code = code;
+    OrderTypeEnum(String msg) {
+        this.code = this.name();
         this.msg = msg;
     }
 
-    public void setCode(String code) {
-        this.code = code;
-    }
-
     public String getMsg() {
-        return msg;
-    }
-
-    public void setMsg(String msg) {
-        this.msg = msg;
+        return this.msg;
     }
 
     @Override

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/PeriodEnum.java

@@ -23,15 +23,11 @@ public enum PeriodEnum implements BaseEnum<String, PeriodEnum> {
 	}
 
 	public String getMsg() {
-		return msg;
-	}
-
-	public void setMsg(String msg) {
-		this.msg = msg;
+		return this.msg;
 	}
 
 	@Override
 	public String getCode() {
-		return name();
+		return this.code;
 	}
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/RoomTypeEnum.java

@@ -6,21 +6,22 @@ import java.util.stream.Collectors;
 
 public enum RoomTypeEnum {
 
-    LIVE("LIVE", "直播课"),
-    PRACTICE("PRACTICE", "陪练课"),
-    TEMP("TEMP", "临时直播间");
+    LIVE("直播课"),
+    PRACTICE("陪练课"),
+    TEMP("临时直播间");
 
     private String code;
 
     private String msg;
 
-    RoomTypeEnum(String code, String msg) {
-        this.code = code;
+    RoomTypeEnum(String msg) {
+        this.code = this.name();
         this.msg = msg;
     }
 
     /**
      * 校验code是否存在
+     *
      * @param code code
      * @return true存在
      */
@@ -31,19 +32,11 @@ public enum RoomTypeEnum {
     }
 
     public String getCode() {
-        return code;
-    }
-
-    public void setCode(String code) {
-        this.code = code;
+        return this.code;
     }
 
     public String getMsg() {
-        return msg;
-    }
-
-    public void setMsg(String msg) {
-        this.msg = msg;
+        return this.msg;
     }
 
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/SendStatusEnum.java

@@ -4,35 +4,27 @@ import com.baomidou.mybatisplus.annotation.EnumValue;
 import com.yonge.toolset.base.enums.BaseEnum;
 
 /**
- 状态，-1,发送失败;0,待发送;1,发送中;2,发送完成
+ * 状态，-1,发送失败;0,待发送;1,发送中;2,发送完成
  */
 public enum SendStatusEnum implements BaseEnum<Integer, SendStatusEnum> {
-	FAILED(-1, "发送失败"), WAIT(0, "待发送"), SENDING(1, "发送中"), SUCCESSED(2, "发送完成");
+    FAILED(-1, "发送失败"), WAIT(0, "待发送"), SENDING(1, "发送中"), SUCCESSED(2, "发送完成");
 
-	@EnumValue
-	private Integer code;
+    @EnumValue
+    private Integer code;
 
-	private String msg;
+    private String msg;
 
-	SendStatusEnum(Integer code, String msg) {
-		this.code = code;
-		this.msg = msg;
-	}
+    SendStatusEnum(Integer code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
 
-	public void setCode(Integer code) {
-		this.code = code;
-	}
+    public String getMsg() {
+        return this.msg;
+    }
 
-	public String getMsg() {
-		return msg;
-	}
-
-	public void setMsg(String msg) {
-		this.msg = msg;
-	}
-
-	@Override
-	public Integer getCode() {
-		return this.code;
-	}
+    @Override
+    public Integer getCode() {
+        return this.code;
+    }
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/SourceTypeEnum.java

@@ -9,19 +9,17 @@ import com.yonge.toolset.base.enums.BaseEnum;
  * @author liujunchi
  * @date 2022-04-13
  */
-public enum SourceTypeEnum  implements BaseEnum<String,AuditStatusEnum> {
+public enum SourceTypeEnum implements BaseEnum<String, AuditStatusEnum> {
 
-
-
-    TEACHER("TEACHER","TEACHER"),
-    PLATFORM("PLATFORM","PLATFORM");
+    TEACHER("TEACHER"),
+    PLATFORM("PLATFORM");
 
     @EnumValue
     private String code;
     private String msg;
 
-    SourceTypeEnum(String code,String msg) {
-        this.code = code;
+    SourceTypeEnum(String msg) {
+        this.code = this.name();
         this.msg = msg;
     }
 
@@ -31,10 +29,7 @@ public enum SourceTypeEnum  implements BaseEnum<String,AuditStatusEnum> {
     }
 
     public String getMsg() {
-        return msg;
+        return this.msg;
     }
 
-    public void setMsg(String msg) {
-        this.msg = msg;
-    }
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/StudentCourseEnum.java

@@ -9,27 +9,27 @@ import com.yonge.toolset.base.enums.BaseEnum;
  * @author liujunchi
  * @date 2022-04-20
  */
-public enum StudentCourseEnum implements BaseEnum<String,StudentCourseEnum> {
+public enum StudentCourseEnum implements BaseEnum<String, StudentCourseEnum> {
 
     /**
      * 旷课
      */
-    TRUANT("TRUANT","TRUANT"),
+    TRUANT("TRUANT"),
     /**
      * 上课
      */
-    ATTENDCLASS("ATTENDCLASS","ATTENDCLASS"),
+    ATTENDCLASS("ATTENDCLASS"),
     /**
      * 未开始
      */
-    NOTSTART("NOTSTART","NOTSTART");
+    NOTSTART("NOTSTART");
 
     @EnumValue
     private String code;
     private String msg;
 
-    StudentCourseEnum(String code,String msg) {
-        this.code = code;
+    StudentCourseEnum(String msg) {
+        this.code = this.name();
         this.msg = msg;
     }
 
@@ -39,10 +39,6 @@ public enum StudentCourseEnum implements BaseEnum<String,StudentCourseEnum> {
     }
 
     public String getMsg() {
-        return msg;
-    }
-
-    public void setMsg(String msg) {
-        this.msg = msg;
+        return this.msg;
     }
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/SuggestionType.java

@@ -3,32 +3,24 @@ package com.yonge.cooleshow.biz.dal.enums;
 import com.yonge.toolset.base.enums.BaseEnum;
 
 public enum SuggestionType implements BaseEnum<String, SuggestionType> {
-	APP("APP", "软件反馈"),
-	SMART_PRACTICE("SMART_PRACTICE", "智能陪练");
+    APP("软件反馈"),
+    SMART_PRACTICE("智能陪练");
 
-	private String code;
+    private String code;
 
-	private String msg;
+    private String msg;
 
-	SuggestionType(String code, String msg) {
-		this.code = code;
-		this.msg = msg;
-	}
+    SuggestionType(String msg) {
+        this.code = this.name();
+        this.msg = msg;
+    }
 
-	public void setCode(String code) {
-		this.code = code;
-	}
+    public String getMsg() {
+        return this.msg;
+    }
 
-	public String getMsg() {
-		return msg;
-	}
-
-	public void setMsg(String msg) {
-		this.msg = msg;
-	}
-
-	@Override
-	public String getCode() {
-		return this.code;
-	}
+    @Override
+    public String getCode() {
+        return this.code;
+    }
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/TeacherSalaryEnum.java

@@ -8,38 +8,31 @@ import com.yonge.toolset.base.enums.BaseEnum;
  */
 public enum TeacherSalaryEnum implements BaseEnum<String, TeacherSalaryEnum> {
     //未上课-还未开始上课等待上课结束后结算
-    NOT_START("NOT_START", "未上课"),
+    NOT_START("未上课"),
     //待结算-老师上完课等待结算
-    WAIT("WAIT", "待结算"),
+    WAIT("待结算"),
     //已结算-已经结算完成
-    COMPLETE("COMPLETE", "已结算"),
+    COMPLETE("已结算"),
     //已取消-学生发起退款等等其他操作
-    CANCEL("CANCEL", "已取消");
+    CANCEL("已取消");
 
     @EnumValue
     private String code;
 
     private String msg;
 
-    TeacherSalaryEnum(String code, String msg) {
-        this.code = code;
+    TeacherSalaryEnum(String msg) {
+        this.code = this.name();
         this.msg = msg;
     }
 
     public String getCode() {
-        return code;
-    }
-
-    public void setCode(String code) {
-        this.code = code;
+        return this.code;
     }
 
     public String getMsg() {
-        return msg;
+        return this.msg;
     }
 
-    public void setMsg(String msg) {
-        this.msg = msg;
-    }
 
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/TeacherTypeEnum.java

@@ -23,11 +23,11 @@ public enum TeacherTypeEnum implements BaseEnum<String, TeacherTypeEnum> {
 
     @Override
     public String getCode() {
-        return this.name();
+        return this.code;
     }
 
     public String getMsg() {
-        return msg;
+        return this.msg;
     }
 
     /***

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/TimeTypeEnum.java

@@ -21,20 +21,12 @@ public enum TimeTypeEnum implements BaseEnum<String, TimeTypeEnum> {
         this.msg = msg;
     }
 
-    public void setCode(String code) {
-        this.code = code;
-    }
-
     public String getMsg() {
-        return msg;
-    }
-
-    public void setMsg(String msg) {
-        this.msg = msg;
+        return this.msg;
     }
 
     @Override
     public String getCode() {
-        return this.name();
+        return this.code;
     }
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/UserLockFlag.java

@@ -12,27 +12,19 @@ public enum UserLockFlag implements BaseEnum<Integer, UserLockFlag> {
 	@EnumValue
 	private int code;
 
+	private String remark;
+
 	UserLockFlag(int code, String remark) {
 		this.code = code;
 		this.remark = remark;
 	}
 
-	private String remark;
-
 	public Integer getCode() {
-		return code;
-	}
-
-	public void setCode(int code) {
-		this.code = code;
+		return this.code;
 	}
 
 	public String getRemark() {
-		return remark;
-	}
-
-	public void setRemark(String remark) {
-		this.remark = remark;
+		return this.remark;
 	}
 
 	public static UserLockFlag codeOf(int code) {

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/YesOrNoEnum.java

@@ -4,8 +4,8 @@ import com.baomidou.mybatisplus.annotation.EnumValue;
 import com.yonge.toolset.base.enums.BaseEnum;
 
 public enum YesOrNoEnum implements BaseEnum<Integer, YesOrNoEnum> {
-    NO(0,"否"),
-    YES(1,"是");
+    NO(0, "否"),
+    YES(1, "是");
     @EnumValue
     private Integer code;
     private String msg;
@@ -15,16 +15,8 @@ public enum YesOrNoEnum implements BaseEnum<Integer, YesOrNoEnum> {
         this.msg = msg;
     }
 
-    public void setCode(Integer code) {
-        this.code = code;
-    }
-
     public String getMsg() {
-        return msg;
-    }
-
-    public void setMsg(String msg) {
-        this.msg = msg;
+        return this.msg;
     }
 
     @Override

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/CourseGroupService.java

@@ -10,6 +10,7 @@ import com.yonge.cooleshow.biz.dal.dto.req.OrderReq;
 import com.yonge.cooleshow.biz.dal.dto.search.*;
 import com.yonge.cooleshow.biz.dal.entity.CourseGroup;
 import com.yonge.cooleshow.biz.dal.entity.CourseTimeEntity;
+import com.yonge.cooleshow.biz.dal.entity.VideoLessonGroup;
 import com.yonge.cooleshow.biz.dal.entity.VideoLessonGroupDetail;
 import com.yonge.cooleshow.biz.dal.vo.*;
 import com.yonge.cooleshow.biz.dal.vo.res.OrderCreateRes;
@@ -235,5 +236,12 @@ public interface CourseGroupService extends IService<CourseGroup> {
      * @return
      */
     IPage<VideoLessonGroupDetail> selectVideoGroupPlan(IPage<VideoLessonGroupDetail> page, CourseGroupSearch search);
+
+    /**
+     * 课程组管理-直播课-课程信息
+     * @param groupId
+     * @return
+     */
+    CourseGroup selectLiveGroupInfo(Long groupId);
 }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/UserWithdrawalService.java

@@ -18,24 +18,28 @@ import java.util.Map;
 
 /**
  * 用户账户提现表 服务类
+ *
  * @author liweifan
  * @date 2022-03-30
  */
-public interface UserWithdrawalService extends IService<UserWithdrawal>  {
+public interface UserWithdrawalService extends IService<UserWithdrawal> {
 
-	/**
+    /**
      * 查询详情
+     *
      * @author liweifan
- 	 * @date 2022-03-30
+     * @date 2022-03-30
      */
-	UserWithdrawalVo detail(Long id);
+    UserWithdrawalVo detail(Long id);
 
     /**
      * 分页查询
+     *
      * @author liweifan
- 	 * @date 2022-03-30
+     * @date 2022-03-30
      */
     IPage<UserWithdrawalVo> selectPage(IPage<UserWithdrawalVo> page, TeacherWithdrawalSearch query);
+
     /***
      * 查询集合
      * @author liweifan
@@ -43,43 +47,50 @@ public interface UserWithdrawalService extends IService<UserWithdrawal>  {
      * @updateTime 2022/4/15 18:04
      * @return: java.util.List<com.yonge.cooleshow.biz.dal.vo.UserWithdrawalVo>
      */
-	List<UserWithdrawalVo> selectList(TeacherWithdrawalSearch query);
-	/***
-	 * 查询提现页面信息
-	 * @author liweifan
-	 * @param: userId
-	 * @updateTime 2022/4/7 14:31
-	 * @return: com.yonge.cooleshow.common.entity.HttpResponseResult<com.yonge.cooleshow.biz.dal.vo.res.WithdrawalInfoRes>
-	 */
+    List<UserWithdrawalVo> selectList(TeacherWithdrawalSearch query);
+
+    /***
+     * 查询提现页面信息
+     * @author liweifan
+     * @param: userId
+     * @updateTime 2022/4/7 14:31
+     * @return: com.yonge.cooleshow.common.entity.HttpResponseResult<com.yonge.cooleshow.biz.dal.vo.res.WithdrawalInfoRes>
+     */
     HttpResponseResult<WithdrawalInfoRes> getWithdrawalInfo(Long userId);
-	/***
-	 * 用户发起提现申请
-	 * @author liweifan
-	 * @param: user
-	 * @param: withdrawalReq
-	 * @updateTime 2022/4/7 15:26
-	 * @return: com.yonge.cooleshow.common.entity.HttpResponseResult<java.lang.Boolean>
-	 */
-	HttpResponseResult<Boolean> withdrawal(SysUser user, WithdrawalReq withdrawalReq);
 
-	/**
-	 * 提现回调
-	 * @param callback
-	 */
-	void callback(UserWithdrawalCallback callback,String jsonStr);
+    /***
+     * 用户发起提现申请
+     * @author liweifan
+     * @param: user
+     * @param: withdrawalReq
+     * @updateTime 2022/4/7 15:26
+     * @return: com.yonge.cooleshow.common.entity.HttpResponseResult<java.lang.Boolean>
+     */
+    HttpResponseResult<Boolean> withdrawal(SysUser user, WithdrawalReq withdrawalReq);
+
+    /**
+     * 提现回调
+     *
+     * @param callback
+     */
+    void callback(UserWithdrawalCallback callback, String jsonStr);
 
-	/**
-	 * 异步回调接收-签署协议
-	 * @param map
-	 */
-	void contractCallback(Map<String, Object> map);
+    /**
+     * 异步回调接收-签署协议
+     * @param status
+     * @param serialNo
+     * @param url
+     * @param errMsg
+     */
+    void contractCallback(String status, String serialNo, String url, String errMsg);
 
-	/***
-	 * 导入
-	 * @author liweifan
-	 * @param: dataList
-	 * @updateTime 2022/4/20 9:45
-	 * @return: com.yonge.cooleshow.common.entity.HttpResponseResult<java.util.List<com.yonge.toolset.utils.easyexcel.ErrMsg>>
-	 */
+
+    /***
+     * 导入
+     * @author liweifan
+     * @param: dataList
+     * @updateTime 2022/4/20 9:45
+     * @return: com.yonge.cooleshow.common.entity.HttpResponseResult<java.util.List < com.yonge.toolset.utils.easyexcel.ErrMsg>>
+     */
     /*void importExcel(List<ExcelDataReaderProperty<UserWithdrawalExport>> dataList, Long userId);*/
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/CourseGroupServiceImpl.java

@@ -945,6 +945,11 @@ public class CourseGroupServiceImpl extends ServiceImpl<CourseGroupDao, CourseGr
         return baseMapper.selectVideoGroupPlan(page,search);
     }
 
+    @Override
+    public CourseGroup selectLiveGroupInfo(Long groupId) {
+        return baseMapper.selectById(groupId);
+    }
+
     /**
      * 定时将符合开售日期的未开售的直播课课程组修改为报名中状态
      */

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/CourseScheduleServiceImpl.java

@@ -1370,7 +1370,7 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
         List<String> futureDaysNoVacation = futureDays.stream().filter(item -> !holiday.contains(item)).collect(Collectors.toList());
 
         //查询所有老师未开始、进行中的课程
-        List<String> statusList = Lists.newArrayList(CourseScheduleEnum.NOT_START.getCode(), CourseScheduleEnum.ING.getCode());
+//        List<String> statusList = Lists.newArrayList(CourseScheduleEnum.NOT_START.getCode(), CourseScheduleEnum.ING.getCode());
 
         List<Long> teacherIdList = new ArrayList<>();
         getAllTimeConfig(skipHoliday, futureDaysNoVacation, teacherIdList);//跳过节假日配置

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/UserWithdrawalServiceImpl.java

@@ -187,8 +187,8 @@ public class UserWithdrawalServiceImpl extends ServiceImpl<UserWithdrawalDao, Us
     }
 
     @Override
-    public void contractCallback(Map<String, Object> map) {
-        userContractRecordDao.contractCallbackUpdate(map);
+    public void contractCallback(String status, String serialNo, String url, String errMsg) {
+        userContractRecordDao.contractCallbackUpdate(status, serialNo, url, errMsg);
     }
 
     private void successSend(Long userId, String phone) {

cooleshow-user/user-biz/src/main/resources/config/mybatis/SysUserContractRecordMapper.xml

@@ -7,43 +7,42 @@
         <result column="user_type_" jdbcType="VARCHAR" property="userType"/>
         <result column="contract_id_" jdbcType="INTEGER" property="contractId"/>
         <result column="url_" jdbcType="VARCHAR" property="url"/>
-        <result column="created_time_" jdbcType="TIMESTAMP" property="createdTime"/>
         <result column="contract_no_" jdbcType="VARCHAR" property="contractNo"/>
+        <result column="status_" jdbcType="VARCHAR" property="status"/>
+        <result column="err_msg_" jdbcType="VARCHAR" property="errMsg"/>
         <result column="remark_" jdbcType="VARCHAR" property="remark"/>
+        <result column="created_time_" jdbcType="TIMESTAMP" property="createdTime"/>
     </resultMap>
 
     <sql id="Base_Column_List">
         id_
-        , user_id_, user_type_, contract_id_, url_, created_time_, contract_no_, remark_
+        , user_id_, user_type_, contract_id_, url_, contract_no_, status_, err_msg_, remark_, created_time_
     </sql>
 
     <insert id="insertBatch" keyColumn="id_" keyProperty="id" useGeneratedKeys="true"
             parameterType="com.yonge.cooleshow.biz.dal.entity.SysUserContractRecord">
-        insert into sys_user_contract_record(user_id_, user_type_, contract_id_, url_, created_time_, contract_no_,
-        remark_)
+        insert into sys_user_contract_record(user_id_, user_type_, contract_id_, url_, contract_no_,
+        status_, err_msg_, remark_, created_time_)
         values
         <foreach collection="entities" item="entity" separator=",">
-            (#{entity.userId}, #{entity.userType}, #{entity.contractId}, #{entity.url}, #{entity.createdTime},
-            #{entity.contractNo}, #{entity.remark})
+            (#{entity.userId}, #{entity.userType}, #{entity.contractId}, #{entity.url},#{entity.contractNo},
+            #{entity.status}, #{entity.errMsg}, #{entity.remark}, #{entity.createdTime})
         </foreach>
     </insert>
     <update id="contractCallbackUpdate" parameterType="java.util.Map">
         UPDATE sys_user_contract_record
-        <set>
-            <if test="param.contractUrl !=null">url_ = #{param.contractUrl},</if>
-            created_time_ = SYSDATE()
-        </set>
-        WHERE contract_no_ = #{param.serialNo}
+        set status_ = #{status},err_msg_ = #{errMsg},url_ = #{url}
+        WHERE contract_no_ = #{serialNo}
     </update>
 
     <select id="checkContractSign" resultType="java.lang.Boolean">
-        select count(1) from (
+        select count(b.id_) from (
             select
                 type_,MAX(version_) as version_
-            from contract_template where status_ = 1 and type_ = #{contractType}  group by type_
+            from contract_template where status_ = 1 and type_ = #{contractType} group by type_
         ) t
         left join contract_template a on t.type_ = a.type_ and t.version_ = a.version_
-        left join sys_user_contract_record b on a.id_ = b.contract_id_
+        left join sys_user_contract_record b on a.id_ = b.contract_id_ and b.status_ = SUCCESS
         where b.user_id_ = #{userId}
     </select>
 

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/SysUserContractRecordController.java

@@ -6,6 +6,7 @@ import com.yonge.cooleshow.auth.api.enums.SysUserType;
 import com.yonge.cooleshow.biz.dal.entity.ContractTemplate;
 import com.yonge.cooleshow.biz.dal.entity.SysUserContractRecord;
 import com.yonge.cooleshow.biz.dal.enums.ContractTypeEnum;
+import com.yonge.cooleshow.biz.dal.enums.DealStatusEnum;
 import com.yonge.cooleshow.biz.dal.sdk.WithdrawSdk;
 import com.yonge.cooleshow.biz.dal.service.ContractTemplateService;
 import com.yonge.cooleshow.biz.dal.service.SysUserContractRecordService;
@@ -55,8 +56,6 @@ public class SysUserContractRecordController extends BaseController {
 
     @ApiOperation("签署协议")
     @GetMapping(value = "/sign", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-
-
     public HttpResponseResult<Boolean> sign(
             @ApiParam(value = "模板id", required = true) @RequestParam("templateId") Integer templateId) {
 
@@ -64,26 +63,27 @@ public class SysUserContractRecordController extends BaseController {
         if (user == null || null == user.getId()) {
             return failed(HttpStatus.FORBIDDEN, "请登录");
         }
-
-        String userType = "";
+        //是否签署标识，签署了才入库
         boolean flag = false;
 
+        SysUserContractRecord contractRecord = new SysUserContractRecord();
+
         Long contractNo = idGeneratorService.generatorId("contractNo");
+        contractRecord.setContractNo(contractNo.toString());
+
+        contractRecord.setUserId(user.getId());
 
         ContractTemplate contractTemplate = contractTemplateService.get(templateId);
+        contractRecord.setContractId(contractTemplate.getId());
+
         if (ContractTypeEnum.WITHDRAW.getCode().equals(contractTemplate.getType())) {
             //签署提现协议
-            userType = SysUserType.TEACHER.getCode();
-
+            contractRecord.setUserType(SysUserType.TEACHER.getCode());
+            contractRecord.setStatus(DealStatusEnum.DOING.getCode());
             flag = withdrawSdk.signContract(user.getRealName(), user.getIdCardNo(), user.getPhone(), contractNo.toString());
         }
 
         if (flag) {
-            SysUserContractRecord contractRecord = new SysUserContractRecord();
-            contractRecord.setUserId(user.getId());
-            contractRecord.setUserType(userType);
-            contractRecord.setContractId(contractTemplate.getId());
-            contractRecord.setContractNo(contractNo.toString());
             sysUserContractRecordService.save(contractRecord);
         }
         return HttpResponseResult.succeed(true);

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/UserWithdrawalController.java

@@ -7,6 +7,7 @@ import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dto.req.WithdrawalReq;
 import com.yonge.cooleshow.biz.dal.dto.search.TeacherWithdrawalSearch;
 import com.yonge.cooleshow.biz.dal.entity.UserWithdrawalCallback;
+import com.yonge.cooleshow.biz.dal.enums.DealStatusEnum;
 import com.yonge.cooleshow.biz.dal.service.UserWithdrawalService;
 import com.yonge.cooleshow.biz.dal.support.PageUtil;
 import com.yonge.cooleshow.biz.dal.vo.UserWithdrawalVo;
@@ -29,6 +30,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpStatus;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
@@ -120,6 +122,7 @@ public class UserWithdrawalController extends BaseController {
 
     /**
      * 异步回调接收-提现
+     *
      * @param content
      * @param request
      * @return
@@ -151,6 +154,7 @@ public class UserWithdrawalController extends BaseController {
 
     /**
      * 异步回调接收-签署协议
+     *
      * @param content
      * @param request
      * @return
@@ -164,12 +168,30 @@ public class UserWithdrawalController extends BaseController {
             }
             Map<String, Object> map = JSONObject.parseObject(content);
             String jsonStr = (String) map.get("content");
+
+            String return_code = (String) map.get("return_code");
+
             Map<String, Object> record = JSONObject.parseObject(jsonStr);
-            userWithdrawalService.contractCallback(record);
+            if (CollectionUtils.isEmpty(record) || null == record.get("serialNo")) {
+                log.error("签署失败,返回合同编号为空 {}", content);
+                return "failed";
+            }
+
+            if ("T".equals(return_code)) {
+                userWithdrawalService.contractCallback(
+                        DealStatusEnum.SCCESS.getCode(), record.get("serialNo").toString(),
+                        record.get("contractUrl").toString(), null);
+                return "success";
+            } else {
+                String return_message = StringUtil.get(map.get("return_message"));
+                userWithdrawalService.contractCallback(
+                        DealStatusEnum.FAILED.getCode(), record.get("serialNo").toString(), null, return_message);
+                return "failed";
+            }
         } catch (Exception e) {
             log.error("签署失败e：{}", e);
             return "failed";
         }
-        return "success";
+
     }
 }