|
@@ -9,8 +9,10 @@ import cn.hutool.core.date.DateUtil;
|
|
|
import cn.kdan.compdf.config.ExcelWidthStyleStrategy;
|
|
|
import cn.kdan.compdf.dto.PlanStatisticsDTO;
|
|
|
import cn.kdan.compdf.entity.BackgroundUserBalance;
|
|
|
+import cn.kdan.compdf.entity.BackgroundUserRemain;
|
|
|
import cn.kdan.compdf.mapper.BackgroundUserBalanceMapper;
|
|
|
import cn.kdan.compdf.service.BackgroundUserBalanceService;
|
|
|
+import cn.kdan.compdf.service.BackgroundUserRemainService;
|
|
|
import cn.kdan.compdf.service.BackgroundUserService;
|
|
|
import cn.kdan.compdf.vo.BackgroundUserBalanceVO;
|
|
|
import cn.kdan.compdf.vo.BackgroundUserPackageBalanceVO;
|
|
@@ -24,7 +26,6 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
-import org.apache.tomcat.util.http.fileupload.IOUtils;
|
|
|
import org.assertj.core.util.Lists;
|
|
|
import org.springframework.data.redis.core.StringRedisTemplate;
|
|
|
import org.springframework.stereotype.Service;
|
|
@@ -50,10 +51,12 @@ public class BackgroundUserBalanceServiceImpl extends ServiceImpl<BackgroundUser
|
|
|
private final StringRedisTemplate redisTemplate;
|
|
|
|
|
|
private final BackgroundUserService userService;
|
|
|
+ private final BackgroundUserRemainService backgroundUserRemainService;
|
|
|
|
|
|
- public BackgroundUserBalanceServiceImpl(StringRedisTemplate redisTemplate, BackgroundUserService userService) {
|
|
|
+ public BackgroundUserBalanceServiceImpl(StringRedisTemplate redisTemplate, BackgroundUserService userService, BackgroundUserRemainService backgroundUserRemainService) {
|
|
|
this.redisTemplate = redisTemplate;
|
|
|
this.userService = userService;
|
|
|
+ this.backgroundUserRemainService = backgroundUserRemainService;
|
|
|
}
|
|
|
|
|
|
@Override
|
|
@@ -69,23 +72,11 @@ public class BackgroundUserBalanceServiceImpl extends ServiceImpl<BackgroundUser
|
|
|
*/
|
|
|
@Override
|
|
|
public BackgroundUserPackageBalanceVO getPackageBalance(Long userId) {
|
|
|
- LambdaQueryWrapper<BackgroundUserBalance> eq = new LambdaQueryWrapper<BackgroundUserBalance>()
|
|
|
- .eq(BackgroundUserBalance::getUserId, userId).orderByDesc(BackgroundUserBalance::getCreateDate);
|
|
|
- List<BackgroundUserBalance> backgroundUserBalanceList = this.baseMapper.selectList(eq);
|
|
|
- BackgroundUserPackageBalanceVO backgroundUserPackageBalanceVO = BackgroundUserPackageBalanceVO.builder().usedFiles(0).remainingFiles(0).build();
|
|
|
- if (CollectionUtil.isNotEmpty(backgroundUserBalanceList)) {
|
|
|
- backgroundUserBalanceList.forEach(c -> {
|
|
|
- // 1充值
|
|
|
- if (c.getChangeType() == 1) {
|
|
|
- backgroundUserPackageBalanceVO.setRemainingFiles(backgroundUserPackageBalanceVO.getRemainingFiles() + c.getBalanceChange());
|
|
|
- }
|
|
|
- // 2正常消费扣除
|
|
|
- if (c.getChangeType() == 2) {
|
|
|
- backgroundUserPackageBalanceVO.setUsedFiles(backgroundUserPackageBalanceVO.getUsedFiles() + c.getBalanceChange());
|
|
|
- }
|
|
|
- });
|
|
|
- }
|
|
|
- return backgroundUserPackageBalanceVO;
|
|
|
+ LambdaQueryWrapper<BackgroundUserRemain> eq = new LambdaQueryWrapper<BackgroundUserRemain>()
|
|
|
+ .eq(BackgroundUserRemain::getUserId, userId);
|
|
|
+ BackgroundUserRemain backgroundUserRemain = backgroundUserRemainService.getOne(eq);
|
|
|
+ return BackgroundUserPackageBalanceVO.builder()
|
|
|
+ .usedFiles(backgroundUserRemain.getUsedFiles()).remainingFiles(backgroundUserRemain.getTotalFiles()).build();
|
|
|
}
|
|
|
|
|
|
/**
|