优化代码

java110-core/src/main/java/com/java110/core/smo/impl/ComputeFeeSMOImpl.java

@@ -1716,8 +1716,12 @@ public class ComputeFeeSMOImpl implements IComputeFeeSMO {
             } else {
                 targetEndDate = feeDto.getImportFeeEndTime();
             }
-            //判断当前费用是不是导入费用
-            oweMonth = 1.0;
+            //说明欠费
+            if (preEndTime.getTime() < DateUtil.getCurrentDate().getTime()) {
+                // 目标到期时间 - 到期时间 = 欠费月份
+                oweMonth = 1.0;
+            }
+
         } else if (FeeDto.FEE_FLAG_CYCLE_ONCE.equals(feeDto.getFeeFlag())) {
             if (feeDto.getDeadlineTime() != null) {
                 maxEndTime = feeDto.getDeadlineTime();

service-fee/src/main/java/com/java110/fee/cmd/fee/ListFeeCmd.java

@@ -141,7 +141,7 @@ public class ListFeeCmd extends Cmd {
             for (ApiFeeDataVo apiFeeDataVo : apiFeeDataVos) {
                 //获取付费对象类型
                 String payerObjType = apiFeeDataVo.getPayerObjType();
-                if (!StringUtil.isEmpty(payerObjType) && payerObjType.equals("6666")) {
+                if (FeeDto.PAYER_OBJ_TYPE_CAR.equals(payerObjType)) {
                     apiFeeDataVo.setCarTypeCd("1001");
                 }
                 fees.add(apiFeeDataVo);
@@ -278,7 +278,7 @@ public class ListFeeCmd extends Cmd {
     }
 
     private void computeFeePrice(List<FeeDto> feeDtos) {
-        if (feeDtos == null || feeDtos.size() < 1) {
+        if (feeDtos == null || feeDtos.isEmpty()) {
             return;
         }
         String val = CommunitySettingFactory.getValue(feeDtos.get(0).getCommunityId(), TOTAL_FEE_PRICE);