优化代码

java110-utils/src/main/java/com/java110/utils/util/DateUtil.java

@@ -421,6 +421,20 @@ public class DateUtil {
         return c.getTime();
     }
 
+    /**
+     * 在给定的日期加上或减去指定天数后的日期
+     *
+     * @param sourceDate 原始时间
+     * @param day      要调整的月份，向前为负数，向后为正数
+     * @return
+     */
+    public static Date stepDay(Date sourceDate, int day) {
+        Calendar c = Calendar.getInstance();
+        c.setTime(sourceDate);
+        c.add(Calendar.DATE, day);
+        return c.getTime();
+    }
+
     public static String dateTimeToDate(String dateTime) {
         String dateStr = "";
         try {

service-api/src/main/java/com/java110/api/smo/assetExport/impl/ExportFeeManualCollectionSMOImpl.java

@@ -4,12 +4,10 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.parser.Feature;
 import com.java110.api.smo.DefaultAbstractComponentSMO;
-import com.java110.core.component.BaseComponentSMO;
+import com.java110.api.smo.assetExport.IExportFeeManualCollectionSMO;
 import com.java110.core.context.IPageData;
-import com.java110.core.factory.Java110ThreadPoolFactory;
+import com.java110.dto.fee.FeeDto;
 import com.java110.entity.component.ComponentValidateResult;
-import com.java110.api.smo.assetExport.IExportFeeManualCollectionSMO;
-import com.java110.utils.constant.ServiceConstant;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.Base64Convert;
 import com.java110.utils.util.DateUtil;
@@ -32,8 +30,8 @@ import org.springframework.web.client.RestTemplate;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.math.BigDecimal;
+import java.text.ParseException;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -347,6 +345,15 @@ public class ExportFeeManualCollectionSMOImpl extends DefaultAbstractComponentSM
             row = sheet.createRow(line + feeIndex + 3);
             startTime = feeObj.getString("endTime").length() > 10 ? feeObj.getString("endTime").substring(0, 10) : feeObj.getString("endTime");
             endTime = feeObj.getString("deadlineTime").length() > 10 ? feeObj.getString("deadlineTime").substring(0, 10) : feeObj.getString("deadlineTime");
+            //如果费用是周期性费用 则 结束时间减一天
+            try {
+                if (feeObj.containsKey("feeFlag") && FeeDto.FEE_FLAG_CYCLE.equals(feeObj.getString("feeFlag"))) {
+                    endTime = DateUtil.getFormatTimeString(DateUtil.stepDay(DateUtil.getDateFromString(endTime, DateUtil.DATE_FORMATE_STRING_B), -1),
+                            DateUtil.DATE_FORMATE_STRING_B);
+                }
+            } catch (ParseException e) {
+                logger.error("处理结束时间失败", e);
+            }
 
             cell0 = row.createCell(0);
             cell0.setCellValue(feeObj.getString("feeName"));

service-fee/src/main/java/com/java110/fee/bmo/impl/QueryOweFeeImpl.java

@@ -86,7 +86,8 @@ public class QueryOweFeeImpl implements IQueryOweFee {
         for (FeeDto tmpFeeDto : feeDtos) {
             computeFeeSMOImpl.computeEveryOweFee(tmpFeeDto);//计算欠费金额
             //如果金额为0 就排除
-            if (tmpFeeDto.getFeePrice() > 0 && tmpFeeDto.getEndTime().getTime() <= DateUtil.getCurrentDate().getTime()) {
+            //if (tmpFeeDto.getFeePrice() > 0 && tmpFeeDto.getEndTime().getTime() <= DateUtil.getCurrentDate().getTime()) {
+            if (tmpFeeDto.getFeePrice() > 0) {
                 tmpFeeDtos.add(tmpFeeDto);
             }
         }
@@ -235,7 +236,8 @@ public class QueryOweFeeImpl implements IQueryOweFee {
 
             computeFeeSMOImpl.computeEveryOweFee(tempFeeDto, tmpRoomDto);//计算欠费金额
             //如果金额为0 就排除
-            if (tempFeeDto.getFeePrice() > 0 && tempFeeDto.getEndTime().getTime() <= DateUtil.getCurrentDate().getTime()) {
+            //if (tempFeeDto.getFeePrice() > 0 && tempFeeDto.getEndTime().getTime() <= DateUtil.getCurrentDate().getTime()) {
+            if (tempFeeDto.getFeePrice() > 0) {
                 tmpFeeDtos.add(tempFeeDto);
             }
         }