修改专家排序

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

@@ -71,6 +71,7 @@ public class ApplyExpertServiceImpl extends ServiceImpl<ApplyExpertMapper, Apply
             byUserId.setProficiency(selectById.getGoodElectrical() + "，" + selectById.getGoodMechanical());
             byUserId.setGender(selectById.getGender());
             byUserId.setAge(selectById.getAge());
+            byUserId.setAverageScore(0);
             byUserId.setProficiencyBrand(selectById.getProficiencyBrand());
             if (selectById.getResidentPlace().split(",").length == 3) {
                 byUserId.setLat(Double.parseDouble(selectById.getResidentPlace().split(",")[1]));

lift-ud-service/src/main/java/cn/com/ty/lift/ud/chat/controller/query/ChatSessionQuery.java

@@ -131,7 +131,7 @@ public final class ChatSessionQuery extends BasePageQuery {
             query.like("users.name",userName);
         }
         //按修改时间倒序
-        query.orderByDesc("t.update_time");
+//        query.orderByDesc("t.update_time");
         query.isNotNull("t.create_user_id");
         if (null != getSort()) {
             if (getSort().getOrder().indexOf("asc") != -1 || getSort().getOrder().indexOf("ASC") != -1) {

lift-ud-service/src/main/java/cn/com/ty/lift/ud/expertComment/service/impl/ExpertCommentServiceImpl.java

@@ -2,9 +2,6 @@ package cn.com.ty.lift.ud.expertComment.service.impl;
 
 import java.util.List;
 
-import cn.com.ty.lift.ud.expertComment.mapper.entity.ScoreInfo;
-import cn.com.ty.lift.ud.userInfo.mapper.entity.UserInfoEntity;
-import cn.com.xwy.util.collection.ListUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jms.core.JmsMessagingTemplate;
 import org.springframework.stereotype.Service;
@@ -17,14 +14,16 @@ import cn.com.ty.lift.common.model.PushMessage;
 import cn.com.ty.lift.common.model.PushUserInfo;
 import cn.com.ty.lift.ud.chat.mapper.LiftCaseMapper;
 import cn.com.ty.lift.ud.chat.mapper.entity.LiftCaseEntity;
-import cn.com.ty.lift.ud.chat.service.ILiftCaseService;
 import cn.com.ty.lift.ud.expertComment.controller.query.ExpertCommentQuery;
 import cn.com.ty.lift.ud.expertComment.mapper.ExpertCommentMapper;
 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;
 import cn.com.ty.lift.ud.operation.mapper.entity.ExpertLevelSettingEntity;
 import cn.com.ty.lift.ud.operation.service.IExpertLevelSettingService;
 import cn.com.ty.lift.ud.userAccount.service.IUserAccountService;
+import cn.com.ty.lift.ud.userInfo.mapper.UserInfoMapper;
+import cn.com.ty.lift.ud.userInfo.mapper.entity.UserInfoEntity;
 import cn.com.ty.lift.ud.userInfo.service.IUserInfoService;
 import cn.com.xwy.boot.web.dto.RestResponse;
 
@@ -56,7 +55,7 @@ public class ExpertCommentServiceImpl extends ServiceImpl<ExpertCommentMapper, E
     private IUserInfoService iUserInfoService;
 
     @Autowired
-    private ILiftCaseService iLiftCaseService;
+    private UserInfoMapper userInfoMapper;
 
     /**
      * 多表查询
@@ -153,6 +152,7 @@ public class ExpertCommentServiceImpl extends ServiceImpl<ExpertCommentMapper, E
         }
         // 修改 user_info 中的专家总积分 level_total_score，并修改专家星级
         UserInfoEntity expertInfo = iUserInfoService.getByUserId(entity.getExpertId());
+        userInfoMapper.updateAverageScore(expertInfo.getUserId(),expertInfo.getAverageScore());
         if(null != expertInfo){
             int nowTotalScore = score;
             if(null != expertInfo.getLevelTotalScore()){

lift-ud-service/src/main/java/cn/com/ty/lift/ud/userInfo/mapper/UserInfoMapper.java

@@ -254,4 +254,7 @@ public interface UserInfoMapper extends BaseMapper<UserInfoEntity> {
     
     @Update("UPDATE user_info SET user_level_name=#{name},request_code=NULL where user_id=#{userId}")
     void updateByLevelName(@Param("name")String name,@Param("userId")Long userId);
+    
+    @Update("UPDATE user_info SET average_score=#{avsore} where user_id=#{userId}")
+    void updateAverageScore(@Param("userId")Long id,@Param("avsore")Integer avsore);
 }

lift-ud-service/src/main/java/cn/com/ty/lift/ud/userInfo/mapper/entity/UserInfoEntity.java

@@ -361,7 +361,7 @@ public class UserInfoEntity implements Serializable {
     private transient Double distance;
 
     @ApiModelProperty("评论平均分")
-    private transient Integer averageScore;
+    private Integer averageScore;
     
     @ApiModelProperty("地点")
     private transient String address;

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

@@ -153,7 +153,7 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfoEnt
             if(byUserId != null) {
                 userInfo.setAddress(byUserId.getResidentPlace());
                 userInfo.setWorkDate(byUserId.getWorkDate());
-                userInfo.setIntroduction(byUserId.getName()+"/n专业："+byUserId.getProfessional()+"/n擅长品牌："+byUserId.getProficiencyBrandName()+"/n擅长电器："+byUserId.getGoodElectrical()+"/n擅长机械："+byUserId.getGoodMechanical());
+                userInfo.setIntroduction(byUserId.getName()+"，专业："+byUserId.getProfessional()+"，擅长品牌："+byUserId.getProficiencyBrandName()+"，擅长电器："+byUserId.getGoodElectrical()+"，擅长机械："+byUserId.getGoodMechanical());
                 userInfo.setExperience(byUserId.getWorkExperience());
             }