|
@@ -17,6 +17,7 @@ import cn.kdan.compdf.service.BackgroundUserBalanceService;
|
|
|
import cn.kdan.compdf.service.BackgroundUserRemainService;
|
|
|
import cn.kdan.compdf.service.BackgroundUserService;
|
|
|
import cn.kdan.compdf.utils.MyLocalDateUtil;
|
|
|
+import cn.kdan.compdf.utils.TokenUtil;
|
|
|
import cn.kdan.compdf.vo.BackgroundUserBalanceVO;
|
|
|
import cn.kdan.compdf.vo.BackgroundUserPackageBalanceVO;
|
|
|
import cn.kdan.compdf.vo.BillVO;
|
|
@@ -303,12 +304,13 @@ public class BackgroundUserBalanceServiceImpl extends ServiceImpl<BackgroundUser
|
|
|
billVO.setTotalFiles(userRemain.getTotalFiles());
|
|
|
switch (userRemain.getAssetType()) {
|
|
|
case 3:
|
|
|
- billVO.setStartDate(this.getFirstDayOfMonth());
|
|
|
+ LocalDateTime userFirstLogin = userService.getUSerFirstLogin(TokenUtil.getRequestHeader().getTenantId());
|
|
|
+ billVO.setStartDate(userFirstLogin.toLocalDate().compareTo(this.getFirstDayOfMonth()) < 0 ? this.getFirstDayOfMonth() : userFirstLogin.toLocalDate() );
|
|
|
billVO.setEndDate(this.getLastDayOfMonth());
|
|
|
break;
|
|
|
case 1:
|
|
|
- billVO.setStartDate(null);
|
|
|
- billVO.setEndDate(null);
|
|
|
+ billVO.setStartDate(userRemain.getStartDate().toLocalDate());
|
|
|
+ billVO.setEndDate(userRemain.getEndDate().toLocalDate());
|
|
|
break;
|
|
|
case 2: break;
|
|
|
}
|