Merge branches 'dev' and 'dev_bugfix' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev

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 <![CDATA[ < ]]> 0, 0, IFNULL( SUM( daily.POINT_CHANGE ), 0 ) ) AS TOTAL_POINT
+        ( IFNULL( SUM( daily.POINT_CHANGE ), 0 )  <![CDATA[ < ]]> 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

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java

@@ -192,7 +192,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
             Result<ResiPointDetailResultDTO> pointResult = epmetPointOpenFeignClient.myPoint(dto);
             if(pointResult.success() && null != pointResult.getData()){
                 //累计积分
-                result.setPoint(pointResult.getData().getAccumulatedPoint());
+                result.setPoint(pointResult.getData().getUsablePoint());
             }
             return result;
         }