Merge remote-tracking branch 'origin/master'

audio-analysis/src/main/resources/logback-spring.xml

@@ -27,7 +27,7 @@
 		</encoder>
 	</appender>
 
-	<logger name="com.yonge" level="info" />
+	<logger name="com.yonge" level="debug" />
 
 	<!--开发环境:打印控制台 -->
 	<springProfile name="local">
@@ -39,7 +39,7 @@
 
 	<!--开发环境:打印控制台 -->
 	<springProfile name="dev">
-		<root level="dev">
+		<root level="info">
 			<appender-ref ref="stdout" />
 			<appender-ref ref="file" />
 		</root>

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/web/controller/UserController.java

@@ -383,7 +383,6 @@ public class UserController extends BaseController {
                     return failed("手机号被占用");
                 }
             }
-            sysUser.setIsSuperAdmin(null);
             sysUserService.updateBaseInfo(sysUser);
             return succeed();
         }

cooleshow-bbs/src/main/java/com/yonge/cooleshow/bbs/dto/BbsArticleDto.java

@@ -2,7 +2,6 @@ package com.yonge.cooleshow.bbs.dto;
 
 import com.yonge.cooleshow.bbs.entity.BbsArticle;
 import io.swagger.annotations.ApiModel;
-import org.apache.commons.beanutils.BeanUtils;
 
 /**
  * @Author: liweifan
@@ -12,13 +11,4 @@ import org.apache.commons.beanutils.BeanUtils;
 public class BbsArticleDto extends BbsArticle{
 	private static final long serialVersionUID = 1L;
     
-    public BbsArticleDto buildDto(BbsArticle bbsArticle){
-        try {
-            BeanUtils.copyProperties(this,bbsArticle);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return this;
-    }
-
 }

cooleshow-bbs/src/main/java/com/yonge/cooleshow/bbs/dto/BbsCollectDto.java

@@ -2,7 +2,6 @@ package com.yonge.cooleshow.bbs.dto;
 
 import com.yonge.cooleshow.bbs.entity.BbsCollect;
 import io.swagger.annotations.ApiModel;
-import org.apache.commons.beanutils.BeanUtils;
 
 /**
  * @Author: liweifan
@@ -12,13 +11,4 @@ import org.apache.commons.beanutils.BeanUtils;
 public class BbsCollectDto extends BbsCollect{
 	private static final long serialVersionUID = 1L;
     
-    public BbsCollectDto buildDto(BbsCollect bbsCollect){
-        try {
-            BeanUtils.copyProperties(this,bbsCollect);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return this;
-    }
-
 }

cooleshow-bbs/src/main/java/com/yonge/cooleshow/bbs/dto/BbsConfigLabelDto.java

@@ -2,7 +2,6 @@ package com.yonge.cooleshow.bbs.dto;
 
 import com.yonge.cooleshow.bbs.entity.BbsConfigLabel;
 import io.swagger.annotations.ApiModel;
-import org.apache.commons.beanutils.BeanUtils;
 
 /**
  * @Author: liweifan
@@ -12,13 +11,4 @@ import org.apache.commons.beanutils.BeanUtils;
 public class BbsConfigLabelDto extends BbsConfigLabel{
 	private static final long serialVersionUID = 1L;
     
-    public BbsConfigLabelDto buildDto(BbsConfigLabel bbsConfigLabel){
-        try {
-            BeanUtils.copyProperties(this,bbsConfigLabel);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return this;
-    }
-
 }

cooleshow-bbs/src/main/java/com/yonge/cooleshow/bbs/dto/BbsFollowDto.java

@@ -2,7 +2,6 @@ package com.yonge.cooleshow.bbs.dto;
 
 import com.yonge.cooleshow.bbs.entity.BbsFollow;
 import io.swagger.annotations.ApiModel;
-import org.apache.commons.beanutils.BeanUtils;
 
 /**
  * @Author: liweifan
@@ -11,14 +10,5 @@ import org.apache.commons.beanutils.BeanUtils;
 @ApiModel(value = "BbsFollowDto对象", description = "关注数据传输对象")
 public class BbsFollowDto extends BbsFollow{
 	private static final long serialVersionUID = 1L;
-    
-    public BbsFollowDto buildDto(BbsFollow bbsFollow){
-        try {
-            BeanUtils.copyProperties(this,bbsFollow);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return this;
-    }
 
 }

cooleshow-bbs/src/main/java/com/yonge/cooleshow/bbs/dto/BbsLikeDto.java

@@ -2,7 +2,6 @@ package com.yonge.cooleshow.bbs.dto;
 
 import com.yonge.cooleshow.bbs.entity.BbsLike;
 import io.swagger.annotations.ApiModel;
-import org.apache.commons.beanutils.BeanUtils;
 
 /**
  * @Author: liweifan
@@ -12,13 +11,4 @@ import org.apache.commons.beanutils.BeanUtils;
 public class BbsLikeDto extends BbsLike{
 	private static final long serialVersionUID = 1L;
     
-    public BbsLikeDto buildDto(BbsLike bbsLike){
-        try {
-            BeanUtils.copyProperties(this,bbsLike);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return this;
-    }
-
 }

cooleshow-bbs/src/main/java/com/yonge/cooleshow/bbs/dto/BbsPrivateMessageDto.java

@@ -4,7 +4,6 @@ import com.yonge.cooleshow.bbs.entity.BbsPrivateMessage;
 import com.yonge.toolset.base.page.PageInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.beanutils.BeanUtils;
 
 import java.util.List;
 
@@ -83,13 +82,4 @@ public class BbsPrivateMessageDto extends BbsPrivateMessage{
         this.userAvatar = userAvatar;
     }
 
-    public BbsPrivateMessageDto buildDto(BbsPrivateMessage bbsPrivateMessage){
-        try {
-            BeanUtils.copyProperties(this,bbsPrivateMessage);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return this;
-    }
-
 }

cooleshow-bbs/src/main/java/com/yonge/cooleshow/bbs/dto/BbsReplyDto.java

@@ -2,7 +2,6 @@ package com.yonge.cooleshow.bbs.dto;
 
 import com.yonge.cooleshow.bbs.entity.BbsReply;
 import io.swagger.annotations.ApiModel;
-import org.apache.commons.beanutils.BeanUtils;
 
 /**
  * @Author: liweifan
@@ -11,14 +10,5 @@ import org.apache.commons.beanutils.BeanUtils;
 @ApiModel(value = "BbsReplyDto对象", description = "文章评论数据传输对象")
 public class BbsReplyDto extends BbsReply{
 	private static final long serialVersionUID = 1L;
-    
-    public BbsReplyDto buildDto(BbsReply bbsReply){
-        try {
-            BeanUtils.copyProperties(this,bbsReply);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return this;
-    }
 
 }

cooleshow-bbs/src/main/java/com/yonge/cooleshow/bbs/vo/BbsCollectVo.java

@@ -3,7 +3,6 @@ package com.yonge.cooleshow.bbs.vo;
 import com.yonge.cooleshow.bbs.entity.BbsCollect;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.beanutils.BeanUtils;
 
 /**
  * @Author: liweifan
@@ -48,13 +47,4 @@ public class BbsCollectVo extends BbsCollect{
         this.labelName = labelName;
     }
 
-    public BbsCollectVo buildVo(BbsCollect bbsCollect){
-        try {
-            BeanUtils.copyProperties(this,bbsCollect);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return this;
-    }
-
 }

cooleshow-bbs/src/main/java/com/yonge/cooleshow/bbs/vo/BbsConfigLabelVo.java

@@ -2,7 +2,6 @@ package com.yonge.cooleshow.bbs.vo;
 
 import com.yonge.cooleshow.bbs.entity.BbsConfigLabel;
 import io.swagger.annotations.ApiModel;
-import org.apache.commons.beanutils.BeanUtils;
 
 /**
  * @Author: liweifan
@@ -11,14 +10,5 @@ import org.apache.commons.beanutils.BeanUtils;
 @ApiModel(value = "BbsConfigLabelVo对象", description = "论坛标签设置查询视图对象")
 public class BbsConfigLabelVo extends BbsConfigLabel{
 	private static final long serialVersionUID = 1L;
-    
-    public BbsConfigLabelVo buildVo(BbsConfigLabel bbsConfigLabel){
-        try {
-            BeanUtils.copyProperties(this,bbsConfigLabel);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return this;
-    }
 
 }

cooleshow-bbs/src/main/java/com/yonge/cooleshow/bbs/vo/BbsFollowVo.java

@@ -3,7 +3,6 @@ package com.yonge.cooleshow.bbs.vo;
 import com.yonge.cooleshow.bbs.entity.BbsFollow;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.beanutils.BeanUtils;
 
 /**
  * @Author: liweifan
@@ -35,13 +34,4 @@ public class BbsFollowVo extends BbsFollow{
         this.avatar = avatar;
     }
 
-    public BbsFollowVo buildVo(BbsFollow bbsFollow){
-        try {
-            BeanUtils.copyProperties(this,bbsFollow);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return this;
-    }
-
 }

cooleshow-bbs/src/main/java/com/yonge/cooleshow/bbs/vo/BbsLikeVo.java

@@ -2,7 +2,6 @@ package com.yonge.cooleshow.bbs.vo;
 
 import com.yonge.cooleshow.bbs.entity.BbsLike;
 import io.swagger.annotations.ApiModel;
-import org.apache.commons.beanutils.BeanUtils;
 
 /**
  * @Author: liweifan
@@ -12,13 +11,4 @@ import org.apache.commons.beanutils.BeanUtils;
 public class BbsLikeVo extends BbsLike{
 	private static final long serialVersionUID = 1L;
     
-    public BbsLikeVo buildVo(BbsLike bbsLike){
-        try {
-            BeanUtils.copyProperties(this,bbsLike);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return this;
-    }
-
 }

cooleshow-bbs/src/main/java/com/yonge/cooleshow/bbs/vo/BbsPrivateMessageVo.java

@@ -2,7 +2,6 @@ package com.yonge.cooleshow.bbs.vo;
 
 import com.yonge.cooleshow.bbs.entity.BbsPrivateMessage;
 import io.swagger.annotations.ApiModel;
-import org.apache.commons.beanutils.BeanUtils;
 
 /**
  * @Author: liweifan
@@ -11,14 +10,5 @@ import org.apache.commons.beanutils.BeanUtils;
 @ApiModel(value = "BbsPrivateMessageVo对象", description = "私信查询视图对象")
 public class BbsPrivateMessageVo extends BbsPrivateMessage{
 	private static final long serialVersionUID = 1L;
-    
-    public BbsPrivateMessageVo buildVo(BbsPrivateMessage bbsPrivateMessage){
-        try {
-            BeanUtils.copyProperties(this,bbsPrivateMessage);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return this;
-    }
 
 }

cooleshow-bbs/src/main/java/com/yonge/cooleshow/bbs/vo/BbsReplyAuditVo.java

@@ -1,9 +1,7 @@
 package com.yonge.cooleshow.bbs.vo;
 
 import com.yonge.cooleshow.bbs.entity.BbsReply;
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.beanutils.BeanUtils;
 
 import java.util.Date;
 
@@ -81,15 +79,6 @@ public class BbsReplyAuditVo extends BbsReply {
         this.verifyTime = verifyTime;
     }
 
-    public BbsReplyAuditVo buildVo(BbsReply bbsReply) {
-        try {
-            BeanUtils.copyProperties(this, bbsReply);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return this;
-    }
-
     public String getArticleTitle() {
         return articleTitle;
     }

cooleshow-bbs/src/main/java/com/yonge/cooleshow/bbs/vo/BbsReplyVo.java

@@ -3,7 +3,6 @@ package com.yonge.cooleshow.bbs.vo;
 import com.yonge.cooleshow.bbs.entity.BbsReply;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.beanutils.BeanUtils;
 
 import java.util.List;
 

cooleshow-common/src/main/java/com/yonge/cooleshow/common/config/EnumConverter.java

@@ -3,7 +3,7 @@ package com.yonge.cooleshow.common.config;
 import com.yonge.toolset.base.enums.BaseEnum;
 import org.springframework.core.convert.converter.Converter;
 
-public class EnumConverter<T extends BaseEnum<?, ?>> implements Converter<String, T> {
+public class EnumConverter<T extends BaseEnum<?, ?>> implements Converter<Object, T> {
 
 	private Class<T> enumType;
 
@@ -12,18 +12,23 @@ public class EnumConverter<T extends BaseEnum<?, ?>> implements Converter<String
 	}
 
 	@Override
-	public T convert(String source) {
+	public T convert(Object source) {
 		return getEnum(enumType, source);
 	}
 
-	private T getEnum(Class<T> targerType, String source) {
+	private T getEnum(Class<T> targerType, Object source) {
+		if(null == source){
+			return null;
+		}
 		for (T en : targerType.getEnumConstants()) {
 			if (en.getCode() instanceof Integer) {
-				if (en.getCode().equals(Integer.parseInt(source))) {
-					return en;
-				}
+				try {
+					if (en.getCode().equals(Integer.parseInt(source.toString()))) {
+						return en;
+					}
+				}catch (Exception e){}
 			} else {
-				if (source.equals(String.valueOf(en.getCode()))) {
+				if (source.toString().equals(String.valueOf(en.getCode()))) {
 					return en;
 				}
 			}

cooleshow-common/src/main/java/com/yonge/cooleshow/common/config/EnumConverterFactory.java

@@ -1,16 +1,27 @@
 package com.yonge.cooleshow.common.config;
 
+import com.google.common.collect.Maps;
 import com.yonge.toolset.base.enums.BaseEnum;
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.core.convert.converter.ConverterFactory;
 import org.springframework.stereotype.Component;
 
+import java.util.Map;
+
 @Component
-public class EnumConverterFactory implements ConverterFactory<String, BaseEnum<?, ?>> {
+public class EnumConverterFactory implements ConverterFactory<Object, BaseEnum<?, ?>> {
+	@SuppressWarnings("rawtypes")
+	private static final Map<Class, Converter> CONVERTERS = Maps.newHashMap();
 
 	@Override
-	public <T extends BaseEnum<?, ?>> Converter<String, T> getConverter(Class<T> targetType) {
-		return new EnumConverter<T>(targetType);
+	public <T extends BaseEnum<?, ?>> Converter<Object, T> getConverter(Class<T> targetType) {
+		Converter<Object, T> converter = CONVERTERS.get(targetType);
+		if (converter == null) {
+			converter = new EnumConverter<>(targetType);
+			CONVERTERS.put(targetType, converter);
+		}
+		return converter;
+
 	}
 
 }

cooleshow-common/src/main/java/com/yonge/cooleshow/common/enums/YesOrNoEnum.java

@@ -23,4 +23,14 @@ public enum YesOrNoEnum implements BaseEnum<Integer, YesOrNoEnum> {
     public Integer getCode() {
         return this.code;
     }
+
+    public static YesOrNoEnum valueOf(Integer code) {
+        YesOrNoEnum[] values = YesOrNoEnum.values();
+        for (YesOrNoEnum value : values) {
+            if(value.getCode().equals(code)){
+                return value;
+            }
+        }
+        return null;
+    }
 }

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/config/WebMvcConfig.java

@@ -21,18 +21,19 @@ public class WebMvcConfig implements WebMvcConfigurer {
 
 	@Autowired
 	private OperationLogInterceptor operationLogInterceptor;
+	@Autowired
+	private EnumConverterFactory enumConverterFactory;
 
 	/**
 	 * 枚举类的转换器 addConverterFactory
 	 */
 	@Override
 	public void addFormatters(FormatterRegistry registry) {
-		registry.addConverterFactory(new EnumConverterFactory());
+		registry.addConverterFactory(enumConverterFactory);
 	}
 
 	@Override
 	public void addInterceptors(InterceptorRegistry registry) {
-
 		registry.addInterceptor(operationLogInterceptor).addPathPatterns("/**").excludePathPatterns("/login");
 	}
 

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

