修改专家代码

lift-ud-service/src/main/java/cn/com/ty/lift/ud/applyExpert/service/impl/ApplyExpertServiceImpl.java

@@ -68,7 +68,7 @@ public class ApplyExpertServiceImpl extends ServiceImpl<ApplyExpertMapper, Apply
             byUserId.setExpertLevel(1);
             byUserId.setPlatformInvitedFlag(1);
             byUserId.setRealName(selectById.getName());
-            byUserId.setProficiency(selectById.getGoodElectrical() + "，" + selectById.getGoodMechanical());
+            byUserId.setProficiency("擅长品牌："+selectById.getProficiencyBrandName()+"，擅长电器："+selectById.getGoodElectrical()+"，擅长机械："+selectById.getGoodMechanical());
             byUserId.setGender(selectById.getGender());
             byUserId.setAge(selectById.getAge());
             byUserId.setAverageScore(0);

lift-ud-service/src/main/java/cn/com/ty/lift/ud/userInfo/service/impl/UserInfoServiceImpl.java

@@ -1,5 +1,24 @@
 package cn.com.ty.lift.ud.userInfo.service.impl;
 
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jms.core.JmsMessagingTemplate;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mysql.cj.util.StringUtils;
+
 import cn.com.ty.lift.common.constants.ApiConstants;
 import cn.com.ty.lift.common.model.PushMessage;
 import cn.com.ty.lift.common.model.PushUserInfo;
@@ -13,7 +32,6 @@ import cn.com.ty.lift.ud.dataBank.mapper.entity.LiftBrandEntity;
 import cn.com.ty.lift.ud.dataBank.mapper.entity.LiftCertificateEntity;
 import cn.com.ty.lift.ud.dataBank.service.ILiftBrandService;
 import cn.com.ty.lift.ud.dataBank.service.ILiftCertificateService;
-import cn.com.ty.lift.ud.expertComment.controller.query.ExpertCommentQuery;
 import cn.com.ty.lift.ud.expertComment.mapper.entity.ExpertCommentEntity;
 import cn.com.ty.lift.ud.expertComment.mapper.entity.ScoreInfo;
 import cn.com.ty.lift.ud.expertComment.service.IExpertCommentService;
@@ -38,7 +56,14 @@ import cn.com.ty.lift.ud.userCoupon.mapper.entity.UserCoupon;
 import cn.com.ty.lift.ud.userCoupon.service.IUserCouponService;
 import cn.com.ty.lift.ud.userInfo.controller.query.UserInfoQuery;
 import cn.com.ty.lift.ud.userInfo.mapper.UserInfoMapper;
-import cn.com.ty.lift.ud.userInfo.mapper.entity.*;
+import cn.com.ty.lift.ud.userInfo.mapper.entity.DetailUserInfoVo;
+import cn.com.ty.lift.ud.userInfo.mapper.entity.NewUserInfoVo;
+import cn.com.ty.lift.ud.userInfo.mapper.entity.UserInfoDto;
+import cn.com.ty.lift.ud.userInfo.mapper.entity.UserInfoEntity;
+import cn.com.ty.lift.ud.userInfo.mapper.entity.UserInfoVo;
+import cn.com.ty.lift.ud.userInfo.mapper.entity.UserLevelDto;
+import cn.com.ty.lift.ud.userInfo.mapper.entity.UserRequest;
+import cn.com.ty.lift.ud.userInfo.mapper.entity.UserVipDto;
 import cn.com.ty.lift.ud.userInfo.service.IUserInfoService;
 import cn.com.ty.lift.ud.userRebate.mapper.entity.UserRebateEntity;
 import cn.com.ty.lift.ud.userRebate.service.IUserRebateService;
@@ -47,23 +72,7 @@ import cn.com.ty.lift.ud.utils.PasswordUtils;
 import cn.com.ty.lift.ud.utils.QrCodeUtil;
 import cn.com.xwy.boot.web.dto.RestResponse;
 import cn.com.xwy.util.collection.ListUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.mysql.cj.util.StringUtils;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jms.core.JmsMessagingTemplate;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * 用户表 -ServiceImpl
@@ -153,7 +162,7 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfoEnt
             if(byUserId != null) {
                 userInfo.setAddress(byUserId.getResidentPlace());
                 userInfo.setWorkDate(byUserId.getWorkDate());
-                userInfo.setIntroduction(byUserId.getName()+"，专业："+byUserId.getProfessional()+"，擅长品牌："+byUserId.getProficiencyBrandName()+"，擅长电器："+byUserId.getGoodElectrical()+"，擅长机械："+byUserId.getGoodMechanical());
+                userInfo.setIntroduction(byUserId.getName()+"，专业："+byUserId.getProfessional()+"，"+userInfo.getProficiency());
                 userInfo.setExperience(byUserId.getWorkExperience());
             }
             
@@ -316,11 +325,11 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfoEnt
         userAccount.setPassword(PasswordUtils.generatePassword("123456", userAccount.getSalt()));
         userAccount.setMobile(userInfoEntity.getMobile());
         userAccount.setStatus(1);
-        // 设置用户为专家
         userAccount.setExpertFlag(1);
         userAccount.setType(3);
+        userAccount.setCreateDate(new Date());
         iUserAccountService.save(userAccount);
-        // 设置专家基础信息
+        
         userInfoEntity.setShowWhichName(1);
         userInfoEntity.setUserId(userAccount.getUserId());
         userInfoEntity.setPlatformInvitedFlag(1);