From d8928f90b4d3b4ddb9d8469caffc2cf20375865a Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Sun, 25 Apr 2021 16:59:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=BB=84=E4=BB=8A=E6=97=A5=E7=A7=AF?=
 =?UTF-8?q?=E5=88=86=E5=A2=9E=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dao/UserPointActionLogDao.java  | 10 ++++++++++
 .../epmet/service/UserPointActionLogService.java   | 10 ++++++++++
 .../impl/BizPointTotalDetailServiceImpl.java       |  5 ++++-
 .../impl/UserPointActionLogServiceImpl.java        | 14 ++++++++++++++
 .../resources/mapper/UserPointActionLogDao.xml     |  8 ++++++++
 5 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/UserPointActionLogDao.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/UserPointActionLogDao.java
index 40c3277d6d..a2c1963e85 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/UserPointActionLogDao.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/UserPointActionLogDao.java
@@ -53,4 +53,14 @@ public interface UserPointActionLogDao extends BaseDao<UserPointActionLogEntity>
      * @date 2020.07.31 15:11
     **/
     Integer selectSumByEvent(@Param("userId") String userId, @Param("eventId") String eventId, @Param("sourceId") String sourceId, @Param("customerId") String customerId, @Param("dateCheck") Date dateCheck,@Param("right")Date right);
+
+    /**
+     * 获取今日积分增量
+     * @author zhaoqifeng
+     * @date 2021/4/21 16:56
+     * @param type
+     * @param objectId
+     * @return java.lang.Integer
+     */
+    Integer selectIncrease(@Param("type")String type, @Param("objectId")String objectId);
 }
\ No newline at end of file
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/UserPointActionLogService.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/UserPointActionLogService.java
index 8a35954ef0..892fd67a11 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/UserPointActionLogService.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/UserPointActionLogService.java
@@ -123,4 +123,14 @@ public interface UserPointActionLogService extends BaseService<UserPointActionLo
      * @date 2020.07.31 13:45
     **/
     void grantPointByEvent(String eventCode,BasePointEventMsg event);
+
+    /**
+     * 获取今日增量
+     * @author zhaoqifeng
+     * @date 2021/4/21 16:41
+     * @param type
+     * @param objectId
+     * @return java.lang.Integer
+     */
+    Integer getIncrease(String type, String objectId);
 }
\ No newline at end of file
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/BizPointTotalDetailServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/BizPointTotalDetailServiceImpl.java
index 282ae423aa..554256b55e 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/BizPointTotalDetailServiceImpl.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/BizPointTotalDetailServiceImpl.java
@@ -36,6 +36,7 @@ import com.epmet.resi.group.dto.group.ResiGroupDTO;
 import com.epmet.resi.group.feign.ResiGroupOpenFeignClient;
 import com.epmet.service.BizPointTotalDetailService;
 import com.epmet.service.BizPointUserTotalDetailService;
+import com.epmet.service.UserPointActionLogService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -59,6 +60,8 @@ public class BizPointTotalDetailServiceImpl extends BaseServiceImpl<BizPointTota
     private ResiGroupOpenFeignClient resiGroupOpenFeignClient;
     @Autowired
     private BizPointUserTotalDetailService bizPointUserTotalDetailService;
+    @Autowired
+    private UserPointActionLogService userPointActionLogService;
 
     @Override
     public PageData<BizPointTotalDetailDTO> page(Map<String, Object> params) {
@@ -146,7 +149,7 @@ public class BizPointTotalDetailServiceImpl extends BaseServiceImpl<BizPointTota
                 .eq("OBJECT_ID", formDTO.getGroupId())
                 .eq("DEL_FLAG", NumConstant.ZERO_STR);
         BizPointTotalDetailEntity entity = baseDao.selectOne(wrapper);
-        Integer increase = bizPointUserTotalDetailService.getIncrease("group", formDTO.getGroupId());
+        Integer increase = userPointActionLogService.getIncrease("group", formDTO.getGroupId());
         detail.setIncrease(increase.toString());
         if (null == entity) {
             detail.setToUpgrade(detail.getNextLevelPoint());
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java
index cdc21397c5..dd82608b0b 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java
@@ -404,6 +404,20 @@ public class UserPointActionLogServiceImpl extends BaseServiceImpl<UserPointActi
 
     }
 
+    /**
+     * 获取今日增量
+     *
+     * @param type
+     * @param objectId
+     * @return java.lang.Integer
+     * @author zhaoqifeng
+     * @date 2021/4/21 16:41
+     */
+    @Override
+    public Integer getIncrease(String type, String objectId) {
+        return baseDao.selectIncrease(type, objectId);
+    }
+
     private void plusPoint(SendPointFormDTO grantPoint) {
         ValidatorUtils.validateEntity(grantPoint, SendPointFormDTO.SendPointGroup.class);
 
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml
index 8e9a860b37..96949a41ab 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml
@@ -65,4 +65,12 @@
                 AND CREATED_TIME <![CDATA[ < ]]> #{right}
             </if>
     </select>
+    <select id="selectIncrease" resultType="java.lang.Integer">
+        SELECT IFNULL(SUM(TOTAL_POINT), 0)
+        FROM USER_POINT_ACTION_LOG
+        WHERE
+            BIZ_TYPE = #{type}
+          AND OBJECT_ID = #{objectId}
+          AND DATE_FORMAT(CREATED_TIME, '%Y-%m-%d') = DATE_FORMAT(NOW(), '%Y-%m-%d')
+    </select>
 </mapper>
\ No newline at end of file