“mitao”
2026-02-03 6b56672a7e02a0bf340021f00a4898bee9b13834
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TIntegralSettlementServiceImpl.java
@@ -8,6 +8,7 @@
import com.google.common.collect.Sets;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.system.dto.TIntegralSettlementDTO;
import com.ruoyi.system.export.IntegralSettlementImport;
import com.ruoyi.system.model.TAppUser;
@@ -68,8 +69,12 @@
            Map<String, Integer> allAppUserIdMap = getAllAppUserIdMap(list);
            List<TIntegralSettlement> saveList = list.stream().map(item -> {
                TIntegralSettlement model = new TIntegralSettlement();
                model.setSettlementInterval(dto.getSettlementInterval());
                model.setSettlementStartTime(dto.getSettlementStartTime());
                model.setSettlementEndTime(dto.getSettlementEndTime());
                model.setAppUserId(allAppUserIdMap.get(item.getCode()));
                model.setTotalSettlementIntegral(item.getTotalSettlementIntegral());
                model.setCreateUserId(SecurityUtils.getUserId().intValue());
                model.setRemark(item.getRemark());
                return model;
            }).collect(Collectors.toList());
@@ -102,7 +107,7 @@
        TIntegralSettlementVO tIntegralSettlementVO = BeanUtil.copyProperties(integralSettlement, TIntegralSettlementVO.class);
        if (Objects.nonNull(integralSettlement)) {
            List<TIntegralSettlement> list = this.lambdaQuery().eq(TIntegralSettlement::getSettlementInterval, integralSettlement.getSettlementInterval()).list();
            BigDecimal total = list.stream().map(TIntegralSettlement::getTotalSettlementIntegral).reduce(BigDecimal.ZERO, BigDecimal::add);
            Integer total = list.stream().mapToInt(TIntegralSettlement::getTotalSettlementIntegral).sum();
            tIntegralSettlementVO.setTotalSettlementIntegral(total);
            SysUser sysUser = sysUserService.selectUserById(Long.valueOf(integralSettlement.getCreateUserId()));
            tIntegralSettlementVO.setCreateUserName(Objects.nonNull(sysUser) ? sysUser.getNickName() : "");
@@ -112,6 +117,11 @@
    @Override
    public Page<TIntegralSettlementDetailVO> getSettlementDetailPageList(TIntegralSettlementDetailQuery query) {
        TIntegralSettlement integralSettlement = getById(query.getId());
        if (Objects.isNull(integralSettlement)) {
            throw new ServiceException("积分结算记录不存在");
        }
        query.setSettlementInterval(integralSettlement.getSettlementInterval());
        Page<TIntegralSettlementDetailVO> page = new Page<>(query.getPageNum(), query.getPageSize());
        page.setRecords(baseMapper.getSettlementDetailPageList(page, query));
        return page;