Sfoglia il codice sorgente

优化 间接性费用bug

java110 3 anni fa
parent
commit
88a1d075fd

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

@@ -348,7 +348,7 @@ public class ExportFeeManualCollectionSMOImpl extends DefaultAbstractComponentSM
             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"))) {
+                if (feeObj.containsKey("feeFlag") && (FeeDto.FEE_FLAG_CYCLE.equals(feeObj.getString("feeFlag")) || FeeDto.FEE_FLAG_CYCLE_ONCE.equals(feeObj.getString("feeFlag")))) {
                     endTime = DateUtil.getFormatTimeString(DateUtil.stepDay(DateUtil.getDateFromString(endTime, DateUtil.DATE_FORMATE_STRING_B), -1),
                             DateUtil.DATE_FORMATE_STRING_B);
                 }

+ 1 - 1
springboot/src/main/java/com/java110/boot/smo/assetExport/impl/ExportFeeManualCollectionSMOImpl.java

@@ -348,7 +348,7 @@ public class ExportFeeManualCollectionSMOImpl extends DefaultAbstractComponentSM
             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"))) {
+                if (feeObj.containsKey("feeFlag") && (FeeDto.FEE_FLAG_CYCLE.equals(feeObj.getString("feeFlag")) || FeeDto.FEE_FLAG_CYCLE_ONCE.equals(feeObj.getString("feeFlag")))) {
                     endTime = DateUtil.getFormatTimeString(DateUtil.stepDay(DateUtil.getDateFromString(endTime, DateUtil.DATE_FORMATE_STRING_B), -1),
                             DateUtil.DATE_FORMATE_STRING_B);
                 }