问题修改

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/dal/dao/SysUserDao.java

@@ -153,6 +153,12 @@ public interface SysUserDao extends BaseDAO<Long, SysUser> {
 
     List<SysUser> queryEmployeeList(SysUserQueryInfo queryInfo);
 
+    /**
+     * 用户注销
+     * @param userId
+     */
+    void logoffById(@Param("userId")Long userId);
+
     void updateImGroupMember(@Param("userId") Long userId,
                              @Param("username") String username,
                              @Param("avatar") String avatar);

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/SysUserService.java

@@ -193,4 +193,10 @@ public interface SysUserService extends BaseService<Long, SysUser> {
      * @return
      */
     boolean verifyQrCode(String phone, String qrCode);
+
+    /**
+     * 用户注销
+     * @param id
+     */
+    void logoffById(Long id);
 }

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/impl/SysUserServiceImpl.java

@@ -266,4 +266,11 @@ public class SysUserServiceImpl extends BaseServiceImpl<Long, SysUser> implement
         return false;
     }
 
+    @Override
+    public void logoffById(Long id) {
+        //移动用户到注销表
+        sysUserDao.logoffById(id);
+        sysUserDao.delete(id);
+    }
+
 }

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

@@ -17,6 +17,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -389,6 +390,26 @@ public class UserController extends BaseController {
         return failed();
     }
 