@@ -2,9 +2,9 @@ package com.yonge.cooleshow.admin.controller;
 
 import com.yonge.cooleshow.biz.dal.dto.search.HomeworkAdminSearch;
 import com.yonge.cooleshow.biz.dal.enums.CourseScheduleEnum;
-import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import com.yonge.cooleshow.biz.dal.service.CourseHomeworkService;
 import com.yonge.cooleshow.biz.dal.service.CourseScheduleService;
+import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import com.yonge.toolset.mybatis.support.PageUtil;
 import com.yonge.cooleshow.biz.dal.vo.CourseHomeworkDetailVo;
 import com.yonge.cooleshow.biz.dal.vo.CourseHomeworkVo;

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

@@ -5,8 +5,8 @@ import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dto.search.HotSearchSearch;
 import com.yonge.cooleshow.biz.dal.entity.HotSearch;
-import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import com.yonge.cooleshow.biz.dal.service.HotSearchService;
+import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import com.yonge.toolset.mybatis.support.PageUtil;
 import com.yonge.cooleshow.biz.dal.vo.HotSearchVo;
 import com.yonge.cooleshow.common.controller.BaseController;

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

@@ -7,8 +7,8 @@ import com.yonge.cooleshow.biz.dal.dto.MusicAlbumSheetDto;
 import com.yonge.cooleshow.biz.dal.dto.search.MusicAlbumDetailSearch;
 import com.yonge.cooleshow.biz.dal.dto.search.MusicAlbumSearch;
 import com.yonge.cooleshow.biz.dal.entity.MusicAlbum;
