ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserPointServiceImpl.java
@@ -93,6 +93,11 @@ if (CollectionUtil.isNotEmpty(page.getRecords())) { List<UserPointDetailVO> collect = page.getRecords().stream().map(p -> { UserPointDetailVO userPointDetailVO = new UserPointDetailVO(); if (p.getType() != null && (p.getType().equals(12) || p.getType().equals(13))){ Long appUserId = p.getAppUserId(); AppUser appUser = appUserService.getById(appUserId); userPointDetailVO.setName(appUser.getName()); } userPointDetailVO.setType(p.getType()); userPointDetailVO.setVariablePoint(p.getVariablePoint()); String format = p.getCreateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/vo/UserPointDetailVO.java
@@ -12,7 +12,8 @@ @ApiModel("UserPointDetail对象") public class UserPointDetailVO { @ApiModelProperty(value = "变动类型（1=消费积分，2=返佣积分，3=拉新人积分，4=兑换商品 5 = 门店业绩积分 6 =门店返佣积分7=技师业绩积分8 =转赠积分 9 =做工积分 10 =注册积分）") @ApiModelProperty(value = "变动类型（1-消费，2-返佣，3-拉新，4-每日分享，5-每日签到，6-使用时长， 7-注册积分， 8-门店业绩，\" +\n" + " \"9-门店返佣，14-下级门店返佣，10-技师业绩，11-兑换商品，12-他人赠送，13-赠与他人,15-兑换券）") private Integer type; @ApiModelProperty(value = "变动金额") @@ -23,4 +24,6 @@ @ApiModelProperty(value = "增或减标识： 1-增 2-减") private Integer flag; private String name; } ruoyi-service/ruoyi-account/src/main/resources/mapper/account/AgentApplicationMapper.xml
@@ -45,7 +45,10 @@ and t1.status = #{agentQuery.status} </if> </where> order by t1.create_time asc order by t1.STATUS ASC, t1.application_time ASC, t1.create_time desc </select> </mapper>
