合同到期天数和应用购买天数之差

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/licence/AppOrderApiServiceImpl.java

@@ -244,6 +244,7 @@ public class AppOrderApiServiceImpl implements AppOrderApiService {
         AppOrderCheckDTO result = new AppOrderCheckDTO();
         Date now = new Date();
         Date endTime = DateUtil.addDay(now, -1);
+        Date appOrderEndTime = DateUtil.addDay(now, -1);
         result.setNow(now);
         List<TabHaobanWxEnterpriseRelated> enterpriseIdList = wxEnterpriseRelatedService.getByWxEnterpriseId(wxEnterpriseId);
         if (CollUtil.isNotEmpty(enterpriseIdList)) {
@@ -258,10 +259,6 @@ public class AppOrderApiServiceImpl implements AppOrderApiService {
                     }
                 }
             }
-            if (endTime.after(now)){
-                int i = DateUtil.daysBetween(now, endTime);
-                result.setContractDay(i);
-            }
         }
         qdto.setWxEnterpriseId(wxEnterpriseId);
         qdto.setPageNum(1);
@@ -269,14 +266,13 @@ public class AppOrderApiServiceImpl implements AppOrderApiService {
         Page<AppOrderPageDTO> page = this.getAppOrderPage(qdto).getResult();
         List<AppOrderPageDTO> list = page.getResult();
         if (CollUtil.isNotEmpty(list)) {
-            endTime = DateUtil.addDay(now, -1);
-            Date beginTime = endTime;
+            Date beginTime = new Date();
             Integer num = 0;
             for (AppOrderPageDTO dto : list) {
                 if (dto.getOrderStatus() == 2 ){
                     num += dto.getUserNum();
-                    if (endTime.before(dto.getEndTime())){
-                        endTime = dto.getEndTime();
+                    if (appOrderEndTime.before(dto.getEndTime())){
+                        appOrderEndTime = dto.getEndTime();
                         beginTime = dto.getBeginTime();
                     }
                 }
@@ -296,6 +292,11 @@ public class AppOrderApiServiceImpl implements AppOrderApiService {
         } else {
             result.setType(0);
         }
+        int i = DateUtil.daysBetween(appOrderEndTime, endTime);
+        if(i< 0){
+            i = 0;
+        }
+        result.setContractDay(i);
         return ServiceResponse.success(result);
     }
     @Override

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/licence/AppOrderCheckVO.java

@@ -36,7 +36,7 @@ public class AppOrderCheckVO implements Serializable {
      */
     private Date endTime;
     /**
-     * 合同到期天数
+     * 合同到期天数和应用购买天数之差
      */
     private Integer contractDay;
     /**