性别set方法改回普通set方法

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-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-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-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

@@ -51,16 +51,11 @@ public class EmployeeDto extends Employee{
         return gender;
     }
 
-    public void setGender(GenderEnum 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){}
-    }
+    
 
     public String getPhone() {
         return phone;

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

@@ -68,16 +68,11 @@ public class TeacherApplyDetailReq implements Serializable {
         return gender;
     }
 
-    public void setGender(GenderEnum 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){}
-    }
+    
 
     public Date getBirthdate() {
         return birthdate;

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

@@ -45,16 +45,11 @@ public class EmployeeSearch extends QueryInfo{
         return gender;
     }
 
-    public void setGender(GenderEnum 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){}
-    }
+    
 
     public String getSubjectIdList() {
         return subjectIdList;

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

@@ -45,17 +45,10 @@ public class StudentSearch extends QueryInfo{
         return gender;
     }
 
-    public void setGender(GenderEnum 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){}
-    }
-
     public String getSubjectId() {
         return subjectId;
     }

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/enums/GenderEnum.java

@@ -11,7 +11,7 @@ import com.yonge.toolset.base.enums.BaseEnum;
 public enum GenderEnum implements BaseEnum<Integer, GenderEnum> {
     GIRL(0, "女"),
     BOY(1, "男");
-    @EnumValue
+    //@EnumValue
     private Integer code;
     private String msg;
 

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

@@ -43,16 +43,11 @@ public class EmployeeVo extends Employee {
         return gender;
     }
 
-    public void setGender(GenderEnum 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){}
-    }
+    
 
     public String getPhone() {
         return phone;

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

@@ -11,6 +11,7 @@ import io.swagger.annotations.ApiModelProperty;
  */
 @ApiModel(value = "MusicianAuthEntryRecordVo对象", description = "音乐人审核详情")
 public class MusicianAuthEntryRecordVo extends TeacherAuthMusicianRecord {
+    private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "真实姓名")
     private String realName;
@@ -98,21 +99,15 @@ public class MusicianAuthEntryRecordVo extends TeacherAuthMusicianRecord {
         this.verifyUser = verifyUser;
     }
 
-
     public GenderEnum getGender() {
         return gender;
     }
 
-    public void setGender(GenderEnum 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){}
-    }
+    
 
     public String getSubjectName() {
         return subjectName;

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

@@ -67,14 +67,9 @@ public class MyFens extends BaseEntity {
         return gender;
     }
 
-    public void setGender(GenderEnum 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){}
-    }
+    
 }

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

@@ -90,16 +90,11 @@ public class MyFollow extends BaseEntity {
         return gender;
     }
 
