From acd672effa451ccc711a8ef546da03e08d3afbc1 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 18 Jun 2021 12:44:38 +0800
Subject: [PATCH] =?UTF-8?q?/resi/mine/mine/profile=E6=96=B0=E5=A2=9EtodayO?=
 =?UTF-8?q?btainedPoint=E8=BF=94=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/result/ResiPointDetailResultDTO.java |  4 ++++
 .../src/main/resources/mapper/UserPointTotalDao.xml    | 10 +++++++++-
 .../resi/mine/dto/result/MyResiUserInfoResultDTO.java  |  5 +++++
 .../com/epmet/dto/result/MyResiUserInfoResultDTO.java  |  4 ++++
 .../java/com/epmet/service/impl/UserServiceImpl.java   |  2 ++
 5 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/ResiPointDetailResultDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/ResiPointDetailResultDTO.java
index 79884a4842..350b674856 100644
--- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/ResiPointDetailResultDTO.java
+++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/ResiPointDetailResultDTO.java
@@ -24,4 +24,8 @@ public class ResiPointDetailResultDTO  implements Serializable {
      * */
     private Integer usablePoint = 0;
 
+    /**
+     * 今日已获得积分，用于积分任务列表显示
+     * */
+    private Integer todayObtainedPoint=0;
 }
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointTotalDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointTotalDao.xml
index bcf4735cb8..e9fb92c22f 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointTotalDao.xml
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointTotalDao.xml
@@ -35,7 +35,15 @@
     <select id="selectPointByCustomerUserId" resultType="com.epmet.dto.result.ResiPointDetailResultDTO">
         SELECT
             USABLE_POINT AS usablePoint,
-            TOTAL_POINT AS accumulatedPoint
+            TOTAL_POINT AS accumulatedPoint,
+            (
+                select IFNULL(sum(u.POINT),0) from user_point_action_log u
+                where u.DEL_FLAG='0'
+                and u.CUSTOMER_ID=#{customerId}
+                and u.USER_ID=#{userId}
+                and u.EVENT_ID !='manual'
+                AND DATE_FORMAT(u.CREATED_TIME, '%Y-%m-%d') = DATE_FORMAT(NOW(), '%Y-%m-%d')
+            )as todayObtainedPoint
         FROM
             USER_POINT_TOTAL
         WHERE
diff --git a/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/MyResiUserInfoResultDTO.java b/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/MyResiUserInfoResultDTO.java
index 21d940ec2c..c75bca8a46 100644
--- a/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/MyResiUserInfoResultDTO.java
+++ b/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/MyResiUserInfoResultDTO.java
@@ -47,4 +47,9 @@ public class MyResiUserInfoResultDTO implements Serializable {
      * */
     private Integer point;
 
+    /**
+     * 今日已获得积分，用于积分任务列表显示
+     * */
+    private Integer todayObtainedPoint;
+
 }
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MyResiUserInfoResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MyResiUserInfoResultDTO.java
index 4201a109a3..5b26ee9150 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MyResiUserInfoResultDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MyResiUserInfoResultDTO.java
@@ -48,4 +48,8 @@ public class MyResiUserInfoResultDTO implements Serializable {
      * */
     private Integer point;
 
+    /**
+     * 今日已获得积分，用于积分任务列表显示
+     * */
+    private Integer todayObtainedPoint;
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java
index 58a48ca9ac..b8ee97c440 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java
@@ -209,6 +209,8 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
             if(pointResult.success() && null != pointResult.getData()){
                 //累计积分
                 result.setPoint(pointResult.getData().getUsablePoint());
+                //今日已获得积分，用于积分任务列表显示
+                result.setTodayObtainedPoint(pointResult.getData().getTodayObtainedPoint());
             }
             return result;
         }