-import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import com.yonge.cooleshow.biz.dal.service.MusicAlbumService;
+import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import com.yonge.toolset.mybatis.support.PageUtil;
 import com.yonge.cooleshow.biz.dal.vo.AlbumDetailVo;
 import com.yonge.cooleshow.biz.dal.vo.MusicAlbumVo;

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

@@ -15,6 +15,7 @@ import com.yonge.cooleshow.biz.dal.entity.MusicSheet;
 import com.yonge.cooleshow.biz.dal.enums.*;
 import com.yonge.cooleshow.biz.dal.service.MusicSheetService;
 import com.yonge.cooleshow.biz.dal.service.MusicTagService;
+import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import com.yonge.toolset.mybatis.support.PageUtil;
 import com.yonge.cooleshow.biz.dal.vo.*;
 import com.yonge.cooleshow.common.controller.BaseController;

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

@@ -10,7 +10,7 @@ import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.toolset.base.page.PageInfo;
 import com.yonge.toolset.utils.easyexcel.ExcelUtils;
 import io.swagger.annotations.*;
-import org.apache.commons.beanutils.BeanUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -61,19 +61,13 @@ public class UserOrderController extends BaseController {
     public void export(@RequestBody OrderSearch query) {
         List<UserOrderVo> userOrderVos = userOrderService.selectAllList(query);
         List<UserOrderExport> list = new ArrayList<>();
-        userOrderVos.forEach(o-> {
+        userOrderVos.forEach(o -> {
             UserOrderExport export = new UserOrderExport();
-            try {
-                BeanUtils.copyProperties(export,o);
-                if(null == export.getFeeAmt()){
-                    export.setFeeAmt(BigDecimal.ZERO);
-                }
-                list.add(export);
-            } catch (IllegalAccessException e) {
-                e.printStackTrace();
-            } catch (InvocationTargetException e) {
-                e.printStackTrace();
+            BeanUtils.copyProperties(o, export);
+            if (null == export.getFeeAmt()) {
+                export.setFeeAmt(BigDecimal.ZERO);
             }
+            list.add(export);
         });
         ExcelUtils.exportExcel(list, "订单列表数据" + System.currentTimeMillis(),
                 "订单列表数据");

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

@@ -12,7 +12,8 @@ import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.toolset.base.page.PageInfo;
 import com.yonge.toolset.utils.easyexcel.*;
 import io.swagger.annotations.*;
-import org.apache.commons.beanutils.BeanUtils;
+
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -23,7 +24,6 @@ import com.yonge.cooleshow.biz.dal.dto.search.TeacherWithdrawalSearch;
 import com.yonge.cooleshow.biz.dal.service.UserWithdrawalService;
 
 import javax.validation.Valid;
-import java.lang.reflect.InvocationTargetException;
 import java.util.*;
 
 @RestController
@@ -67,14 +67,9 @@ public class UserWithdrawalController extends BaseController {
         List<UserWithdrawalExport> list = new ArrayList<>();
         withdrawalVoList.forEach(o -> {
             UserWithdrawalExport export = new UserWithdrawalExport();
-            try {
-                BeanUtils.copyProperties(export, o);
-                list.add(export);
-            } catch (IllegalAccessException e) {
-                e.printStackTrace();
-            } catch (InvocationTargetException e) {
-                e.printStackTrace();
-            }
+            BeanUtils.copyProperties(o, export);
+            list.add(export);
+
         });
         ExcelUtils.exportExcel(list, "结算列表数据" + System.currentTimeMillis(),
                 "列表数据");

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

@@ -6,7 +6,6 @@ import com.alibaba.excel.metadata.CellData;
 import com.alibaba.excel.metadata.GlobalConfiguration;
 import com.alibaba.excel.metadata.property.ExcelContentProperty;
 import com.yonge.cooleshow.biz.dal.enums.AudioTypeEnum;
-import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 
 /**
  * Description

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

@@ -7,7 +7,6 @@ import com.alibaba.excel.metadata.GlobalConfiguration;
 import com.alibaba.excel.metadata.property.ExcelContentProperty;
 import com.yonge.cooleshow.biz.dal.enums.AudioTypeEnum;
 import com.yonge.cooleshow.biz.dal.enums.ChargeTypeEnum;
-import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 
 /**
  * Description

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

@@ -6,7 +6,7 @@ import com.alibaba.excel.metadata.CellData;
 import com.alibaba.excel.metadata.GlobalConfiguration;
 import com.alibaba.excel.metadata.property.ExcelContentProperty;
 import com.yonge.cooleshow.biz.dal.enums.AudioTypeEnum;
-import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
+import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 
 /**
  * Description

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

@@ -10,8 +10,8 @@ import com.yonge.cooleshow.biz.dal.dto.search.HomeworkSearch;
 import com.yonge.cooleshow.biz.dal.dto.search.MyCourseSearch;
 import com.yonge.cooleshow.biz.dal.dto.search.PracticeTeacherSearch;
 import com.yonge.cooleshow.biz.dal.entity.CourseSchedule;
-import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import com.yonge.cooleshow.biz.dal.vo.*;
+import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import org.apache.ibatis.annotations.Param;
 
 import java.math.BigDecimal;

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

@@ -4,8 +4,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yonge.cooleshow.biz.dal.dto.search.MusicTagSearch;
 import com.yonge.cooleshow.biz.dal.entity.MusicTag;
-import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import com.yonge.cooleshow.biz.dal.vo.MusicTagVo;
+import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

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

@@ -11,11 +11,15 @@ import com.yonge.cooleshow.biz.dal.entity.UserAccountRecord;
 import com.yonge.cooleshow.biz.dal.vo.UserAccountRecordVo;
 import com.yonge.cooleshow.biz.dal.dto.search.UserAccountRecordSearch;
 
-
+/**
+ * 账户记账规则
+ * 陪练课 每次课程结束 记录入账
+ * 直播课 每次课程结束，对每个学员都记录一次入账
+ * 用户购买老师乐谱后 记录入账
+ */
 public interface UserAccountRecordDao extends BaseMapper<UserAccountRecord> {
 	/**
 	 * 查询详情
-	 *
 	 * @author liweifan
 	 * @date 2022-03-30 13:53:51
 	 * @return: com.yonge.cooleshow.biz.dal.vo.UserAccountRecordVo

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/EmployeeDto.java

@@ -5,7 +5,6 @@ import com.yonge.cooleshow.biz.dal.entity.Employee;
 import com.yonge.cooleshow.biz.dal.enums.GenderEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.beanutils.BeanUtils;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.validation.constraints.NotBlank;
@@ -51,17 +50,16 @@ public class EmployeeDto extends Employee{
         return gender;
     }
 
-    public void setGender(GenderEnum gender){
-        this.gender = gender;
-    }
-
     public void setGender(Object gender) {
-        try {
-            GenderEnum genderEnum = GenderEnum.valueOf(Integer.parseInt(gender.toString()));
-            this.gender = genderEnum;
-        }catch (Exception e){}
+        if(gender instanceof GenderEnum ){
+            this.gender = (GenderEnum) gender;
+        }else if (null != gender) {
+            this.gender = GenderEnum.valueOf(Integer.parseInt(gender.toString()));
+        }
     }
 
+    
+
     public String getPhone() {
         return phone;
     }
@@ -88,13 +86,4 @@ public class EmployeeDto extends Employee{
         this.entryDate = entryDate;
     }
 
-    public EmployeeDto toEmployeeDto(Employee employee){
-        try {
-            BeanUtils.copyProperties(this,employee);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return this;
-    }
-
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/MusicSheetExport.java

@@ -4,7 +4,7 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.yonge.cooleshow.biz.dal.convert.AudioTypeConverter;
 import com.yonge.cooleshow.biz.dal.convert.YesOrNoConverter;
 import com.yonge.cooleshow.biz.dal.enums.AudioTypeEnum;
-import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
+import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/PianoRoomBuyRecordDto.java

@@ -2,7 +2,6 @@ package com.yonge.cooleshow.biz.dal.dto;
 
 import com.yonge.cooleshow.biz.dal.entity.PianoRoomBuyRecord;
 import io.swagger.annotations.ApiModel;
-import org.apache.commons.beanutils.BeanUtils;
 
 /**
  * @Author: liweifan
@@ -11,14 +10,5 @@ import org.apache.commons.beanutils.BeanUtils;
 @ApiModel(value = "PianoRoomBuyRecordDto对象", description = "购买会员卡记录表数据传输对象")
 public class PianoRoomBuyRecordDto extends PianoRoomBuyRecord{
 	private static final long serialVersionUID = 1L;
-    
-    public PianoRoomBuyRecordDto buildDto(PianoRoomBuyRecord pianoRoomBuyRecord){
-        try {
-            BeanUtils.copyProperties(this,pianoRoomBuyRecord);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return this;
-    }
 
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/PianoRoomSettingsDto.java

@@ -2,7 +2,6 @@ package com.yonge.cooleshow.biz.dal.dto;
 
 import com.yonge.cooleshow.biz.dal.entity.PianoRoomSettings;
 import io.swagger.annotations.ApiModel;
-import org.apache.commons.beanutils.BeanUtils;
 
 /**
  * @Author: liweifan
@@ -11,14 +10,5 @@ import org.apache.commons.beanutils.BeanUtils;
 @ApiModel(value = "PianoRoomSettingsDto对象", description = "数据传输对象")
 public class PianoRoomSettingsDto extends PianoRoomSettings{
 	private static final long serialVersionUID = 1L;
-    
-    public PianoRoomSettingsDto buildDto(PianoRoomSettings pianoRoomSettings){
-        try {
-            BeanUtils.copyProperties(this,pianoRoomSettings);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return this;
-    }
 
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/StudentTotalDto.java

@@ -2,7 +2,6 @@ package com.yonge.cooleshow.biz.dal.dto;
 
 import com.yonge.cooleshow.biz.dal.entity.StudentTotal;
 import io.swagger.annotations.ApiModel;
-import org.apache.commons.beanutils.BeanUtils;
 
 /**
  * @Author: liweifan
@@ -12,13 +11,4 @@ import org.apache.commons.beanutils.BeanUtils;
 public class StudentTotalDto extends StudentTotal{
 	private static final long serialVersionUID = 1L;
     
-    public StudentTotalDto buildDto(StudentTotal studentTotal){
-        try {
-            BeanUtils.copyProperties(this,studentTotal);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return this;
-    }
-
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/TeacherTotalDto.java

@@ -2,7 +2,6 @@ package com.yonge.cooleshow.biz.dal.dto;
 
 import com.yonge.cooleshow.biz.dal.entity.TeacherTotal;
 import io.swagger.annotations.ApiModel;
-import org.apache.commons.beanutils.BeanUtils;
 
 /**
  * @Author: liweifan
@@ -11,14 +10,5 @@ import org.apache.commons.beanutils.BeanUtils;
 @ApiModel(value = "TeacherTotalDto对象", description = "教师统计总表数据传输对象")
 public class TeacherTotalDto extends TeacherTotal{
 	private static final long serialVersionUID = 1L;
-    
-    public TeacherTotalDto buildDto(TeacherTotal teacherTotal){
-        try {
-            BeanUtils.copyProperties(this,teacherTotal);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return this;
-    }
 
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/UserOrderRefundBillDto.java

@@ -2,7 +2,6 @@ package com.yonge.cooleshow.biz.dal.dto;
 
 import com.yonge.cooleshow.biz.dal.entity.UserOrderRefundBill;
 import io.swagger.annotations.ApiModel;
-import org.apache.commons.beanutils.BeanUtils;
 
 /**
  * @Author: liweifan
@@ -12,13 +11,4 @@ import org.apache.commons.beanutils.BeanUtils;
 public class UserOrderRefundBillDto extends UserOrderRefundBill {
 	private static final long serialVersionUID = 1L;
     
-    public UserOrderRefundBillDto buildDto(UserOrderRefundBill userOrderRefundBill){
-        try {
-            BeanUtils.copyProperties(this, userOrderRefundBill);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return this;
-    }
-
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/UserOrderRefundDto.java

@@ -2,7 +2,6 @@ package com.yonge.cooleshow.biz.dal.dto;
 
 import com.yonge.cooleshow.biz.dal.entity.UserOrderRefund;
 import io.swagger.annotations.ApiModel;
-import org.apache.commons.beanutils.BeanUtils;
 
 /**
  * @Author: liweifan
@@ -11,14 +10,5 @@ import org.apache.commons.beanutils.BeanUtils;
 @ApiModel(value = "UserOrderRefundDto对象", description = "退款申请表数据传输对象")
 public class UserOrderRefundDto extends UserOrderRefund{
 	private static final long serialVersionUID = 1L;
-    
-    public UserOrderRefundDto buildDto(UserOrderRefund userOrderRefund){
-        try {
-            BeanUtils.copyProperties(this,userOrderRefund);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return this;
-    }
 
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/req/TeacherApplyDetailReq.java

@@ -68,16 +68,20 @@ public class TeacherApplyDetailReq implements Serializable {
         return gender;
     }
 
-    public void setGender(GenderEnum gender){
-        this.gender = gender;
-    }
-
     public void setGender(Object gender) {
-        try {
-            GenderEnum genderEnum = GenderEnum.valueOf(Integer.parseInt(gender.toString()));
-            this.gender = genderEnum;
-        }catch (Exception e){}
+        if (null != gender) {
+            this.gender = GenderEnum.valueOf(Integer.parseInt(gender.toString()));
+        }
     }
+/*
+    public void setGender(Object gender) {
+        if(gender instanceof GenderEnum ){
+            this.gender = (GenderEnum) gender;
+        }else if (null != gender) {
+            this.gender = GenderEnum.valueOf(Integer.parseInt(gender.toString()));
+        }
+    }*/
+
 
     public Date getBirthdate() {
         return birthdate;

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/EmployeeSearch.java

@@ -2,7 +2,7 @@ package com.yonge.cooleshow.biz.dal.dto.search;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yonge.cooleshow.biz.dal.enums.GenderEnum;
-import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
+import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import com.yonge.toolset.base.page.QueryInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -45,17 +45,16 @@ public class EmployeeSearch extends QueryInfo{
         return gender;
     }
 
-    public void setGender(GenderEnum gender){
-        this.gender = gender;
-    }
-
     public void setGender(Object gender) {
-        try {
-            GenderEnum genderEnum = GenderEnum.valueOf(Integer.parseInt(gender.toString()));
-            this.gender = genderEnum;
-        }catch (Exception e){}
+        if(gender instanceof GenderEnum ){
+            this.gender = (GenderEnum) gender;
+        }else if (null != gender) {
+            this.gender = GenderEnum.valueOf(Integer.parseInt(gender.toString()));
+        }
     }
 
+    
+
     public String getSubjectIdList() {
         return subjectIdList;
     }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/HomeworkAdminSearch.java

@@ -2,7 +2,7 @@ package com.yonge.cooleshow.biz.dal.dto.search;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yonge.cooleshow.biz.dal.enums.CourseScheduleEnum;
-import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
+import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import com.yonge.toolset.base.page.QueryInfo;
 import io.swagger.annotations.ApiModelProperty;
 import org.springframework.format.annotation.DateTimeFormat;

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/HomeworkSearch.java

@@ -3,7 +3,7 @@ package com.yonge.cooleshow.biz.dal.dto.search;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yonge.cooleshow.biz.dal.enums.CourseScheduleEnum;
 import com.yonge.cooleshow.biz.dal.enums.HomeworkStatusEnum;
-import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
+import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import com.yonge.toolset.base.page.QueryInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/HotSearchSearch.java

@@ -1,7 +1,7 @@
 package com.yonge.cooleshow.biz.dal.dto.search;
 
 import com.yonge.cooleshow.biz.dal.enums.HotSearchEnum;
-import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
+import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import com.yonge.toolset.base.page.QueryInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/MusicAlbumSearch.java

@@ -1,6 +1,6 @@
 package com.yonge.cooleshow.biz.dal.dto.search;
 
-import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
+import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import com.yonge.toolset.base.page.QueryInfo;
 import com.yonge.toolset.base.util.StringUtil;
 import io.swagger.annotations.ApiModel;

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/MusicSheetSearch.java

@@ -3,7 +3,7 @@ package com.yonge.cooleshow.biz.dal.dto.search;
 import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
 import com.yonge.cooleshow.biz.dal.enums.ChargeTypeEnum;
 import com.yonge.cooleshow.biz.dal.enums.SourceTypeEnum;
-import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
+import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import com.yonge.toolset.base.page.QueryInfo;
 import com.yonge.toolset.base.util.StringUtil;
 import io.swagger.annotations.ApiModel;

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/MusicTagSearch.java

@@ -1,6 +1,6 @@
 package com.yonge.cooleshow.biz.dal.dto.search;
 
-import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
+import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import com.yonge.toolset.base.page.QueryInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/StudentMusicSheetOrderSearch.java

@@ -1,7 +1,7 @@
 package com.yonge.cooleshow.biz.dal.dto.search;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
+import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import com.yonge.toolset.base.page.QueryInfo;
 import com.yonge.toolset.base.util.StringUtil;
 import io.swagger.annotations.ApiModelProperty;

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/StudentMusicSheetSearch.java

@@ -1,6 +1,6 @@
 package com.yonge.cooleshow.biz.dal.dto.search;
 
-import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
+import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModelProperty;
 
 /**

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/StudentSearch.java

@@ -2,7 +2,7 @@ package com.yonge.cooleshow.biz.dal.dto.search;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yonge.cooleshow.biz.dal.enums.GenderEnum;
-import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
+import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import com.yonge.toolset.base.page.QueryInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -45,15 +45,12 @@ public class StudentSearch extends QueryInfo{
         return gender;
     }
 
-    public void setGender(GenderEnum gender){
-        this.gender = gender;
-    }
-
     public void setGender(Object gender) {
-        try {
-            GenderEnum genderEnum = GenderEnum.valueOf(Integer.parseInt(gender.toString()));
-            this.gender = genderEnum;
-        }catch (Exception e){}
+        if(gender instanceof GenderEnum ){
+            this.gender = (GenderEnum) gender;
+        }else if (null != gender) {
+            this.gender = GenderEnum.valueOf(Integer.parseInt(gender.toString()));
+        }
     }
 
     public String getSubjectId() {

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/TeacherStyleSearch.java

@@ -1,6 +1,6 @@
 package com.yonge.cooleshow.biz.dal.dto.search;
 
-import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
+import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import com.yonge.toolset.base.page.QueryInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/VideoLessonGroupSearch.java

@@ -1,7 +1,7 @@
 package com.yonge.cooleshow.biz.dal.dto.search;
 
 import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
-import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
+import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import com.yonge.toolset.base.page.QueryInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

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

@@ -26,7 +26,7 @@ public class AppVersionInfo {
 	private String description;
 	
 	/** 下载地址 */
-	private byte[] downloadUrl;
+	private String downloadUrl;
 	
 	/** 创建人 */
 	private Integer operatorId;
@@ -93,11 +93,11 @@ public class AppVersionInfo {
 		return this.description;
 	}
 			
-	public void setDownloadUrl(byte[] downloadUrl){
+	public void setDownloadUrl(String downloadUrl){
 		this.downloadUrl = downloadUrl;
 	}
 	
-	public byte[] getDownloadUrl(){
+	public String getDownloadUrl(){
 		return this.downloadUrl;
 	}
 			

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

@@ -1,11 +1,10 @@
 package com.yonge.cooleshow.biz.dal.entity;
 
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
 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.YesOrNoEnum;
+import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 

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

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yonge.cooleshow.biz.dal.enums.HotSearchEnum;
-import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
+import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 

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

@@ -3,8 +3,8 @@ 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.YesOrNoEnum;
 import com.yonge.cooleshow.common.entity.BaseEntity;
+import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;

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

@@ -4,6 +4,7 @@ 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.*;
+import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 

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

@@ -1,7 +1,6 @@
 package com.yonge.cooleshow.biz.dal.entity;
 
 import com.yonge.cooleshow.biz.dal.enums.OrderStatusEnum;
-import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import com.yonge.cooleshow.common.entity.BaseEntity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -11,7 +10,6 @@ import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import java.math.BigDecimal;
-import java.util.Date;
 
 /**
  * 曲谱购买记录表

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

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
+import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.springframework.format.annotation.DateTimeFormat;

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

@@ -4,9 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
+import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -29,7 +27,6 @@ public class Teacher implements Serializable {
     */
     @ApiModelProperty("对应user表用户编号 ")
     @TableId(value = "user_id_")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long userId;
     /** 
     * 学历 

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

@@ -4,8 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+
 import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -28,14 +28,12 @@ public class TeacherAuthEntryRecord implements Serializable {
     */
     @ApiModelProperty("审核单id ")
     @TableId(value = "id_", type = IdType.AUTO)
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
     /** 
     * 对应user表用户编号 
     */
     @ApiModelProperty("对应user表用户编号 ")
 	@TableField(value = "user_id_")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long userId;
     /** 
     * 专业技能（支持多个，用逗号分隔），对应乐器表id 
@@ -88,7 +86,6 @@ public class TeacherAuthEntryRecord implements Serializable {
     */
     @ApiModelProperty("审核人 ")
 	@TableField(value = "verify_user_id_")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Long verifyUserId;
     /** 
     * 审核理由 

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

@@ -113,17 +113,4 @@ public class TeacherAuthMusicianRecord implements Serializable {
         this.updateTime = updateTime;
     }
 
-    @Override
-    public String toString() {
-        return "TeacherAuthMusicianRecord{" +
-				"id=" + id +
-						",userId='" + userId + "'" + 
-						",teacherAuthStatus='" + teacherAuthStatus + "'" + 
-						",verifyUserId='" + verifyUserId + "'" + 
-						",reason='" + reason + "'" + 
-						",createTime='" + createTime + "'" + 
-						",updateTime='" + updateTime + "'" + 
-		                '}';
-    }
-	
 }

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

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
-import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
+import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 

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

@@ -1,17 +1,16 @@
 package com.yonge.cooleshow.biz.dal.entity;
 
-import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import com.yonge.cooleshow.common.entity.BaseEntity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
-import java.util.Date;
 
 /**
  * 视频课学员评价

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

@@ -1,16 +1,15 @@
 package com.yonge.cooleshow.biz.dal.entity;
 
 import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
-import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import com.yonge.cooleshow.biz.dal.valid.AddGroup;
 import com.yonge.cooleshow.biz.dal.valid.UpdateGroup;
 import com.yonge.cooleshow.common.entity.BaseEntity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;

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

@@ -1,6 +1,7 @@
 package com.yonge.cooleshow.biz.dal.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
+import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import com.yonge.toolset.base.enums.BaseEnum;
 import com.yonge.toolset.base.util.StringUtil;
 

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

@@ -1,36 +0,0 @@
-package com.yonge.cooleshow.biz.dal.enums;
-
-import com.baomidou.mybatisplus.annotation.EnumValue;
-import com.yonge.toolset.base.enums.BaseEnum;
-
-public enum YesOrNoEnum implements BaseEnum<Integer, YesOrNoEnum> {
-    NO(0, "否"),
-    YES(1, "是");
-    @EnumValue
-    private Integer code;
-    private String msg;
-
-    YesOrNoEnum(Integer code, String msg) {
-        this.code = code;
-        this.msg = msg;
-    }
-
-    public String getMsg() {
-        return this.msg;
-    }
-
-    @Override
-    public Integer getCode() {
-        return this.code;
-    }
-
-    public static YesOrNoEnum valueOf(Integer code) {
-    	YesOrNoEnum[] values = YesOrNoEnum.values();
-        for (YesOrNoEnum value : values) {
-            if(value.getCode().equals(code)){
-                return value;
-            }
-        }
-        return null;
-    }
-}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/sdk/WithdrawSdk.java

@@ -270,15 +270,18 @@ public class WithdrawSdk {
         } catch (Exception e) {
             throw new ThirdpartyException("加密失败：{}", e.getMessage());
         }
-
         String resultJsonStr = null;
         try {
             resultJsonStr = HttpUtil.postForHttp(apiUrl + "/bpotop_trade/balance_query", JSONObject.toJSONString(requestMap), null);
-            logger.info("查询余额响应参数：{}", resultJsonStr);
-
-            String decryptStr = RSA.decryptPri(resultJsonStr, privateKey);
-            Map stringToMap =  JSONObject.parseObject(decryptStr);
-            return new BigDecimal(String.valueOf(stringToMap.get("balance"))).divide(new BigDecimal("100"));
+            JSONObject jsonObject = JSONObject.parseObject(resultJsonStr);
+            String code = jsonObject.getString("code");
+            if(code.equals("100")){
+                String resData = jsonObject.getJSONObject("details").getString("data");
+                String decryptStr = RSA.decryptPri(resData, privateKey);
+                logger.info("查询余额响应参数：{}", decryptStr);
+                JSONObject data = JSONObject.parseObject(decryptStr);
+                return new BigDecimal(data.getString("balance")).divide(new BigDecimal("100"));
+            }
         } catch (Exception e) {
             e.printStackTrace();
         }

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

@@ -3,7 +3,7 @@ package com.yonge.cooleshow.biz.dal.service;
 import java.util.List;
 
 import com.yonge.cooleshow.biz.dal.entity.AppVersionInfo;
-import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
+import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import com.yonge.toolset.mybatis.service.BaseService;
 
 public interface AppVersionInfoService extends BaseService<Long, AppVersionInfo> {

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

@@ -10,10 +10,10 @@ import com.yonge.cooleshow.biz.dal.dto.search.PracticeTeacherSearch;
 import com.yonge.cooleshow.biz.dal.entity.CourseCalendarEntity;
 import com.yonge.cooleshow.biz.dal.entity.CourseSchedule;
 import com.yonge.cooleshow.biz.dal.entity.TeacherSubjectPrice;
-import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import com.yonge.cooleshow.biz.dal.vo.*;
 import com.yonge.cooleshow.biz.dal.vo.res.OrderCreateRes;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import com.yonge.toolset.base.page.PageInfo;
 
 import java.util.Date;

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

@@ -6,10 +6,10 @@ import com.yonge.cooleshow.biz.dal.dto.search.MusicAlbumDetailSearch;
 import com.yonge.cooleshow.biz.dal.dto.search.MusicAlbumSearch;
 import com.yonge.cooleshow.biz.dal.dto.search.StudentMusicAlbumSearch;
 import com.yonge.cooleshow.biz.dal.entity.MusicAlbum;
-import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import com.yonge.cooleshow.biz.dal.vo.AlbumDetailVo;
 import com.yonge.cooleshow.biz.dal.vo.MusicAlbumVo;
 import com.yonge.cooleshow.biz.dal.vo.MusicSheetVo;
+import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 
 /**
  * MusicAlbumService服务类

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

@@ -1,10 +1,9 @@
 package com.yonge.cooleshow.biz.dal.service;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yonge.cooleshow.biz.dal.entity.StudentStar;
-import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 
 /**
  * 学生关注教师表 服务类

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

@@ -164,7 +164,6 @@ public interface UserOrderService extends IService<UserOrder> {
      * 订单完成
      * @param detail
      */
-    @Transactional(rollbackFor = Exception.class)
     void orderSuccess(UserOrderVo detail, PaymentCallBack data);
 
 }

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

@@ -4,7 +4,7 @@ import java.util.Date;
 import java.util.List;
 
 import com.yonge.cooleshow.biz.dal.enums.AppVersionStatusEnum;
-import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
+import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import com.yonge.toolset.mybatis.service.impl.BaseServiceImpl;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -18,16 +18,15 @@ import com.yonge.cooleshow.biz.dal.entity.ImGroup;
 import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
 import com.yonge.cooleshow.biz.dal.enums.CourseScheduleEnum;
 import com.yonge.cooleshow.biz.dal.enums.MessageTypeEnum;
-import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import com.yonge.cooleshow.biz.dal.service.*;
 import com.yonge.cooleshow.common.constant.SysConfigConstant;
+import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import com.yonge.toolset.mybatis.support.PageUtil;
 import com.yonge.cooleshow.biz.dal.vo.CourseHomeworkDetailVo;
 import com.yonge.cooleshow.biz.dal.vo.CourseHomeworkVo;
 import com.yonge.cooleshow.biz.dal.vo.CourseScheduleHomeworkVo;
 import com.yonge.cooleshow.biz.dal.vo.StudentHomeworkVo;
 import com.yonge.toolset.base.exception.BizException;
-import com.yonge.toolset.base.string.MessageFormatter;
 import com.yonge.toolset.thirdparty.message.MessageSenderPluginContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

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

@@ -22,6 +22,7 @@ import com.yonge.cooleshow.biz.dal.dto.search.PracticeTeacherSearch;
 import com.yonge.cooleshow.biz.dal.entity.*;
 import com.yonge.cooleshow.biz.dal.enums.*;
 import com.yonge.cooleshow.biz.dal.service.*;
+import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import com.yonge.toolset.payment.util.DistributedLock;
 import com.yonge.toolset.mybatis.support.PageUtil;
 import com.yonge.cooleshow.biz.dal.support.WrapperUtil;

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

@@ -5,9 +5,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yonge.cooleshow.biz.dal.dao.HotSearchDao;
 import com.yonge.cooleshow.biz.dal.dto.search.HotSearchSearch;
 import com.yonge.cooleshow.biz.dal.entity.HotSearch;
-import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import com.yonge.cooleshow.biz.dal.service.HotSearchService;
 import com.yonge.cooleshow.biz.dal.vo.HotSearchVo;
+import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import com.yonge.toolset.base.exception.BizException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

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

@@ -107,6 +107,7 @@ public class LiveRoomServiceImpl extends ServiceImpl<LiveRoomDao, LiveRoom> impl
         Integer liveState = WrapperUtil.toInt(param, "liveState");
         Long userId = this.getSysUser().getId();
         Page<LiveRoom> pageInfo = PageUtil.getPageInfo(param);
+        pageInfo.setDesc("id_");
         IPage<LiveRoom> page = this.page(pageInfo, Wrappers.<LiveRoom>lambdaQuery()
                 .eq(WrapperUtil.StrPredicate.test(roomType), LiveRoom::getType, roomType)
                 .eq(WrapperUtil.ObjPredicate.test(liveState), LiveRoom::getLiveState, liveState)
@@ -301,8 +302,6 @@ public class LiveRoomServiceImpl extends ServiceImpl<LiveRoomDao, LiveRoom> impl
         log.info("createTempLiveRoom>>>>>>room:{}", room.getRoomUid());
         //去融云创建房间及创建房间缓存信息
         this.createLiveRoomInfo(room, sysUser);
-        //临时
-        this.pushLiveCreateRoom(room);
         //写入临时直播间列表
         RMap<Long, String> map = redissonClient.getMap(TEACHER_TEMP_LIVE_ROOM);
         map.put(teacherId, roomUid);

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

@@ -9,8 +9,8 @@ import com.yonge.cooleshow.biz.dal.dto.search.MusicAlbumSearch;
 import com.yonge.cooleshow.biz.dal.dto.search.StudentMusicAlbumSearch;
 import com.yonge.cooleshow.biz.dal.entity.AlbumFavorite;
 import com.yonge.cooleshow.biz.dal.entity.MusicAlbum;
-import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import com.yonge.cooleshow.biz.dal.service.*;
+import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import com.yonge.toolset.mybatis.support.PageUtil;
 import com.yonge.cooleshow.biz.dal.vo.AlbumDetailVo;
 import com.yonge.cooleshow.biz.dal.vo.MusicAlbumVo;

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

@@ -17,6 +17,7 @@ import com.yonge.cooleshow.biz.dal.dto.search.*;
 import com.yonge.cooleshow.biz.dal.entity.*;
 import com.yonge.cooleshow.biz.dal.enums.*;
 import com.yonge.cooleshow.biz.dal.service.*;
+import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import com.yonge.toolset.mybatis.support.PageUtil;
 import com.yonge.cooleshow.biz.dal.vo.*;
 import com.yonge.cooleshow.biz.dal.vo.res.OrderCreateRes;

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

@@ -9,10 +9,10 @@ import com.yonge.cooleshow.biz.dal.dao.MusicTagDao;
 import com.yonge.cooleshow.biz.dal.dto.MusicTagSaveDto;
 import com.yonge.cooleshow.biz.dal.dto.search.MusicTagSearch;
 import com.yonge.cooleshow.biz.dal.entity.MusicTag;
-import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import com.yonge.cooleshow.biz.dal.service.MusicSheetService;
 import com.yonge.cooleshow.biz.dal.service.MusicTagService;
 import com.yonge.cooleshow.biz.dal.vo.MusicTagVo;
+import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import com.yonge.toolset.base.exception.BizException;
 import jodd.util.StringUtil;
 import org.springframework.beans.BeanUtils;

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

@@ -18,8 +18,8 @@ import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.common.enums.UserLockFlag;
 import com.yonge.toolset.utils.date.DateUtil;
 import com.yonge.toolset.utils.string.ValueUtil;
-import org.apache.commons.beanutils.BeanUtils;
 import org.redisson.api.RedissonClient;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.yonge.cooleshow.biz.dal.entity.Student;
@@ -64,11 +64,8 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, Student> impleme
     public StudentHomeVo queryUserInfo(SysUser user) {
         StudentVo detail = detail(user.getId());
         StudentHomeVo studentHomeVo = new StudentHomeVo();
-        try {
-            BeanUtils.copyProperties(studentHomeVo, detail);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
+        BeanUtils.copyProperties(detail, studentHomeVo);
+
         //身份证号、手机号脱敏
         studentHomeVo.setIdCardNo(ValueUtil.fuzzyIdCard(studentHomeVo.getIdCardNo()));
         studentHomeVo.setPhone(ValueUtil.fuzzyMobile(studentHomeVo.getPhone()));

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

@@ -6,9 +6,8 @@ import com.yonge.cooleshow.biz.dal.entity.StudentTotal;
 import com.yonge.cooleshow.biz.dal.entity.TeacherTotal;
 import com.yonge.cooleshow.biz.dal.service.StudentTotalService;
 import com.yonge.cooleshow.biz.dal.service.TeacherTotalService;
-import com.yonge.cooleshow.common.enums.CacheNameEnum;
-import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import org.redisson.api.RedissonClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

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

@@ -12,18 +12,18 @@ import com.yonge.cooleshow.biz.dal.entity.Teacher;
 import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
 import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
 import com.yonge.cooleshow.biz.dal.enums.MessageTypeEnum;
-import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import com.yonge.cooleshow.biz.dal.service.SysMessageService;
 import com.yonge.cooleshow.biz.dal.vo.TeacherAuthEntryRecordVo;
 import com.yonge.cooleshow.biz.dal.vo.TeacherVo;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import com.yonge.toolset.base.string.StringPool;
 import com.yonge.toolset.base.util.StringUtil;
 import com.yonge.toolset.thirdparty.message.MessageSenderPluginContext;
 import com.yonge.toolset.utils.string.ValueUtil;
-import org.apache.commons.beanutils.BeanUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.yonge.cooleshow.biz.dal.entity.TeacherAuthEntryRecord;
@@ -93,7 +93,7 @@ public class TeacherAuthEntryRecordServiceImpl extends ServiceImpl<TeacherAuthEn
             teacher.setUpdateTime(new Date());
 
             Teacher newTeacher = new Teacher();
-            BeanUtils.copyProperties(newTeacher, teacher);
+            BeanUtils.copyProperties(teacher, newTeacher);
             teacherDao.updateById(newTeacher);
 
             // 发送审核通知
@@ -154,7 +154,7 @@ public class TeacherAuthEntryRecordServiceImpl extends ServiceImpl<TeacherAuthEn
         }
         //新增申请记录
         TeacherAuthEntryRecord teacherAuthEntryRecord = new TeacherAuthEntryRecord();
-        BeanUtils.copyProperties(teacherAuthEntryRecord, teacherApplyDetailDto);
+        BeanUtils.copyProperties(teacherApplyDetailDto, teacherAuthEntryRecord);
         teacherAuthEntryRecord.setTeacherAuthStatus(AuthStatusEnum.DOING);
 
         return HttpResponseResult.status(baseMapper.insert(teacherAuthEntryRecord) > 0);

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

@@ -11,17 +11,17 @@ import com.yonge.cooleshow.biz.dal.entity.Teacher;
 import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
 import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
 import com.yonge.cooleshow.biz.dal.enums.MessageTypeEnum;
-import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import com.yonge.cooleshow.biz.dal.service.SysMessageService;
 import com.yonge.cooleshow.biz.dal.vo.MusicianAuthEntryRecordVo;
 import com.yonge.cooleshow.biz.dal.vo.TeacherVo;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import com.yonge.toolset.base.string.StringPool;
 import com.yonge.toolset.base.util.StringUtil;
 import com.yonge.toolset.thirdparty.message.MessageSenderPluginContext;
-import org.apache.commons.beanutils.BeanUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.yonge.cooleshow.biz.dal.entity.TeacherAuthMusicianRecord;
@@ -113,7 +113,7 @@ public class TeacherAuthMusicianRecordServiceImpl extends ServiceImpl<TeacherAut
             teacher.setUpdateTime(new Date());
 
             Teacher newTeacher = new Teacher();
-            BeanUtils.copyProperties(newTeacher, teacher);
+            BeanUtils.copyProperties(teacher, newTeacher);
             teacherDao.updateById(newTeacher);
 
             // 发送审核通知

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

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.dto.RealnameAuthReq;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
-import com.yonge.cooleshow.common.enums.SysUserType;
 import com.yonge.cooleshow.biz.dal.enums.*;
 import com.yonge.cooleshow.biz.dal.vo.MyFens;
 import com.yonge.cooleshow.common.constant.SysConfigConstant;
@@ -21,13 +20,14 @@ import com.yonge.cooleshow.biz.dal.vo.TeacherHomeVo;
 import com.yonge.cooleshow.biz.dal.vo.TeacherVo;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.common.enums.CacheNameEnum;
+import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import com.yonge.toolset.base.exception.BizException;
 import com.yonge.toolset.base.util.StringUtil;
 import com.yonge.toolset.utils.idcard.IdcardInfoExtractor;
 import com.yonge.toolset.utils.string.ValueUtil;
-import org.apache.commons.beanutils.BeanUtils;
 import org.redisson.api.RMap;
 import org.redisson.api.RedissonClient;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
@@ -107,11 +107,8 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
             return HttpResponseResult.failed("未查询到老师信息");
         }
         TeacherHomeVo teacherHomeVo = new TeacherHomeVo();
-        try {
-            BeanUtils.copyProperties(teacherHomeVo, teacher);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
+        BeanUtils.copyProperties(teacher,teacherHomeVo);
+   
         //身份证号、手机号脱敏
         teacherHomeVo.setIdCardNo(ValueUtil.fuzzyIdCard(teacherHomeVo.getIdCardNo()));
         teacherHomeVo.setPhone(ValueUtil.fuzzyMobile(teacherHomeVo.getPhone()));
@@ -221,7 +218,6 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
     private SysUser insertSysUser(TeacherSubmitReq teacherSubmitReq) {
         SysUser sysUser = new SysUser();
         sysUser = getUserDetil(sysUser, teacherSubmitReq);
-        sysUser.setUserType(SysUserType.TEACHER.getCode());
         //初始密码，手机号后6位
         String password = sysUser.getPhone().substring(sysUser.getPhone().length() - 6);
         sysUser.setPassword(new BCryptPasswordEncoder().encode(password));
@@ -309,7 +305,11 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
             sysUser.setRealName(teacherSubmitReq.getRealName());
             sysUser.setIdCardNo(teacherSubmitReq.getIdCardNo());
         }
-
+        if (StringUtil.isEmpty(sysUser.getUserType())) {
+            sysUser.setUserType("TEACHER");
+        } else if (!sysUser.getUserType().contains("TEACHER")) {
+            sysUser.setUserType(sysUser.getUserType() + ",TEACHER");
+        }
         sysUser.setUsername(teacherSubmitReq.getUsername());
         sysUser.setPhone(teacherSubmitReq.getPhone());
         return sysUser;

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

@@ -33,6 +33,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.yonge.cooleshow.biz.dal.entity.UserOrderPayment;
 import com.yonge.cooleshow.biz.dal.dao.UserOrderPaymentDao;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
@@ -197,6 +198,7 @@ public class UserOrderPaymentServiceImpl extends ServiceImpl<UserOrderPaymentDao
 
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void executePaymentCallBack(PaymentCallBack data) {
         UserOrderVo userOrderVo = userOrderService.getUserOrderByPaymentNoOrTransNo(data.getPaymentNo(), data.getId());
         if (OrderStatusEnum.WAIT_PAY.equals(userOrderVo.getStatus()) || OrderStatusEnum.PAYING.equals(userOrderVo.getStatus())) {
@@ -212,6 +214,7 @@ public class UserOrderPaymentServiceImpl extends ServiceImpl<UserOrderPaymentDao
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void closePaymentCallBack(PaymentCallBack data) {
         UserOrderVo userOrderVo = userOrderService.getUserOrderByPaymentNoOrTransNo(data.getPaymentNo(), data.getId());
         if (OrderStatusEnum.WAIT_PAY.equals(userOrderVo.getStatus()) || OrderStatusEnum.PAYING.equals(userOrderVo.getStatus())) {

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

@@ -30,10 +30,10 @@ import com.yonge.toolset.payment.base.model.Payment;
 import com.yonge.toolset.payment.base.model.callback.PaymentCallBack;
 import com.yonge.toolset.payment.core.props.PaymentProperties;
 import com.yonge.toolset.payment.core.service.PaymentClient;
-import org.apache.commons.beanutils.BeanUtils;
 import org.redisson.api.RedissonClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.yonge.cooleshow.biz.dal.dto.search.OrderSearch;
@@ -594,11 +594,8 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
             throw new BizException("创建订单失败");
         }
         UserOrderVo vo = new UserOrderVo();
-        try {
-            BeanUtils.copyProperties(vo, userOrder);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
+
+        BeanUtils.copyProperties(userOrder, vo);
         vo.setOrderDetailList(orderDetailList);
         return vo;
     }
@@ -751,6 +748,7 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
         }
         //调用业务
         List<UserOrderDetailVo> orderDetailList = orderDetailService.getOrderDetilListByOrderNo(detail.getOrderNo());
+
         for (UserOrderDetailVo orderDetailVo : orderDetailList) {
             orderDetailVo.setUserId(detail.getUserId());
             orderDetailVo.setOrderId(detail.getId());

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

@@ -11,6 +11,7 @@ import com.yonge.cooleshow.biz.dal.entity.UserWithdrawalCallback;
 import com.yonge.cooleshow.biz.dal.enums.*;
 import com.yonge.cooleshow.biz.dal.sdk.WithdrawSdk;
 import com.yonge.cooleshow.biz.dal.service.*;
+import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import com.yonge.toolset.payment.util.DistributedLock;
 import com.yonge.cooleshow.common.constant.SysConfigConstant;
 import com.yonge.cooleshow.biz.dal.dao.UserBankCardDao;

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

@@ -4,13 +4,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dao.VideoLessonPurchaseRecordDao;
 import com.yonge.cooleshow.biz.dal.dto.search.VideoLessonEvaluateSearch;
-import com.yonge.cooleshow.biz.dal.dto.search.VideoLessonSearch;
 import com.yonge.cooleshow.biz.dal.entity.VideoLessonEvaluate;
 import com.yonge.cooleshow.biz.dal.dao.VideoLessonEvaluateDao;
-import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import com.yonge.cooleshow.biz.dal.service.VideoLessonEvaluateService;
 import com.yonge.cooleshow.biz.dal.vo.VideoLessonEvaluateVo;
-import com.yonge.cooleshow.biz.dal.vo.VideoLessonPurchaseStudent;
+import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
@@ -18,7 +16,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Arrays;
 import java.util.List;
 
 /**

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

@@ -13,10 +13,10 @@ import com.yonge.cooleshow.biz.dal.entity.*;
 import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
 import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
 import com.yonge.cooleshow.biz.dal.enums.MessageTypeEnum;
-import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import com.yonge.cooleshow.biz.dal.service.SysMessageService;
 import com.yonge.cooleshow.biz.dal.service.VideoLessonGroupService;
 import com.yonge.cooleshow.biz.dal.vo.*;
+import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import com.yonge.toolset.base.exception.BizException;
 import com.yonge.toolset.thirdparty.message.MessageSenderPluginContext;
 import org.apache.commons.collections.CollectionUtils;

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/AlbumDetailVo.java

@@ -1,6 +1,6 @@
 package com.yonge.cooleshow.biz.dal.vo;
 
-import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
+import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import com.yonge.toolset.base.page.PageInfo;
 import io.swagger.annotations.ApiModelProperty;
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/CheckVo.java

@@ -1,6 +1,6 @@
 package com.yonge.cooleshow.biz.dal.vo;
 
-import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
+import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/CourseHomeworkDetailVo.java

@@ -2,7 +2,7 @@ package com.yonge.cooleshow.biz.dal.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yonge.cooleshow.biz.dal.enums.CourseScheduleEnum;
-import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
+import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.springframework.format.annotation.DateTimeFormat;

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/CourseHomeworkVo.java

@@ -3,7 +3,7 @@ package com.yonge.cooleshow.biz.dal.vo;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yonge.cooleshow.biz.dal.enums.CourseScheduleEnum;
 import com.yonge.cooleshow.biz.dal.enums.HomeworkStatusEnum;
-import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
+import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.springframework.format.annotation.DateTimeFormat;

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/CourseScheduleHomeworkVo.java

@@ -3,7 +3,7 @@ package com.yonge.cooleshow.biz.dal.vo;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yonge.cooleshow.biz.dal.enums.CourseScheduleEnum;
-import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
+import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.springframework.format.annotation.DateTimeFormat;

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/EmployeeVo.java

@@ -6,7 +6,7 @@ import com.yonge.cooleshow.biz.dal.enums.GenderEnum;
 import com.yonge.cooleshow.common.enums.UserLockFlag;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.beanutils.BeanUtils;
+import org.springframework.beans.BeanUtils;
 
 import java.util.List;
 
@@ -31,6 +31,7 @@ public class EmployeeVo extends Employee {
     private List<Long> roleIds;
     @ApiModelProperty(value = "用户对象")
     private SysUser sysUser;
+
     public String getUsername() {
         return username;
     }
@@ -43,17 +44,15 @@ public class EmployeeVo extends Employee {
         return gender;
     }
 
-    public void setGender(GenderEnum gender){
-        this.gender = gender;
-    }
-
     public void setGender(Object gender) {
-        try {
-            GenderEnum genderEnum = GenderEnum.valueOf(Integer.parseInt(gender.toString()));
-            this.gender = genderEnum;
-        }catch (Exception e){}
+        if (gender instanceof GenderEnum) {
+            this.gender = (GenderEnum) gender;
+        } else if (null != gender) {
+            this.gender = GenderEnum.valueOf(Integer.parseInt(gender.toString()));
+        }
     }
 
+
     public String getPhone() {
         return phone;
     }
@@ -95,14 +94,10 @@ public class EmployeeVo extends Employee {
     }
 
     public EmployeeVo buildVo(Employee employee) {
-        if(null == employee){
+        if (null == employee) {
             return new EmployeeVo();
         }
-        try {
-            BeanUtils.copyProperties(this, employee);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
+        BeanUtils.copyProperties(employee, this);
         return this;
     }
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/LiveCourseGroupStudentCourseVo.java

@@ -1,10 +1,8 @@
 package com.yonge.cooleshow.biz.dal.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.yonge.cooleshow.biz.dal.enums.CourseScheduleEnum;
 import com.yonge.cooleshow.biz.dal.enums.StudentCourseEnum;
-import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.springframework.format.annotation.DateTimeFormat;

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/MemberPriceSettingsVo.java

@@ -3,7 +3,6 @@ package com.yonge.cooleshow.biz.dal.vo;
 import com.yonge.cooleshow.biz.dal.entity.MemberPriceSettings;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.beanutils.BeanUtils;
 
 /**
  * @Author: liweifan
@@ -23,13 +22,4 @@ public class MemberPriceSettingsVo extends MemberPriceSettings{
         this.modifierName = modifierName;
     }
 
-    public MemberPriceSettingsVo buildVo(MemberPriceSettings memberPriceSettings){
-        try {
-            BeanUtils.copyProperties(this,memberPriceSettings);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return this;
-    }
-
 }