我的创客接口修复

kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/impl/KxsGdReportServiceImpl.java

@@ -29,6 +29,7 @@ import com.kxs.user.api.model.KxsUser;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 import java.util.Objects;
@@ -146,6 +147,7 @@ public class KxsGdReportServiceImpl extends ServiceImpl<KxsGdReportMapper, KxsGd
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean report(GdReportDTO param) {
 
         KxsGdReport kxsGdReport = this.getById(param.getId());

kxs-product/kxs-product-biz/src/main/resources/mapper/KxsMachineMapper.xml

@@ -47,6 +47,7 @@
         <where>
             and del_flag = 0
             and status = 0
+            and pre_user_id > 0
             <if test="query.warehouseId != null">
                 and warehouse_id = #{query.warehouseId}
             </if>

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/dto/kxsapp/ConcealParentDTO.java

@@ -5,6 +5,7 @@ import lombok.Data;
 
 /**
  * 隐藏推荐关系dto
+ * @author mac
  */
 @Data
 public class ConcealParentDTO {
@@ -13,6 +14,7 @@ public class ConcealParentDTO {
      */
     @NotNull(message = "用户id不能为空")
     private Long userId;
+
     /**
      * 隐藏推荐关系  0默认  1隐藏
      */

kxs-user/kxs-user-biz/src/main/java/com/kxs/user/biz/service/impl/KxsUserServiceImpl.java

@@ -111,7 +111,7 @@ public class KxsUserServiceImpl extends ServiceImpl<KxsUserMapper, KxsUser> impl
     private String active;
 
     private static final PasswordEncoder ENCODER = new BCryptPasswordEncoder();
-    
+
     @Override
     @GlobalTransactional(rollbackFor = Exception.class)
     public R register(RegisterDTO registerDTO) {
@@ -121,11 +121,11 @@ public class KxsUserServiceImpl extends ServiceImpl<KxsUserMapper, KxsUser> impl
 
         //查询是否注销
         KxsUser isRemove = baseMapper.selectOne(Wrappers.<KxsUser>lambdaQuery().eq(KxsUser::getPhone, registerDTO.getPhone() + "d"));
-        if(isRemove != null && isRemove.getUpdateTime() != null && LocalDateTime.now().isBefore(isRemove.getUpdateTime().plusDays(30))){
+        if (isRemove != null && isRemove.getUpdateTime() != null && LocalDateTime.now().isBefore(isRemove.getUpdateTime().plusDays(30))) {
             return R.failed(UserErrorTypeEnum.USER_REMOVE.getDescription());
         }
         KxsUser exUser = baseMapper.selectOne(Wrappers.<KxsUser>lambdaQuery().eq(KxsUser::getPhone, registerDTO.getPhone()));
-        if(exUser != null){
+        if (exUser != null) {
             return R.failed(UserErrorTypeEnum.PHONE_IS_EX.getDescription());
         }
 
@@ -136,7 +136,7 @@ public class KxsUserServiceImpl extends ServiceImpl<KxsUserMapper, KxsUser> impl
 
         //查询上级用户
         KxsUser inviteUser = baseMapper.selectOne(Wrappers.<KxsUser>lambdaQuery().eq(KxsUser::getUserCode, registerDTO.getUserCode()));
-        if(inviteUser == null){
+        if (inviteUser == null) {
             return R.failed(UserErrorTypeEnum.PARENT_IS_NULL.getDescription());
         }
 
@@ -153,7 +153,7 @@ public class KxsUserServiceImpl extends ServiceImpl<KxsUserMapper, KxsUser> impl
         String number = String.format("%07d", kxsUser.getId());
         kxsUser.setUserCode(CommonConstants.KXS_USER_NUMBER_PREFIX + number);
 
-        if (CharSequenceUtil.isBlank(inviteUser.getPidPath())){
+        if (CharSequenceUtil.isBlank(inviteUser.getPidPath())) {
             kxsUser.setPidPath("0");
         } else {
             //  拼接上级推荐人的用户ID字符串；如：0,1,2,3,4,5,...用英文逗号隔开
@@ -173,7 +173,7 @@ public class KxsUserServiceImpl extends ServiceImpl<KxsUserMapper, KxsUser> impl
         KxsWarehouseLimit kxsWarehouseLimit = new KxsWarehouseLimit();
         kxsWarehouseLimit.setUserId(kxsUser.getId());
         R<Boolean> booleanR = remoteKxsStoreService.addUserAdvanceLimit(kxsWarehouseLimit, SecurityConstants.FROM_IN);
-        if(!booleanR.getData()){
+        if (!booleanR.getData()) {
             throw new GlobalCustomerException(UserErrorTypeEnum.USER_LIMIT_ERROR.getDescription());
         }
 
@@ -182,7 +182,7 @@ public class KxsUserServiceImpl extends ServiceImpl<KxsUserMapper, KxsUser> impl
         remoteUserMsgService.pushUserMsg(kxsUserMsg, SecurityConstants.FROM_IN);
 
         return R.ok();
-        
+
     }
 
 
@@ -195,11 +195,11 @@ public class KxsUserServiceImpl extends ServiceImpl<KxsUserMapper, KxsUser> impl
 
         //查询是否注销
         KxsUser isRemove = baseMapper.selectOne(Wrappers.<KxsUser>lambdaQuery().eq(KxsUser::getPhone, registerDTO.getPhone() + "d"));
-        if(isRemove != null && isRemove.getUpdateTime() != null && LocalDateTime.now().isBefore(isRemove.getUpdateTime().plusDays(30))){
+        if (isRemove != null && isRemove.getUpdateTime() != null && LocalDateTime.now().isBefore(isRemove.getUpdateTime().plusDays(30))) {
             return R.failed(UserErrorTypeEnum.USER_REMOVE.getDescription());
         }
         KxsUser exUser = baseMapper.selectOne(Wrappers.<KxsUser>lambdaQuery().eq(KxsUser::getPhone, registerDTO.getPhone()));
-        if(exUser != null){
+        if (exUser != null) {
             return R.failed(UserErrorTypeEnum.PHONE_IS_EX.getDescription());
         }
 
@@ -210,7 +210,7 @@ public class KxsUserServiceImpl extends ServiceImpl<KxsUserMapper, KxsUser> impl
 
         //查询上级用户
         KxsUser inviteUser = baseMapper.selectOne(Wrappers.<KxsUser>lambdaQuery().eq(KxsUser::getUserCode, registerDTO.getUserCode()));
-        if(inviteUser == null){
+        if (inviteUser == null) {
             return R.failed(UserErrorTypeEnum.PARENT_IS_NULL.getDescription());
         }
 
@@ -228,7 +228,7 @@ public class KxsUserServiceImpl extends ServiceImpl<KxsUserMapper, KxsUser> impl
         String number = String.format("%07d", kxsUser.getId());
         kxsUser.setUserCode(CommonConstants.KXS_USER_NUMBER_PREFIX + number);
 
-        if (CharSequenceUtil.isBlank(inviteUser.getPidPath())){
+        if (CharSequenceUtil.isBlank(inviteUser.getPidPath())) {
             kxsUser.setPidPath("0");
         } else {
             //  拼接上级推荐人的用户ID字符串；如：0,1,2,3,4,5,...用英文逗号隔开
@@ -248,7 +248,7 @@ public class KxsUserServiceImpl extends ServiceImpl<KxsUserMapper, KxsUser> impl
         KxsWarehouseLimit kxsWarehouseLimit = new KxsWarehouseLimit();
         kxsWarehouseLimit.setUserId(kxsUser.getId());
         R<Boolean> booleanR = remoteKxsStoreService.addUserAdvanceLimit(kxsWarehouseLimit, SecurityConstants.FROM_IN);
-        if(booleanR.getStatus() != CommonConstants.SUCCESS || !booleanR.getData()){
+        if (booleanR.getStatus() != CommonConstants.SUCCESS || !booleanR.getData()) {
             throw new GlobalCustomerException(UserErrorTypeEnum.USER_LIMIT_ERROR.getDescription());
         }
 
@@ -262,7 +262,7 @@ public class KxsUserServiceImpl extends ServiceImpl<KxsUserMapper, KxsUser> impl
         kxsMerchant.setMakerUserId(kxsUser.getId());
         R res = remoteKxsProductService.changeToMchUser(kxsMerchant, SecurityConstants.FROM_IN);
 
-        if(res.getStatus() != CommonConstants.SUCCESS){
+        if (res.getStatus() != CommonConstants.SUCCESS) {
             throw new GlobalCustomerException(res.getMsg());
         }
 
@@ -283,14 +283,14 @@ public class KxsUserServiceImpl extends ServiceImpl<KxsUserMapper, KxsUser> impl
             throw new ValidateCodeException(UserErrorTypeEnum.CODE_NOT_EX.getDescription());
         }
         String code;
-        if("dev".equals(active) || "test".equals(active)){
+        if ("dev".equals(active) || "test".equals(active)) {
             code = "111111";
-        }else{
+        } else {
             code = RandomUtil.randomNumbers(Integer.parseInt(UserConstants.CODE_SIZE));
         }
         redisTemplate.opsForValue().set(key, code, UserConstants.CODE_TIME, TimeUnit.SECONDS);
         //发送短信
-        if("prod".equals(active)){
+        if ("prod".equals(active)) {
             SmsUtils.sendCode(mobile, code);
         }
         return Boolean.TRUE;
@@ -304,15 +304,15 @@ public class KxsUserServiceImpl extends ServiceImpl<KxsUserMapper, KxsUser> impl
 
         //查询用户
         KxsUser user = this.getOne(Wrappers.<KxsUser>lambdaQuery().eq(KxsUser::getPhone, param.getPhone()));
-        if(user == null){
+        if (user == null) {
             throw new GlobalCustomerException(UserErrorTypeEnum.USER_NOT_EXIST.getDescription());
         }
 
-        if(CharSequenceUtil.isBlank(user.getSalt())){
+        if (CharSequenceUtil.isBlank(user.getSalt())) {
             user.setSalt(UUID.randomUUID().toString());
         }
         //检查重复密码
-        if(!Objects.equals(param.getPassword(), param.getConfirmPwd())){
+        if (!Objects.equals(param.getPassword(), param.getConfirmPwd())) {
             throw new GlobalCustomerException(UserErrorTypeEnum.PWD_NOT_EQUALS.getDescription());
         }
 
@@ -330,7 +330,7 @@ public class KxsUserServiceImpl extends ServiceImpl<KxsUserMapper, KxsUser> impl
 
         KxsUser user = this.getById(SecurityUtils.getUser().getId());
         ExistPayPwdVO existPayPwdVO = new ExistPayPwdVO();
-        if(CharSequenceUtil.isBlank(user.getPayPwd())){
+        if (CharSequenceUtil.isBlank(user.getPayPwd())) {
             existPayPwdVO.setPayPwdStatus(0);
             return existPayPwdVO;
         }
@@ -343,7 +343,7 @@ public class KxsUserServiceImpl extends ServiceImpl<KxsUserMapper, KxsUser> impl
 
         KxsUser user = this.getById(SecurityUtils.getUser().getId());
 
-        if(!Objects.equals(user.getPayPwd(), SecureUtil.md5(payPwd + user.getSalt()))){
+        if (!Objects.equals(user.getPayPwd(), SecureUtil.md5(payPwd + user.getSalt()))) {
             return Boolean.FALSE;
         }
         return Boolean.TRUE;
@@ -355,7 +355,7 @@ public class KxsUserServiceImpl extends ServiceImpl<KxsUserMapper, KxsUser> impl
         UserCodeInfoVO userCodeInfoVO = new UserCodeInfoVO();
 
         KxsUser user = this.getOne(Wrappers.<KxsUser>lambdaQuery().eq(KxsUser::getUserCode, userCode));
-        if(user == null) {
+        if (user == null) {
             return userCodeInfoVO;
         }
         BeanUtils.copyProperties(user, userCodeInfoVO);
@@ -368,7 +368,7 @@ public class KxsUserServiceImpl extends ServiceImpl<KxsUserMapper, KxsUser> impl
 
         KxsUser user = this.getById(SecurityUtils.getUser().getId());
 
-        if(!Objects.equals(user.getHandPwd(), SecureUtil.md5(handPwd + user.getSalt()))){
+        if (!Objects.equals(user.getHandPwd(), SecureUtil.md5(handPwd + user.getSalt()))) {
             return Boolean.FALSE;
         }
         return Boolean.TRUE;
@@ -379,7 +379,7 @@ public class KxsUserServiceImpl extends ServiceImpl<KxsUserMapper, KxsUser> impl
 
         KxsUser user = this.getById(SecurityUtils.getUser().getId());
 
-        if(!ENCODER.matches(password + user.getSalt(), user.getPassword())){
+        if (!ENCODER.matches(password + user.getSalt(), user.getPassword())) {
             return Boolean.FALSE;
         }
         return Boolean.TRUE;
@@ -424,18 +424,18 @@ public class KxsUserServiceImpl extends ServiceImpl<KxsUserMapper, KxsUser> impl
         UserInfoVO userInfoVO = new UserInfoVO();
         BeanUtils.copyProperties(user, userInfoVO);
 
-        if(inviteUser != null){
+        if (inviteUser != null) {
             userInfoVO.setInviteMobile(inviteUser.getPhone());
             userInfoVO.setInviteName(inviteUser.getUsername());
         }
-        if(userReal != null){
+        if (userReal != null) {
             userInfoVO.setRealTime(userReal.getCreateTime());
         }
-        if(leader != null){
+        if (leader != null) {
             userInfoVO.setLeaderType(leader.getLeaderType());
             userInfoVO.setLeaderExpDate(leader.getExpiredDate());
         }
-        if(partner != null){
+        if (partner != null) {
             userInfoVO.setPartnerType(partner.getPartnerType());
         }
         //用户预设职级
@@ -461,10 +461,10 @@ public class KxsUserServiceImpl extends ServiceImpl<KxsUserMapper, KxsUser> impl
     @Override
     public R modifyPayPwd(KxsUser param) {
 
-        if(StrUtil.isEmpty(param.getPayPwd())){
+        if (StrUtil.isEmpty(param.getPayPwd())) {
             return R.failed("密码不能为空");
         }
-        if(param.getPayPwd().length() != 6){
+        if (param.getPayPwd().length() != 6) {
             return R.failed("密码长度必须为6位");
         }
         KxsUser user = this.getById(SecurityUtils.getUser().getId());
@@ -482,13 +482,13 @@ public class KxsUserServiceImpl extends ServiceImpl<KxsUserMapper, KxsUser> impl
 
         KxsUser user = getById(SecurityUtils.getUser().getId());
         KxsUserReal userReal = kxsUserRealMapper.selectOne(Wrappers.<KxsUserReal>lambdaQuery().eq(KxsUserReal::getUserId, SecurityUtils.getUser().getId()));
-        if(!param.getUsername().equals(userReal.getRealName())
+        if (!param.getUsername().equals(userReal.getRealName())
                 || !param.getIdCard().equals(userReal.getIdCard())
-                ||!param.getPhone().equals(user.getPhone())){
+                || !param.getPhone().equals(user.getPhone())) {
 
             return R.failed("用户信息不匹配");
         }
-        if(param.getPayPwd().length() != 6){
+        if (param.getPayPwd().length() != 6) {
             return R.failed("密码长度必须为6位");
         }
         user.setPayPwd(SecureUtil.md5(param.getPayPwd() + user.getSalt()));
@@ -502,7 +502,7 @@ public class KxsUserServiceImpl extends ServiceImpl<KxsUserMapper, KxsUser> impl
     public Object myUserList(Page<KxsUser> page, UserMyUserListDTO param) {
 
         param.setUserId(SecurityUtils.getUser().getId());
-        return baseMapper.myUserList(page,param);
+        return baseMapper.myUserList(page, param);
     }
 
     @Override
@@ -520,7 +520,7 @@ public class KxsUserServiceImpl extends ServiceImpl<KxsUserMapper, KxsUser> impl
         userMyUserStatisticsVO.setUserCountTotal(totalCount);
         Long addTotal = baseMapper.selectCount(Wrappers.<KxsUser>query().lambda().eq(KxsUser::getPid, userId).apply("DATE_FORMAT(create_time, '%Y-%m') = DATE_FORMAT(NOW(), '%Y-%m')"));
         userMyUserStatisticsVO.setThisMonthAddTotal(addTotal);
-        Long realTotal = baseMapper.selectCount(Wrappers.<KxsUser>query().lambda().eq(KxsUser::getPid, userId).eq(KxsUser::getRealStatus,1));
+        Long realTotal = baseMapper.selectCount(Wrappers.<KxsUser>query().lambda().eq(KxsUser::getPid, userId).eq(KxsUser::getRealStatus, 1));
         userMyUserStatisticsVO.setRealTotal(realTotal);
         userMyUserStatisticsVO.setNotRealTotal(totalCount - realTotal);
         return userMyUserStatisticsVO;
@@ -533,7 +533,7 @@ public class KxsUserServiceImpl extends ServiceImpl<KxsUserMapper, KxsUser> impl
         UserMyUserDetailVO userMyUserDetailVO = new UserMyUserDetailVO();
         BeanUtils.copyProperties(user, userMyUserDetailVO);
         KxsUserReal kxsUserReal = kxsUserRealMapper.selectOne(Wrappers.<KxsUserReal>query().lambda().eq(KxsUserReal::getUserId, id));
-        if (kxsUserReal != null){
+        if (kxsUserReal != null) {
             userMyUserDetailVO.setRealTime(kxsUserReal.getCreateTime());
         }
         return R.ok(userMyUserDetailVO);
@@ -542,7 +542,7 @@ public class KxsUserServiceImpl extends ServiceImpl<KxsUserMapper, KxsUser> impl
     @Override
     public Object verifyUserCode(String userCode) {
         KxsUser one = getOne(Wrappers.<KxsUser>query().lambda().eq(KxsUser::getUserCode, userCode));
-        if (one == null){
+        if (one == null) {
             return R.failed("该用户不存在");
         }
         return R.ok(one.getUsername());
@@ -555,12 +555,12 @@ public class KxsUserServiceImpl extends ServiceImpl<KxsUserMapper, KxsUser> impl
         //运营中心校验
         //查询自己当前未过期的运营中心数据
         KxsPartner kxsPartner = kxsPartnerMapper.selectOne(Wrappers.<KxsPartner>query().lambda().eq(KxsPartner::getUserId, userId).gt(KxsPartner::getExpiredDate, now));
-        if (kxsPartner != null){
+        if (kxsPartner != null) {
             return true;
         }
         //查询盟主
         KxsLeader kxsLeader = kxsLeaderMapper.selectOne(Wrappers.<KxsLeader>query().lambda().eq(KxsLeader::getUserId, userId).gt(KxsLeader::getExpiredDate, now));
-        if (kxsLeader != null){
+        if (kxsLeader != null) {
             return true;
         }
         //查询个人名下电签兑换劵+大机兑换券>=3 或 激活POS机数量+激活来客吧商户数量+激活广电卡数量 >3 或 商城下单过指定商品(10-电签机具/广电卡通兑券,11-大POS兑换券,77-来客吧产品组合包A.78-来客吧产品组合包B.79-来客产品组合包C)
@@ -571,19 +571,21 @@ public class KxsUserServiceImpl extends ServiceImpl<KxsUserMapper, KxsUser> impl
     @Override
     public Object notRealUser(Page<KxsUser> page) {
         Long id = SecurityUtils.getUser().getId();
-        return baseMapper.selectPage(page,Wrappers.<KxsUser>query().lambda().eq(KxsUser::getRealStatus,0).eq(KxsUser::getPid,id));
+        return baseMapper.selectPage(page, Wrappers.<KxsUser>query().lambda().eq(KxsUser::getRealStatus, 0).eq(KxsUser::getPid, id));
     }
 
     @Override
     public R concealParent(ConcealParentDTO concealParentDTO) {
-        Long id = SecurityUtils.getUser().getId();
-        Long userId = concealParentDTO.getUserId();
-         Integer hiddenLevel = concealParentDTO.getHiddenLevel();
+
+        Long userId = SecurityUtils.getUser().getId();
+
+        Long hideUserId = concealParentDTO.getUserId();
+        Integer hiddenLevel = concealParentDTO.getHiddenLevel();
         KxsUser kxsUser = baseMapper.selectById(userId);
-        if (kxsUser == null){
+        if (kxsUser == null) {
             return R.failed("非法参数,用户不存在");
         }
-        if (kxsUser.getPid().equals(Integer.parseInt(id.toString()))){
+        if (!checkUserIsChildren(userId.intValue(), hideUserId.intValue())) {
             return R.failed("非法参数,不可修改非您系统内用户关系");
         }
         kxsUser.setHiddenLevel(hiddenLevel);
@@ -592,17 +594,16 @@ public class KxsUserServiceImpl extends ServiceImpl<KxsUserMapper, KxsUser> impl
     }
 
 
-
     @Override
     public R updatePwd(UserUpdatePwdDTO param) {
 
-        if(!Objects.equals(param.getNewPwd(), param.getConfirmPwd())){
+        if (!Objects.equals(param.getNewPwd(), param.getConfirmPwd())) {
             return R.failed(UserErrorTypeEnum.PWD_NOT_EQUALS.getDescription());
         }
 
         KxsUser user = this.getById(SecurityUtils.getUser().getId());
 
-        if(!ENCODER.matches(param.getPassword() + user.getSalt(), user.getPassword())){
+        if (!ENCODER.matches(param.getPassword() + user.getSalt(), user.getPassword())) {
             return R.failed(UserErrorTypeEnum.PWD_ERROR.getDescription());
         }
 
@@ -621,11 +622,11 @@ public class KxsUserServiceImpl extends ServiceImpl<KxsUserMapper, KxsUser> impl
 
         KxsUser user = this.getById(SecurityUtils.getUser().getId());
         //判断手机号
-        if (!Objects.equals(user.getPhone(), param.getPhone())){
+        if (!Objects.equals(user.getPhone(), param.getPhone())) {
             return R.failed(UserErrorTypeEnum.PHONE_IS_INCONSISTENT.getDescription());
         }
         //判断密码
-        if(!ENCODER.matches(param.getPassword() + user.getSalt(), user.getPassword())){
+        if (!ENCODER.matches(param.getPassword() + user.getSalt(), user.getPassword())) {
             return R.failed(UserErrorTypeEnum.PWD_ERROR.getDescription());
         }
 
@@ -639,21 +640,21 @@ public class KxsUserServiceImpl extends ServiceImpl<KxsUserMapper, KxsUser> impl
     @Transactional(rollbackFor = Exception.class)
     public R realUser(RealUserDTO param) {
 
-        if(!IdcardUtil.isValidCard(param.getIdCard())){
+        if (!IdcardUtil.isValidCard(param.getIdCard())) {
             return R.failed(UserErrorTypeEnum.ID_CARD_ERROR.getDescription());
         }
         Long userId = SecurityUtils.getUser().getId();
         KxsUser user = this.getById(userId);
         //查询实名信息
         KxsUserReal userReal = kxsUserRealMapper.selectOne(Wrappers.<KxsUserReal>lambdaQuery().eq(KxsUserReal::getUserId, user.getId()));
-        if(userReal != null){
+        if (userReal != null) {
             userReal.setRealName(param.getRealName());
             userReal.setIdCard(param.getIdCard());
             userReal.setIdCardFront(param.getIdCardFront());
             userReal.setIdCardHand(param.getIdCardHand());
             userReal.setIdCardRear(param.getIdCardRear());
             kxsUserRealMapper.updateById(userReal);
-        }else{
+        } else {
             userReal = new KxsUserReal();
             BeanUtils.copyProperties(param, userReal);
             userReal.setUserId(userId.intValue());
@@ -662,14 +663,14 @@ public class KxsUserServiceImpl extends ServiceImpl<KxsUserMapper, KxsUser> impl
         }
         //查询银行卡信息
         KxsUserBank userBank = kxsUserBankMapper.selectOne(Wrappers.<KxsUserBank>lambdaQuery().eq(KxsUserBank::getUserId, user.getId()));
-        if (userBank != null){
+        if (userBank != null) {
             userBank.setBankPic(param.getBankPic());
             userBank.setBankOpen(param.getBankOpen());
             userBank.setBankCode(param.getBankCode());
             userBank.setBankPhone(param.getBankPhone());
             userBank.setBankName(param.getBankName());
             kxsUserBankMapper.updateById(userBank);
-        }else{
+        } else {
             userBank = new KxsUserBank();
             BeanUtils.copyProperties(param, userBank);
             userBank.setUserId(userId.intValue());
@@ -694,7 +695,7 @@ public class KxsUserServiceImpl extends ServiceImpl<KxsUserMapper, KxsUser> impl
     @Override
     public R handPwd(UserHandPwdDTO param) {
 
-        if(!Objects.equals(param.getHandPwd(), param.getConfirmPwd())){
+        if (!Objects.equals(param.getHandPwd(), param.getConfirmPwd())) {
             return R.failed(UserErrorTypeEnum.PWD_NOT_EQUALS.getDescription());
         }
 
@@ -713,7 +714,7 @@ public class KxsUserServiceImpl extends ServiceImpl<KxsUserMapper, KxsUser> impl
 
         KxsUserReal userReal = kxsUserRealMapper.selectOne(Wrappers.<KxsUserReal>lambdaQuery().eq(KxsUserReal::getUserId, SecurityUtils.getUser().getId()));
 
-        if(!param.getRealName().equals(userReal.getRealName()) || !param.getIdCard().equals(userReal.getIdCard())){
+        if (!param.getRealName().equals(userReal.getRealName()) || !param.getIdCard().equals(userReal.getIdCard())) {
             return Boolean.FALSE;
         }
 
@@ -743,7 +744,7 @@ public class KxsUserServiceImpl extends ServiceImpl<KxsUserMapper, KxsUser> impl
         String pidPath = user.getPidPath();
         //判断是否是下级
         boolean contains = pidPath.contains("," + userId + ",");
-        if(!contains){
+        if (!contains) {
             return Boolean.FALSE;
         }
 
@@ -776,43 +777,43 @@ public class KxsUserServiceImpl extends ServiceImpl<KxsUserMapper, KxsUser> impl
 
         //合伙人职级
         KxsPartner kxsPartner = kxsPartnerMapper.selectOne(Wrappers.<KxsPartner>lambdaQuery().eq(KxsPartner::getUserId, user.getId()));
-        if(kxsPartner != null){
+        if (kxsPartner != null) {
             LevelsVO levelsVO = new LevelsVO();
             levelsVO.setLevelName("合伙人职级");
             levelsVO.setLevel(kxsPartner.getPartnerLevel());
             levelsVO.setExpiredDate(kxsPartner.getExpiredDate());
-            if(kxsPartner.getExpiredDate().isBefore(LocalDateTime.now())){
+            if (kxsPartner.getExpiredDate().isBefore(LocalDateTime.now())) {
                 levelsVO.setStatus(0);
-            }else{
+            } else {
                 levelsVO.setStatus(1);
             }
             levels.add(levelsVO);
         }
         //盟主职级
         KxsLeader kxsLeader = kxsLeaderMapper.selectOne(Wrappers.<KxsLeader>lambdaQuery().eq(KxsLeader::getUserId, user.getId()));
-        if(kxsLeader != null){
+        if (kxsLeader != null) {
             LevelsVO levelsVO = new LevelsVO();
             levelsVO.setLevelName("盟主职级");
             levelsVO.setLevel(kxsLeader.getLeaderLevel());
             levelsVO.setExpiredDate(kxsLeader.getExpiredDate());
-            if(kxsLeader.getExpiredDate().isBefore(LocalDateTime.now())){
+            if (kxsLeader.getExpiredDate().isBefore(LocalDateTime.now())) {
                 levelsVO.setStatus(0);
-            }else{
+            } else {
                 levelsVO.setStatus(1);
             }
             levels.add(levelsVO);
         }
         //预设职级
         KxsUserPresetLog userPresetLog = kxsUserPresetLogMapper.selectOne(Wrappers.<KxsUserPresetLog>lambdaQuery().eq(KxsUserPresetLog::getUserId, user.getId()));
-        if(userPresetLog != null){
+        if (userPresetLog != null) {
             LevelsVO levelsVO = new LevelsVO();
             levelsVO.setLevelName("预设职级");
             levelsVO.setLevel(userPresetLog.getPresetLevel());
             levelsVO.setExpiredDate(userPresetLog.getEndTime());
             levelsVO.setStartTime(userPresetLog.getStartTime());
-            if(userPresetLog.getEndTime().isBefore(LocalDateTime.now())){
+            if (userPresetLog.getEndTime().isBefore(LocalDateTime.now())) {
                 levelsVO.setStatus(0);
-            }else{
+            } else {
                 levelsVO.setStatus(1);
             }
             levels.add(levelsVO);
@@ -823,10 +824,9 @@ public class KxsUserServiceImpl extends ServiceImpl<KxsUserMapper, KxsUser> impl
     }
 
 
-
     public static void main(String[] args) {
-        System.out.println(ENCODER.encode("aa121314" +"abc108fa-2060-46fc-b21b-fd5246fecb86"));
-        System.out.println(ENCODER.matches("aa121314" +"abc108fa-2060-46fc-b21b-fd5246fecb86", "$2a$10$sBtcVoeOuemMvhVI.OIp3e9LNlamWTOglZdf1AcPIJRY1KKNUvrOW"));
+        System.out.println(ENCODER.encode("aa121314" + "abc108fa-2060-46fc-b21b-fd5246fecb86"));
+        System.out.println(ENCODER.matches("aa121314" + "abc108fa-2060-46fc-b21b-fd5246fecb86", "$2a$10$sBtcVoeOuemMvhVI.OIp3e9LNlamWTOglZdf1AcPIJRY1KKNUvrOW"));
     }
 
 
@@ -837,7 +837,7 @@ public class KxsUserServiceImpl extends ServiceImpl<KxsUserMapper, KxsUser> impl
      * @param code   密码
      */
     @Override
-    public void checkValidateCode(String mobile, String code){
+    public void checkValidateCode(String mobile, String code) {
 
         if (CharSequenceUtil.isBlank(code)) {
             throw new ValidateCodeException("验证码不能为空");

kxs-user/kxs-user-biz/src/main/resources/mapper/KxsUserMapper.xml

@@ -83,7 +83,7 @@
             ORDER BY ku.this_month_trade DESC
         </if>
         <if test="param.sort != null and param.sort !='' and param.sort == 'time'">
-            ORDER BY realTime
+            ORDER BY ku.create_time
         </if>
     </select>
     <select id="searchMyUserList" resultType="com.kxs.user.api.vo.kxsapp.user.SearchMyUserListVO">