From 4c423c32796a503ecaa9fe39674f22a950212b9f Mon Sep 17 00:00:00 2001 From: wangchao Date: Mon, 3 Aug 2020 18:20:52 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E6=8E=92=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/UserPointStatisticalDailyDao.xml | 4 ++-- .../src/main/java/com/epmet/service/impl/UserServiceImpl.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointStatisticalDailyDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointStatisticalDailyDao.xml index 633b3f75fa..70cdfc8d4f 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointStatisticalDailyDao.xml +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointStatisticalDailyDao.xml @@ -36,9 +36,9 @@ ( SELECT total.USER_ID, - IFNULL( SUM( daily.POINT_CHANGE ), 0 ) AS POINT_CHANGE, + IF - ( POINT_CHANGE 0, 0, IFNULL( SUM( daily.POINT_CHANGE ), 0 ) ) AS TOTAL_POINT + ( IFNULL( SUM( daily.POINT_CHANGE ), 0 ) 0, 0, IFNULL( SUM( daily.POINT_CHANGE ), 0 ) ) AS TOTAL_POINT FROM user_point_total total LEFT JOIN user_point_statistical_daily daily ON daily.USER_ID = total.USER_ID 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 70f342e4c4..88ad2d8ce0 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 @@ -192,7 +192,7 @@ public class UserServiceImpl extends BaseServiceImpl implem Result pointResult = epmetPointOpenFeignClient.myPoint(dto); if(pointResult.success() && null != pointResult.getData()){ //累计积分 - result.setPoint(pointResult.getData().getAccumulatedPoint()); + result.setPoint(pointResult.getData().getUsablePoint()); } return result; }