Browse Source

账单:更改

wangPH 1 year ago
parent
commit
81f0ae61c4

+ 6 - 0
background-user/src/main/java/cn/kdan/compdf/entity/BackgroundUserRemain.java

@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.time.LocalDateTime;
+
 /**
  * @author ComPDFKit-WPH 2022-11-10
  */
@@ -43,4 +45,8 @@ public class BackgroundUserRemain extends BaseEntity {
 
     private Integer status;
 
+    private LocalDateTime startDate;
+
+    private LocalDateTime endDate;
+
 }

+ 5 - 3
background-user/src/main/java/cn/kdan/compdf/service/impl/BackgroundUserBalanceServiceImpl.java

@@ -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;
             }