-    public void setGender(GenderEnum 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){}
-    }
+    
 
     public Double getStarGrade() {
         return starGrade;

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

@@ -148,16 +148,11 @@ public class StudentHomeVo extends Student {
         return gender;
     }
 
-    public void setGender(GenderEnum 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){}
-    }
+    
 
     public String getPhone() {
         return phone;

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

@@ -65,16 +65,11 @@ public class StudentVo extends Student {
         return gender;
     }
 
-    public void setGender(GenderEnum 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){}
-    }
+    
 
     public String getPhone() {
         return phone;

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

@@ -51,16 +51,11 @@ public class TeacherAuthEntryRecordVo extends TeacherAuthEntryRecord {
         return gender;
     }
 
-    public void setGender(GenderEnum 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){}
-    }
+    
 
     public String getPhone() {
         return phone;

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

@@ -175,16 +175,11 @@ public class TeacherHomeVo extends Teacher implements Serializable {
         return gender;
     }
 
-    public void setGender(GenderEnum 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){}
-    }
+    
 
     public String getPhone() {
         return phone;

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

@@ -147,16 +147,11 @@ public class TeacherVo extends Teacher {
         return gender;
     }
 
-    public void setGender(GenderEnum 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){}
-    }
+    
 
     public UserLockFlag getLockFlag() {
         return lockFlag;

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

@@ -15,11 +15,15 @@ import java.math.BigDecimal;
 public class VipCardRecordVo extends VipCardRecord{
 	private static final long serialVersionUID = 1L;
 
+	@ApiModelProperty(hidden = true)
 	private String phone;
+
 	@ApiModelProperty("原价 ")
 	private BigDecimal originalPrice;
+
 	@ApiModelProperty("销售价 ")
 	private BigDecimal salePrice;
+
 	@ApiModelProperty("周期 ")
 	private PeriodEnum period;
 

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

@@ -41,13 +41,44 @@
                 t.biz_name_,
                 max(t.create_time_) as create_time_
             from user_cash_account_record t
-            where exists(
+            where t.biz_type_ = 'LIVE' and exists(
                 select 1 from user_cash_account_record t1
-                where t1.id_ = #{id} and t1.biz_id_ = t.biz_id_ and t1.biz_type_ = t.biz_type_
+                where t1.biz_id_ = t.biz_id_ and t1.biz_type_ = 'LIVE' and  t1.id_ = #{id}
             )
             group by t.account_id_,t.in_or_out_,t.biz_type_,biz_id_,biz_name_
+            union all
+            select
+                t.id_,
+                t.account_id_,
+                t.trans_amount_,
+                t.account_balance_,
+                t.in_or_out_,
+                t.biz_type_,
+                t.biz_id_,
+                t.biz_name_,
+                t.create_time_
+            from user_cash_account_record t
+            where t.biz_type_ != 'LIVE' and t.id_ = #{id}
         ) t
     </select>
+    
+    <sql id="selectCondition">
+        <if test="null != param.userId">
+            AND t.account_id_ = #{param.userId}
+        </if>
+        <if test="null != param.inOrOut">
+            AND t.in_or_out_ = #{param.inOrOut}
+        </if>
+        <if test="null != param.bizType">
+            AND t.biz_type_ = #{param.bizType}
+        </if>
+        <if test="param.startTime !=null">
+            <![CDATA[AND t.create_time_ >= #{param.startTime} ]]>
+        </if>
+        <if test="param.endTime !=null">
+            <![CDATA[AND t.create_time_ < #{param.endTime} ]]>
+        </if>
+    </sql>
 
     <select id="selectPage" resultType="com.yonge.cooleshow.biz.dal.vo.UserAccountRecordVo">
         SELECT
@@ -67,24 +98,23 @@
                 t.biz_name_,
                 max(t.create_time_) as create_time_
             from user_cash_account_record t
-            <where>
-                <if test="null != param.userId">
-                    AND t.account_id_ = #{param.userId}
-                </if>
-                <if test="null != param.inOrOut">
-                    AND t.in_or_out_ = #{param.inOrOut}
-                </if>
-                <if test="null != param.bizType">
-                    AND t.biz_type_ = #{param.bizType}
-                </if>
-                <if test="param.startTime !=null">
-                    <![CDATA[AND t.create_time_ >= #{param.startTime} ]]>
-                </if>
-                <if test="param.endTime !=null">
-                    <![CDATA[AND t.create_time_ < #{param.endTime} ]]>
-                </if>
-            </where>
+            where t.biz_type_ = 'LIVE'
+            <include refid="selectCondition"/>
             group by t.account_id_,t.in_or_out_,t.biz_type_,biz_id_,biz_name_
+            union all
+            select
+                t.id_,
+                t.account_id_,
+                t.trans_amount_,
+                t.account_balance_,
+                t.in_or_out_,
+                t.biz_type_,
+                t.biz_id_,
+                t.biz_name_,
+                t.create_time_
+            from user_cash_account_record t
+            where t.biz_type_ != 'LIVE'
+            <include refid="selectCondition"/>
         ) t
         left join course_schedule a on t.biz_id_ = a.id_ and t.biz_type_ in ('PRACTICE','LIVE')
         order by t.create_time_ desc

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

@@ -136,8 +136,8 @@
                 AND t.trade_status_ = 'succeeded'
             </if>
             <if test="param.status != null and param.status == 'UNPASS'">
-                AND !(t.auth_status_ = 'DOING' OR t.trade_status_ = 'pending')
-                AND t.trade_status_ != 'succeeded'
+                AND t.auth_status_ != 'DOING'
+                AND t.trade_status_ is null or t.trade_status_ not in('pending','succeeded')
             </if>
         </where>
         order by t.create_time_ desc