diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/resources/ComputingResourceController.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/resources/ComputingResourceController.java index fff00c5b..d7fd42ca 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/resources/ComputingResourceController.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/resources/ComputingResourceController.java @@ -108,7 +108,7 @@ public class ComputingResourceController extends BaseController { @GetMapping("/credit") @ApiOperation("查询用户积分使用情况") - public GenericsAjaxResult> queryCredit() { + public GenericsAjaxResult> queryCredit() { return genericsSuccess(resourceOccupyService.queryCredit()); } } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/ResourceOccupyDao.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/ResourceOccupyDao.java index da008f3e..49d71704 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/ResourceOccupyDao.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/ResourceOccupyDao.java @@ -26,7 +26,7 @@ public interface ResourceOccupyDao { List queryByPage(@Param("userId") Long userId, @Param("pageable") Pageable pageable); - Integer getUserCredit(@Param("userId") Long userId); + Double getUserCredit(@Param("userId") Long userId); - Integer getDeduceCredit(@Param("userId") Long userId); + Double getDeduceCredit(@Param("userId") Long userId); } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ResourceOccupyService.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ResourceOccupyService.java index fcebe3c3..5828b110 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ResourceOccupyService.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ResourceOccupyService.java @@ -19,5 +19,5 @@ public interface ResourceOccupyService { Page queryByPage(PageRequest pageRequest); - Map queryCredit(); + Map queryCredit(); } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ResourceOccupyServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ResourceOccupyServiceImpl.java index 9b08d484..62caf886 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ResourceOccupyServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ResourceOccupyServiceImpl.java @@ -120,10 +120,10 @@ public class ResourceOccupyServiceImpl implements ResourceOccupyService { } @Override - public Map queryCredit() { - Integer userCredit = resourceOccupyDao.getUserCredit(SecurityUtils.getLoginUser().getUserid()); - Integer deduceCredit = resourceOccupyDao.getDeduceCredit(SecurityUtils.getLoginUser().getUserid()); - HashMap result = new HashMap<>(); + public Map queryCredit() { + Double userCredit = resourceOccupyDao.getUserCredit(SecurityUtils.getLoginUser().getUserid()); + Double deduceCredit = resourceOccupyDao.getDeduceCredit(SecurityUtils.getLoginUser().getUserid()); + HashMap result = new HashMap<>(); result.put("userCredit", userCredit); result.put("deduceCredit", deduceCredit); return result; diff --git a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ResourceOccupy.xml b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ResourceOccupy.xml index 48c62105..2249e650 100644 --- a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ResourceOccupy.xml +++ b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ResourceOccupy.xml @@ -79,13 +79,13 @@ order by start_time desc limit #{pageable.offset}, #{pageable.pageSize} - select TRUNCATE(credit, 1) as credit from sys_user where user_id = #{userId} - select TRUNCATE(sum(deduce_credit), 1) as deduce_credit from resource_occupy where user_id = #{userId}