12.18

luodangjia

2025-01-15 07b70a81dd94f638d31108c2029b44c26f6dde69

12.18

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserPointServiceImpl.java

@@ -97,6 +97,11 @@
                userPointDetailVO.setVariablePoint(p.getVariablePoint());
                String format = p.getCreateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
                userPointDetailVO.setCreateTime(format);
                Integer historicalPoint = p.getHistoricalPoint();
                Integer balance = p.getBalance();
                if (historicalPoint != null && balance != null) {
                    userPointDetailVO.setFlag(historicalPoint > balance ? 2 : 1);
                }
                return userPointDetailVO;
            }).collect(Collectors.toList());
            PageInfo<UserPointDetailVO> pageInfo1 = new PageInfo<>(pageCurr, pageSize);

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/vo/UserPointDetailVO.java

@@ -21,4 +21,6 @@
    @ApiModelProperty(value = "变动时间")
    private String createTime;

    @ApiModelProperty(value = "增或减标识： 1-增 2-减")
    private Integer flag;
}