From 825fed5f3ee68be0a74bc7035a3e935d4e798915 Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Mon, 11 May 2020 17:21:34 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E6=8E=92=E8=A1=8C=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=20-=20points=E6=A8=A1=E5=9D=97=20-=20=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E6=81=A2=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/EpdcAppPointsController.java   | 13 +++++++++
 .../elink/esua/epdc/dao/PointsLogsDao.java    | 12 ++++++++
 .../esua/epdc/service/PointsLogsService.java  | 13 +++++++++
 .../service/impl/PointsLogsServiceImpl.java   |  6 ++++
 .../main/resources/mapper/PointsLogsDao.xml   | 29 +++++++++++++++++++
 5 files changed, 73 insertions(+)

diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppPointsController.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppPointsController.java
index 6694e832..6739454f 100644
--- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppPointsController.java
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppPointsController.java
@@ -37,4 +37,17 @@ public class EpdcAppPointsController {
         List<EpdcAppPointsRecordResultDTO> list = pointsLogsService.listPointsRecord(formDto);
         return new Result<List<EpdcAppPointsRecordResultDTO>>().ok(list);
     }
+
+    /**
+     * @Description: 积分排行接口（0 周排行、1 月排行）
+     * @Param: [formDto]
+     * @return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.result.EpdcAppPointsRankingResultDTO>>
+     * @Author: zy
+     * @Date: 2020-04-30
+     */
+    @GetMapping("pointsRanking/list")
+    public Result<List<EpdcAppPointsRankingResultDTO>> listPointsRanking(@RequestBody EpdcAppPointsRankingFormDTO formDto) {
+        List<EpdcAppPointsRankingResultDTO> list = pointsLogsService.listPointsRanking(formDto);
+        return new Result<List<EpdcAppPointsRankingResultDTO>>().ok(list);
+    }
 }
diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/PointsLogsDao.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/PointsLogsDao.java
index 35a57c68..0fa2575e 100755
--- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/PointsLogsDao.java
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/PointsLogsDao.java
@@ -78,4 +78,16 @@ public interface PointsLogsDao extends BaseDao<PointsLogsEntity> {
      */
     List<EpdcAppPointsRecordResultDTO> selectListPointsRecord(EpdcAppPointsRecordFormDTO formDto);
 
+    /**
+     * 积分排行接口（0 周排行、1 月排行）
+     *
+     * @param formDto
+     *  param   pageIndex   必选  页码
+     *  param   pageSize    必选  页容量
+     *  param   rankingType 必选  排名方式：0-周，1-月
+     * @return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.result.EpdcAppPointsRankingResultDTO>>
+     * @Author: zy
+     * @Date: 2020-04-30
+     */
+    List<EpdcAppPointsRankingResultDTO> selectListPointsRanking(EpdcAppPointsRankingFormDTO formDto);
 }
diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/PointsLogsService.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/PointsLogsService.java
index 0fb40b78..fedccfee 100755
--- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/PointsLogsService.java
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/PointsLogsService.java
@@ -151,4 +151,17 @@ public interface PointsLogsService extends BaseService<PointsLogsEntity> {
      * @Date 2019/12/16 18:56
      **/
     Result confirmAdjustPoint(EpdcAdjustVolunteerPointsDTO formDto);
+
+    /**
+     * 积分排行接口（0 周排行、1 月排行）
+     *
+     * @param formDto
+     *  param   pageIndex   必选  页码
+     *  param   pageSize    必选  页容量
+     *  param   rankingType 必选  排名方式：0-周，1-月
+     * @return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.result.EpdcAppPointsRankingResultDTO>>
+     * @Author: zy
+     * @Date: 2020-04-30
+     */
+    List<EpdcAppPointsRankingResultDTO> listPointsRanking(EpdcAppPointsRankingFormDTO formDto);
 }
diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/PointsLogsServiceImpl.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/PointsLogsServiceImpl.java
index 2baae9d1..4490e13b 100755
--- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/PointsLogsServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/PointsLogsServiceImpl.java
@@ -224,4 +224,10 @@ public class PointsLogsServiceImpl extends BaseServiceImpl<PointsLogsDao, Points
         newsTask.insertUserInformation(informationFormDTO);
     }
 
+    @Override
+    public List<EpdcAppPointsRankingResultDTO> listPointsRanking(EpdcAppPointsRankingFormDTO formDto) {
+        int pageIndex = (formDto.getPageIndex() - NumConstant.ONE) * formDto.getPageSize();
+        formDto.setPageIndex(pageIndex);
+        return baseDao.selectListPointsRanking(formDto);
+    }
 }
diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/PointsLogsDao.xml b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/PointsLogsDao.xml
index 98035908..db188f0b 100755
--- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/PointsLogsDao.xml
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/PointsLogsDao.xml
@@ -78,4 +78,33 @@
         from epdc_points_logs where DEL_FLAG ='0' and USER_ID = #{userId}
         and BEHAVIOR_CODE = #{behaviorCode} order by  OPERATION_TIME desc limit 1
     </select>
+
+    <select id="selectListPointsRanking" resultType="com.elink.esua.epdc.dto.result.EpdcAppPointsRankingResultDTO">
+        SELECT
+        tab.USER_ID userId,
+        (
+        SELECT NICKNAME
+        FROM epdc_points_logs
+        WHERE tab.USER_ID = USER_ID
+        ORDER BY CREATED_TIME DESC
+        limit 0,1
+        ) nickName,
+        (tab.totalPointsAdd - tab.totalPointsDeducted) points
+        FROM(
+        SELECT
+        USER_ID,
+        SUM(case when OPERATION_TYPE = 0 then IFNULL(points,0) else 0 end) totalPointsDeducted,
+        SUM(case when OPERATION_TYPE = 1 then IFNULL(points,0) else 0 end) totalPointsAdd
+        FROM epdc_points_logs
+        WHERE DEL_FLAG = 0
+        <if test="rankingType != null and rankingType == 0">
+            AND YEARWEEK(date_format(OPERATION_TIME,'%Y-%m-%d')) = YEARWEEK(now())
+        </if>
+        <if test="rankingType != null and rankingType == 1">
+            AND DATE_FORMAT( OPERATION_TIME, '%Y%m' ) = DATE_FORMAT( CURDATE() , '%Y%m' )
+        </if>
+        GROUP BY USER_ID
+        ) tab ORDER BY (tab.totalPointsAdd - tab.totalPointsDeducted) DESC
+        LIMIT #{pageIndex}, #{pageSize}
+    </select>
 </mapper>