/resi/mine/mine/profile新增todayObtainedPoint返参

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;
 }

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

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;
+
 }

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;
 }

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;
         }