Browse Source

积分功能开发

dev-credits
chenzhihang 10 months ago
parent
commit
13c41ece12
5 changed files with 10 additions and 10 deletions
  1. +1
    -1
      ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/resources/ComputingResourceController.java
  2. +2
    -2
      ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/ResourceOccupyDao.java
  3. +1
    -1
      ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ResourceOccupyService.java
  4. +4
    -4
      ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ResourceOccupyServiceImpl.java
  5. +2
    -2
      ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ResourceOccupy.xml

+ 1
- 1
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/resources/ComputingResourceController.java View File

@@ -108,7 +108,7 @@ public class ComputingResourceController extends BaseController {

@GetMapping("/credit")
@ApiOperation("查询用户积分使用情况")
public GenericsAjaxResult<Map<String, Integer>> queryCredit() {
public GenericsAjaxResult<Map<String, Double>> queryCredit() {
return genericsSuccess(resourceOccupyService.queryCredit());
}
}


+ 2
- 2
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/ResourceOccupyDao.java View File

@@ -26,7 +26,7 @@ public interface ResourceOccupyDao {

List<ResourceOccupy> 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);
}

+ 1
- 1
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ResourceOccupyService.java View File

@@ -19,5 +19,5 @@ public interface ResourceOccupyService {

Page<ResourceOccupy> queryByPage(PageRequest pageRequest);

Map<String, Integer> queryCredit();
Map<String, Double> queryCredit();
}

+ 4
- 4
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ResourceOccupyServiceImpl.java View File

@@ -120,10 +120,10 @@ public class ResourceOccupyServiceImpl implements ResourceOccupyService {
}

@Override
public Map<String, Integer> queryCredit() {
Integer userCredit = resourceOccupyDao.getUserCredit(SecurityUtils.getLoginUser().getUserid());
Integer deduceCredit = resourceOccupyDao.getDeduceCredit(SecurityUtils.getLoginUser().getUserid());
HashMap<String, Integer> result = new HashMap<>();
public Map<String, Double> queryCredit() {
Double userCredit = resourceOccupyDao.getUserCredit(SecurityUtils.getLoginUser().getUserid());
Double deduceCredit = resourceOccupyDao.getDeduceCredit(SecurityUtils.getLoginUser().getUserid());
HashMap<String, Double> result = new HashMap<>();
result.put("userCredit", userCredit);
result.put("deduceCredit", deduceCredit);
return result;


+ 2
- 2
ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ResourceOccupy.xml View File

@@ -79,13 +79,13 @@
order by start_time desc limit #{pageable.offset}, #{pageable.pageSize}
</select>

<select id="getUserCredit" resultType="java.lang.Integer">
<select id="getUserCredit" resultType="java.lang.Double">
select TRUNCATE(credit, 1) as credit
from sys_user
where user_id = #{userId}
</select>

<select id="getDeduceCredit" resultType="java.lang.Integer">
<select id="getDeduceCredit" resultType="java.lang.Double">
select TRUNCATE(sum(deduce_credit), 1) as deduce_credit
from resource_occupy
where user_id = #{userId}


Loading…
Cancel
Save