+    @ApiOperation(value = "用户注销")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "smsCode", value = "短信验证码", paramType = "path", dataType = "long", required = true),
+    })
+    @PostMapping(value = "/logoff/{smsCode}")
+    public HttpResponseResult<Boolean> logoff(@PathVariable("smsCode") String smsCode) {
+        AuthUser authUser = SecurityUtils.getUser();
+        SysUser sysUser = sysUserService.get(authUser.getUserId());
+        if (sysUser == null) {
+            return failed("用户不存在");
+        }
+        // 验证码验证
+        boolean b = smsCodeService.verifyValidCode(sysUser.getPhone(), smsCode, "SMS_VERIFY_CODE_LOGOFF");
+        if (!b) {
+            throw new BadCredentialsException("验证码校验失败");
+        }
+        sysUserService.logoffById(sysUser.getId());
+        return succeed(true);
+    }
+
     @ApiOperation(value = "刷新token")
     @PostMapping(value = "/refreshImToken")
     public Object refreshImToken() {

cooleshow-auth/auth-server/src/main/resources/config/mybatis/SysUserMapper.xml

@@ -269,6 +269,10 @@
         UPDATE im_user_friend SET friend_avatar_ = #{avatar},friend_nickname_ = #{username} WHERE friend_id_ = #{userId}
     </update>
 
+    <update id="logoffById">
+        insert into sys_user_off select * from sys_user where id_ = ${userId}
+    </update>
+
     <select id="queryEmployeeList" resultMap="SysUser">
         select  su.*
         from employee e

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

@@ -19,7 +19,7 @@ public class EnumConverter<T extends BaseEnum<?, ?>> implements Converter<String
 	private T getEnum(Class<T> targerType, String source) {
 		for (T en : targerType.getEnumConstants()) {
 			if (en.getCode() instanceof Integer) {
-				if ((Integer) en.getCode() == Integer.parseInt(source)) {
+				if (en.getCode().equals(Integer.parseInt(source))) {
 					return en;
 				}
 			} else {

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

@@ -62,4 +62,15 @@ public class UserOrderRefundController extends BaseController {
 		}
 		return userOrderRefundService.doAuth(authOperaReq, user);
 	}
+
+	@PostMapping("/orderRefund")
+	@ApiOperation(value = "直接退款", notes = "传入authOperaReq")
+	@PreAuthorize("@pcs.hasPermissions('userOrderRefunds/orderRefund')")
+	public HttpResponseResult<UserOrderRefundBill> orderRefund(String orderNo, String reason) throws Exception {
+		SysUser user = sysUserFeignService.queryUserInfo();
+		if (user == null || null == user.getId()) {
+			return failed(HttpStatus.FORBIDDEN, "请登录");
+		}
+		return userOrderRefundService.orderRefund(orderNo, reason);
+	}
 }

cooleshow-user/user-biz/pom.xml

@@ -75,9 +75,8 @@
         </dependency>
 
         <dependency>
-            <groupId>com.yonge.toolset</groupId>
-            <artifactId>toolset-emoji</artifactId>
-            <version>${project.toolset.version}</version>
+            <groupId>com.vdurmont</groupId>
+            <artifactId>emoji-java</artifactId>
         </dependency>
 
         <dependency>

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

@@ -50,5 +50,13 @@ public interface UserBankCardDao extends BaseMapper<UserBankCard>{
 	 * @updateTime 2022/4/14 16:36
 	 * @return: java.lang.Integer
 	 */
+	Integer deleteById(@Param("id") Long id);
+	/***
+	 * 删除用户所有银行卡
+	 * @author liweifan
+	 * @param: userId
+	 * @updateTime 2022/4/14 16:36
+	 * @return: java.lang.Integer
+	 */
     Integer deleteByUserId(@Param("userId") Long userId);
 }

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

@@ -51,8 +51,11 @@ 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){}
     }
 
     public String getPhone() {

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

@@ -68,8 +68,11 @@ 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){}
     }
 
     public Date getBirthdate() {

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

@@ -45,8 +45,11 @@ 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){}
     }
 
     public String getSubjectIdList() {

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

@@ -45,8 +45,11 @@ 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){}
     }
 
     public String getSubjectId() {
@@ -65,6 +68,8 @@ public class StudentSearch extends QueryInfo{
         this.isVip = isVip;
     }
 
+
+
     public Date getStartTime() {
         return startTime;
     }

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

@@ -128,6 +128,9 @@ public class Teacher implements Serializable {
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date liveDate;
+    @ApiModelProperty("对应user表用户编号 ")
+    @TableField(value = "browse_")
+    private Integer browse;
     @ApiModelProperty("备注 ")
 	@TableField(value = "memo_")
     private String memo;
@@ -299,4 +302,12 @@ public class Teacher implements Serializable {
     public void setLiveDate(Date liveDate) {
         this.liveDate = liveDate;
     }
+
+    public Integer getBrowse() {
+        return browse;
+    }
+
+    public void setBrowse(Integer browse) {
+        this.browse = browse;
+    }
 }

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

@@ -58,6 +58,7 @@ public class UserBankCard implements Serializable {
     @ApiModelProperty("逻辑删除 ")
     @TableField(value = "del_flag_")
     private Boolean delFlag;
+
 	public Long getId() {
         return id;
     }

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

@@ -5,6 +5,7 @@ import com.yonge.toolset.base.enums.BaseEnum;
 
 public enum MessageTypeEnum implements BaseEnum<String, MessageTypeEnum> {
     SMS_VERIFY_CODE_LOGIN("验证码登录"),
+    SMS_VERIFY_CODE_LOGOFF("用户注销"),
     SMS_VERIFY_CODE_REGISTER("验证码注册"),
     SMS_VERIFY_CODE_UPDATE_PSW("密码修改"),
     SMS_VERIFY_CODE_UPDATE_PHONE("修改手机号"),

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

@@ -54,6 +54,7 @@ public class SmsCodeServiceImpl implements SmsCodeService {
 
 	@Override
 	public boolean sendValidCode(String mobile, String type, ClientEnum platform) {
+		//SMS_VERIFY_CODE_LOGOFF
 		SysUser sysUser = sysUserFeignService.queryUserByMobile(mobile);
 		// 修改手机号 有用户了不许修改
 		if ("PHONE".equals(type) && sysUser != null) {
@@ -80,17 +81,16 @@ public class SmsCodeServiceImpl implements SmsCodeService {
 		}
 		if ("PASSWD".equals(type)) {
 			sysMessageService.sendSecurityCode(MessageSenderPluginContext.MessageSender.AWSMS, userId, MessageTypeEnum.SMS_VERIFY_CODE_UPDATE_PSW, mobile,platform.getMsg());
-
 		} else if ("LOGIN".equals(type)) {
 			sysMessageService.sendSecurityCode(MessageSenderPluginContext.MessageSender.AWSMS, userId, MessageTypeEnum.SMS_VERIFY_CODE_LOGIN, mobile,platform.getMsg());
-
 		} else if ("REGISTER".equals(type)) {
 			sysMessageService.sendSecurityCode(MessageSenderPluginContext.MessageSender.AWSMS, userId, MessageTypeEnum.SMS_VERIFY_CODE_REGISTER, mobile,platform.getMsg());
-
 		} else if ("BANK".equals(type)){
 			sysMessageService.sendSecurityCode(MessageSenderPluginContext.MessageSender.AWSMS, userId, MessageTypeEnum.SMS_VERIFY_CODE_BANK_CARD, mobile,platform.getMsg());
 		} else if ("PHONE".equals(type)) {
 			sysMessageService.sendSecurityCode(MessageSenderPluginContext.MessageSender.AWSMS, userId, MessageTypeEnum.SMS_VERIFY_CODE_UPDATE_PHONE, mobile,platform.getMsg());
+		} else if("LOGOFF".equals(type)){
+			sysMessageService.sendSecurityCode(MessageSenderPluginContext.MessageSender.AWSMS, userId, MessageTypeEnum.SMS_VERIFY_CODE_LOGOFF, mobile,platform.getMsg());
 		} else {
 			sysMessageService.sendSecurityCode(MessageSenderPluginContext.MessageSender.AWSMS, userId, MessageTypeEnum.SMS_VERIFY_CODE, mobile,platform.getMsg());
 		}

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

@@ -56,6 +56,7 @@ public class UserBankCardServiceImpl extends ServiceImpl<UserBankCardDao, UserBa
         UserBankCard oldBankCard = baseMapper.selectOne(Wrappers.<UserBankCard>lambdaQuery()
                 .eq(UserBankCard::getUserId, bankCard.getUserId())
                 .eq(UserBankCard::getBankCard, bankCard.getBankCard())
+                .eq(UserBankCard::getDelFlag,false)
         );
         if(null != oldBankCard){
             return HttpResponseResult.failed("已经绑定该银行卡");
@@ -88,6 +89,7 @@ public class UserBankCardServiceImpl extends ServiceImpl<UserBankCardDao, UserBa
         if (!verify) {
             return HttpResponseResult.failed("未通过验证");
         }
+
         int i = baseMapper.deleteById(bankCard.getId());
         return HttpResponseResult.succeed(detail);
     }

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

@@ -205,7 +205,7 @@ public class UserOrderPaymentServiceImpl extends ServiceImpl<UserOrderPaymentDao
             } else if (TradeStatusEnum.failed.equals(data.getStatus())) {//支付失败
                 paymentFailedHandle(data, data.getErrMsg());
             }
-        } else if (!userOrderVo.getStatus().equals(OrderStatusEnum.PAID)) {
+        } else {
             //原路退还
             orderRefundService.orderFailRefund(data, userOrderVo.getOrderNo(), "订单已超时，金额原路退回");
         }

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

@@ -43,8 +43,11 @@ 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){}
     }
 
     public String getPhone() {

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

@@ -103,8 +103,11 @@ public class MusicianAuthEntryRecordVo extends TeacherAuthMusicianRecord {
         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){}
     }
 
     public String getSubjectName() {

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

@@ -67,7 +67,10 @@ public class MyFens extends BaseEntity {
         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){}
     }
 }

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

@@ -90,8 +90,11 @@ public class MyFollow extends BaseEntity {
         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){}
     }
 
     public Double getStarGrade() {

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

@@ -148,8 +148,11 @@ public class StudentHomeVo extends Student {
         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){}
     }
 
     public String getPhone() {

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

@@ -65,8 +65,11 @@ public class StudentVo extends Student {
         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){}
     }
 
     public String getPhone() {

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

@@ -51,8 +51,11 @@ public class TeacherAuthEntryRecordVo extends TeacherAuthEntryRecord {
         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){}
     }
 
     public String getPhone() {

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

@@ -175,8 +175,11 @@ public class TeacherHomeVo extends Teacher 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){}
     }
 
     public String getPhone() {

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

@@ -147,8 +147,11 @@ public class TeacherVo extends Teacher {
         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){}
     }
 
     public UserLockFlag getLockFlag() {

cooleshow-user/user-biz/src/main/resources/config/contracts/latest_contract_template.ftl

@@ -85,10 +85,10 @@
         <h1>《产品与服务协议》</h1>
                             甲方：${companyName} <br/>
 
-        <div style="display: flex;">乙方：
+        <div style="display: flex;">
             <div style="flex: 1 auto;">
                 <div class="iInfo">
-                    <span>用户姓名：${userInfo.realName!}</span>
+                    <span>乙方：${userInfo.realName!}</span>
                     <span>电话：${userInfo.phone!}</span>
                 </div>
                 <#if userInfo.idCardNo?default("")?trim?length gt 1>

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

@@ -165,24 +165,27 @@
 
     <select id="detail" resultMap="DetailResultMap">
         SELECT
-        <include refid="Base_Column_List"/>
-        ,t.url_ as url
-        ,t.midi_url_ as midiUrl
-        ,t.metronome_url_ as metronomeUrl
-        ,msa.id_ as accompanimentId
-        ,msa.music_sheet_id_ as accompanimentMusicSheetId
-        ,msa.music_subject_ as accompanimentMusicSubject
-        ,msa.audio_file_url_ as accompanimentAudioFileUrl
-        ,msa.sort_number_ as accompanimentSortNumber
-        ,msa.create_time_ as accompanimentCreateTime
-        ,msa.metronome_url_ as accompanimentMetronomeUrl
-        ,msa.track_ as track
-        ,su.username_ as userName
-        ,su.avatar_ as userAvatar
-        ,(select group_concat(mt.name_) from music_tag mt
-        where find_in_set(mt.id_,t.music_tag_) and mt.del_flag_ = 0  and mt.state_ = 1) as musicTagNames
-        ,s2.name_ as subjectNames
-        ,s2.code_ as code
+            <include refid="Base_Column_List"/>
+            ,t.url_ as url
+            ,t.midi_url_ as midiUrl
+            ,t.metronome_url_ as metronomeUrl
+            ,msa.id_ as accompanimentId
+            ,msa.music_sheet_id_ as accompanimentMusicSheetId
+            ,msa.music_subject_ as accompanimentMusicSubject
+            ,msa.audio_file_url_ as accompanimentAudioFileUrl
+            ,msa.sort_number_ as accompanimentSortNumber
+            ,msa.create_time_ as accompanimentCreateTime
+            ,msa.metronome_url_ as accompanimentMetronomeUrl
+            ,msa.track_ as track
+            ,su.username_ as userName
+            ,su.avatar_ as userAvatar
+            ,(
+                select group_concat(mt.name_) from music_tag mt
+                where find_in_set(mt.id_,t.music_tag_)
+                and mt.del_flag_ = 0  and mt.state_ = 1
+            ) as musicTagNames
+            ,s2.name_ as subjectNames
+            ,s2.code_ as code
         FROM music_sheet t
         left join music_sheet_accompaniment msa on msa.music_sheet_id_ = t.id_
         left join sys_user su on t.create_by_ = su.id_

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

@@ -103,10 +103,10 @@
                 and INTE_ARRAY(t.subject_id_,#{param.subjectId})
             </if>
             <if test="null != param.isVip">
-                <if test="true == param.isVip">
+                <if test="1 == param.isVip.code">
                     and t.membership_end_time_ &gt; now()
                 </if>
-                <if test="false == param.isVip">
+                <if test="0 == param.isVip.code">
                     and (t.membership_end_time_ is null or t.membership_end_time_ &lt;= now())
                 </if>
             </if>

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

@@ -19,6 +19,7 @@
         <result column="musician_date_" property="musicianDate" />
         <result column="live_flag_" property="liveFlag" />
         <result column="live_date_" property="liveDate" />
+        <result column="browse_" property="browse" />
         <result column="memo_" property="memo" />
         <result column="create_time_" property="createTime" />
         <result column="update_time_" property="updateTime" />
@@ -43,6 +44,7 @@
         , t.musician_date_ as "musicianDate"
         , t.live_flag_ as "liveFlag"
         , t.live_date_ as "liveDate"
+        , t,browse_ as "browse"
         , t.memo_ as "memo"
         , t.create_time_ as "createTime"
         , t.update_time_ as "updateTime"

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

@@ -64,7 +64,11 @@
         and t.id_ = #{bankCardId}
     </select>
 
+    <update id="deleteById">
+        update user_bank_card set del_flag_ = 1 where id_ = #{id} and del_flag_ = 0
+    </update>
+
     <update id="deleteByUserId">
-        update user_bank_card set del_flag_ = 1 where user_id_ = #{userId}
+        update user_bank_card set del_flag_ = 1 where user_id_ = #{userId} and del_flag_ = 0
     </update>
 </mapper>

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

@@ -38,7 +38,7 @@ public class SmsCodeController extends BaseController {
 
     @ApiOperation(value = "发送登录短信验证码")
     @ApiImplicitParams({  @ApiImplicitParam(name = "mobile", value = "手机号", required = true, dataType = "String"),
-                          @ApiImplicitParam(name = "type", value = "类型（PASSWD:修改密码，LOGIN:登录或注册,BANK:绑定银行卡,PHONE:修改手机号）", required = true, dataType = "String") })
+                          @ApiImplicitParam(name = "type", value = "类型（PASSWD:修改密码，LOGIN:登录或注册,BANK:绑定银行卡,PHONE:修改手机号,LOGOFF:用户注销）", required = true, dataType = "String") })
     @PostMapping(value = "/sendSmsCode")
     public Object sendLoginVerifyCode(String mobile,String type) throws Exception {
         smsCodeService.sendValidCode(mobile, type, ClientEnum.TEACHER);

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

@@ -51,6 +51,7 @@ public class SysUserContractRecordController extends BaseController {
         if (user == null || null == user.getId()) {
             return failed(HttpStatus.FORBIDDEN, "请登录");
         }
+
         return HttpResponseResult.succeed(sysUserContractRecordService.checkContractSign(user.getId(), SysUserType.TEACHER, contractType));
     }
 

toolset/pom.xml

@@ -30,7 +30,6 @@
 		<module>dynamic-datasource</module>
 		<module>thirdparty-component</module>
 		<module>toolset-base</module>
-		<module>toolset-emoji</module>
 		<module>toolset-feign</module>
 		<module>toolset-mybatis</module>
 		<module>utils</module>

toolset/toolset-emoji/pom.xml

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>toolset</artifactId>
-        <groupId>com.yonge.toolset</groupId>
-        <version>1.0</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>toolset-emoji</artifactId>
-    <version>1.0</version>
-    <name>toolset-emoji</name>
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.yonge.toolset</groupId>
-            <artifactId>utils</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.vdurmont</groupId>
-            <artifactId>emoji-java</artifactId>
-        </dependency>
-    </dependencies>
-</project>

toolset/toolset-emoji/src/main/java/com/yonge/toolset/emoji/serializer/EmojiSerializer.java

@@ -1,21 +0,0 @@
-package com.yonge.toolset.emoji.serializer;
-
-import com.alibaba.fastjson.serializer.JSONSerializer;
-import com.alibaba.fastjson.serializer.ObjectSerializer;
-import com.vdurmont.emoji.EmojiParser;
-
-import java.io.IOException;
-import java.lang.reflect.Type;
-
-/**
- * @Author: liweifan
- * @Data: 2022/4/28 14:39
- */
-public class EmojiSerializer implements ObjectSerializer {
-
-    @Override
-    public void write(JSONSerializer serializer, Object object, Object fieldName, Type fieldType, int features) throws IOException {
-        serializer.write(EmojiParser.parseToUnicode(object.toString()));
-    }
-
-}

toolset/toolset-mybatis/src/main/java/com/yonge/toolset/mybatis/config/MyBatisPlusConfig.java

@@ -14,20 +14,12 @@ import org.springframework.context.annotation.Primary;
  */
 @Configuration
 public class MyBatisPlusConfig {
-
-    @Autowired
-    private MybatisPlusProperties plusProperties;
-
     /**
      * 分页插件
      */
     @Bean
     @Primary
     public PaginationInterceptor paginationInterceptor() {
-        MybatisConfiguration mybatisConfiguration = new MybatisConfiguration();
-        mybatisConfiguration.setMapUnderscoreToCamelCase(true);
-        mybatisConfiguration.setCacheEnabled(false);
-        plusProperties.setConfiguration(mybatisConfiguration);
         return new PaginationInterceptor();
     }
 }