Merge remote-tracking branch 'origin/dev'

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiLeaderboardResultDTO.java

@@ -57,4 +57,5 @@ public class ResiLeaderboardResultDTO implements Serializable {
      * 参加次数
      */
     private Integer participationNum;
+    private String userId;
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/HeartUserInfoServiceImpl.java

@@ -35,6 +35,7 @@ import com.epmet.entity.HeartUserInfoEntity;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.redis.HeartUserInfoRedis;
 import com.epmet.service.HeartUserInfoService;
+import com.github.pagehelper.PageHelper;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -128,9 +129,8 @@ public class HeartUserInfoServiceImpl extends BaseServiceImpl<HeartUserInfoDao,
     @Override
     public Result<List<ResiLeaderboardResultDTO>> leaderboard(ResiActBaseFormDTO formDTO) {
         List<ResiLeaderboardResultDTO> resultDtoS = new ArrayList<>();
-        int pageIndex = (formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize();
-        formDTO.setPageNo(pageIndex);
         // 获取排好序的 排行榜
+        PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize());
         List<HeartUserInfoDTO> leaderboardList = baseDao.selectListLeaderboard(formDTO);
         if (leaderboardList.size() > NumConstant.ZERO){
             // 根据用户ID获取微信昵称、头像
@@ -143,6 +143,7 @@ public class HeartUserInfoServiceImpl extends BaseServiceImpl<HeartUserInfoDao,
             if (userWxInfos.success() && userWxInfos.getData().size() > NumConstant.ZERO){
                 for (HeartUserInfoDTO list : leaderboardList){
                     ResiLeaderboardResultDTO dto = new ResiLeaderboardResultDTO();
+                    dto.setUserId(list.getUserId());
                     dto.setKindnessTime(list.getKindnessTime());
                     dto.setVolunteerFlag(list.getVolunteerFlag());
                     dto.setParticipationNum(list.getParticipationNum());

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/HeartUserInfoDao.xml

@@ -51,8 +51,7 @@
         FROM heart_user_info ui
         WHERE ui.DEL_FLAG = '0'
         AND ui.CUSTOMER_ID = #{customerId}
-        ORDER BY ui.KINDNESS_TIME DESC, ui.PARTICIPATION_NUM DESC
-        LIMIT #{pageNo}, #{pageSize}
+        ORDER BY ui.KINDNESS_TIME DESC, ui.PARTICIPATION_NUM DESC,ui.VOLUNTEER_FLAG desc,ui.CREATED_TIME asc
     </select>
 
     <update id="updateHeartUserInfoByUserId" parameterType="com.epmet.dto.HeartUserInfoDTO">