修改时间 将时间修改 未23:59:59秒

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

@@ -1665,7 +1665,10 @@ public class ComputeFeeSMOImpl implements IComputeFeeSMO {
         Date preEndTime = preEndTimeCal.getTime();
 
         //todo 当前费用为一次性费用
-        Date maxEndTime = feeDto.getConfigEndTime();
+        Date maxEndTime = feeDto.getDeadlineTime();
+        if (maxEndTime == null) {
+            maxEndTime = feeDto.getConfigEndTime();
+        }
         if (FeeDto.FEE_FLAG_ONCE.equals(feeDto.getFeeFlag())) {
             //先取 deadlineTime
             if (feeDto.getDeadlineTime() != null) {
@@ -1687,11 +1690,7 @@ public class ComputeFeeSMOImpl implements IComputeFeeSMO {
             if (StringUtil.isNumber(feeDto.getMonthCycle())) {
                 oweMonth = Integer.parseInt(feeDto.getMonthCycle());
             }
-
-        } else if (FeeDto.FEE_FLAG_CYCLE_ONCE.equals(feeDto.getFeeFlag())) {
-            if (feeDto.getDeadlineTime() != null) {
-                maxEndTime = feeDto.getDeadlineTime();
-            }
+        } else {
             Date billEndTime = DateUtil.getCurrentDate();
             //建账时间
             Date startDate = feeDto.getStartTime();
@@ -1720,7 +1719,6 @@ public class ComputeFeeSMOImpl implements IComputeFeeSMO {
                 targetEndDate = getTargetEndTime((round + 1) * paymentCycle, startDate);//目标结束时间
             }
 
-
             //todo 费用项的结束时间<缴费的结束时间  费用快结束了   取费用项的结束时间
             if (maxEndTime.getTime() < targetEndDate.getTime()) {
                 targetEndDate = maxEndTime;
@@ -1728,50 +1726,7 @@ public class ComputeFeeSMOImpl implements IComputeFeeSMO {
             //说明欠费
             if (endDate.getTime() < targetEndDate.getTime()) {
                 // 目标到期时间 - 到期时间 = 欠费月份
-                oweMonth = DateUtil.dayCompare(endDate, targetEndDate);
-            }
-
-            if (feeDto.getEndTime().getTime() > targetEndDate.getTime()) {
-                targetEndDate = feeDto.getEndTime();
-            }
-        } else { // todo 周期性费用
-            //当前时间
-            Date billEndTime = DateUtil.getCurrentDate();
-            //建账时间
-            Date startDate = feeDto.getStartTime();
-            //计费起始时间
-            Date endDate = feeDto.getEndTime();
-            //缴费周期
-            long paymentCycle = Long.parseLong(feeDto.getPaymentCycle());
-            // 当前时间 - 开始时间  = 月份
-            double mulMonth = 0.0;
-            mulMonth = DateUtil.dayCompare(startDate, billEndTime);
-
-            // 月份/ 周期 = 轮数（向上取整）
-            double round = 0.0;
-            if ("1200".equals(feeDto.getPaymentCd())) { // 1200预付费
-                round = Math.floor(mulMonth / paymentCycle) + 1;
-            } else { //2100后付费
-                round = Math.floor(mulMonth / paymentCycle);
-            }
-            // 轮数 * 周期 * 30 + 开始时间 = 目标 到期时间
-            targetEndDate = getTargetEndTime(round * paymentCycle, startDate);//目标结束时间
-
-            //todo 如果 到了 预付期 产生下个周期的费用
-            if (DateUtil.getFormatTimeStringB(targetEndDate).equals(DateUtil.getFormatTimeStringB(endDate))
-                    && DateUtil.getCurrentDate().getTime() > preEndTime.getTime()
-            ) {
-                targetEndDate = getTargetEndTime((round + 1) * paymentCycle, startDate);//目标结束时间
-            }
-
-            //费用项的结束时间<缴费的结束时间  费用快结束了   取费用项的结束时间
-            if (maxEndTime.getTime() < targetEndDate.getTime()) {
-                targetEndDate = maxEndTime;
-            }
-            //说明欠费
-            if (endDate.getTime() < targetEndDate.getTime()) {
-                // 目标到期时间 - 到期时间 = 欠费月份
-                oweMonth = DateUtil.dayCompare(endDate, targetEndDate);
+                oweMonth = DateUtil.dayCompare(endDate, targetEndDate, true);
             }
 
             if (feeDto.getEndTime().getTime() > targetEndDate.getTime()) {
@@ -2165,7 +2120,7 @@ public class ComputeFeeSMOImpl implements IComputeFeeSMO {
         }
 
         //todo 递增时间 不是 费用建账时间的倍数时，修正一下
-        rateStartTime = correctByFeeStartTime(rateStartTime,feeDto.getStartTime());
+        rateStartTime = correctByFeeStartTime(rateStartTime, feeDto.getStartTime());
 
         BigDecimal addTotalAmount = new BigDecimal("0");
         double curOweMonth = 0;
@@ -2205,7 +2160,7 @@ public class ComputeFeeSMOImpl implements IComputeFeeSMO {
                 continue;
             }
             //todo 本轮 欠费开始时间大于 deadlineTime 跳过
-            if(curOweStartTime.getTime() >= feeDto.getDeadlineTime().getTime()){
+            if (curOweStartTime.getTime() >= feeDto.getDeadlineTime().getTime()) {
                 continue;
             }
 
@@ -2231,6 +2186,7 @@ public class ComputeFeeSMOImpl implements IComputeFeeSMO {
     /**
      * 修正递增 开始时间
      * 如果设置的 递增开始时间和建账时间不是同一天 强制修正下
+     *
      * @param rateStartTime
      * @param startTime
      * @return
@@ -2242,14 +2198,14 @@ public class ComputeFeeSMOImpl implements IComputeFeeSMO {
         Calendar calendar = Calendar.getInstance();
         calendar.setTime(startTime);
         int day = calendar.get(Calendar.DAY_OF_MONTH);
-        if(rateDay == day){
+        if (rateDay == day) {
             return rateStartTime;
         }
 
         rateCalendar = Calendar.getInstance();
         rateCalendar.setTime(rateStartTime);
-        rateCalendar.add(Calendar.MONTH,1);
-        rateCalendar.set(Calendar.DAY_OF_MONTH,day);
+        rateCalendar.add(Calendar.MONTH, 1);
+        rateCalendar.set(Calendar.DAY_OF_MONTH, day);
         return rateCalendar.getTime();
     }
 

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

@@ -832,7 +832,9 @@ public class DateUtil {
         return false;
     }
 
-
+    public static double dayCompare(Date fromDate, Date toDate){
+        return dayCompare(fromDate,toDate,false);
+    }
 
     /**
      * 计算 fromDate 2023-01-12  toDate 2023-09-15
@@ -843,7 +845,14 @@ public class DateUtil {
      * @param toDate
      * @return
      */
-    public static double dayCompare(Date fromDate, Date toDate) {
+    public static double dayCompare(Date fromDate, Date toDate,boolean plusOneSec) {
+
+        if(plusOneSec){
+            Calendar toD = Calendar.getInstance();
+            toD.setTime(toDate);
+            toD.add(Calendar.SECOND,1);
+            toDate = toD.getTime();
+        }
 
 
         //todo 需要计算三端时间 相加即可

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

@@ -175,7 +175,7 @@ public class ExportRoomSMOImpl extends DefaultAbstractComponentSMO implements IE
         cell0.setCellValue("费用名称: 请填写系统中费用类型，如物业费，押金等 ；\n计费起始时间: " +
                 "计费起始时间，格式为YYYY-MM-DD；\n计费结束时间，格式为YYYY-MM-DD；\n" +
                 "建账时间: 建账时间，格式为YYYY-MM-DD； \n 类型：表明是合同 房屋 还是车辆 房屋 1001 车辆 2002 合同 3003" +
-                "\n注意：所有单元格式为文本，计费结束时间只有一次性费用和间接性费用时需要填写");
+                "\n注意：所有单元格式为文本");
         CellStyle cs = workbook.createCellStyle();
         cs.setWrapText(true);  //关键
         cell0.setCellStyle(cs);

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

@@ -25,10 +25,7 @@ import com.java110.po.fee.PayFeeConfigPo;
 import com.java110.po.fee.PayFeePo;
 import com.java110.po.importFee.ImportFeePo;
 import com.java110.po.importFee.ImportFeeDetailPo;
-import com.java110.utils.util.Assert;
-import com.java110.utils.util.BeanConvertUtil;
-import com.java110.utils.util.DateUtil;
-import com.java110.utils.util.StringUtil;
+import com.java110.utils.util.*;
 import com.java110.vo.ResultVo;
 import org.slf4j.Logger;
 import com.java110.core.log.LoggerFactory;
@@ -106,7 +103,7 @@ public class ImportRoomFeeImpl implements IImportRoomFee {
 
         List<ImportRoomFee> tmpImportRoomFees = importRoomFees.toJavaList(ImportRoomFee.class);
 
-        if (tmpImportRoomFees == null || tmpImportRoomFees.size() < 1) {
+        if (ListUtil.isNull(tmpImportRoomFees)) {
             throw new IllegalArgumentException("未包含导入费用");
         }
 
@@ -133,15 +130,10 @@ public class ImportRoomFeeImpl implements IImportRoomFee {
         feeConfigDto.setCommunityId(communityId);
         List<FeeConfigDto> feeConfigDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(feeConfigDto);
         // 根据费用大类 判断是否有存在 费用导入收入项
-        if (feeConfigDtos == null || feeConfigDtos.size() < 1) {
-
+        if (ListUtil.isNull(feeConfigDtos)) {
             throw new IllegalArgumentException("费用项不存在");
-            //生成导入费
-            //feeConfigDto.setConfigId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_configId));
-            //saveFeeConfig(feeConfigDto);
-        } else {
-            feeConfigDto.setConfigId(feeConfigDtos.get(0).getConfigId());
         }
+        feeConfigDto.setConfigId(feeConfigDtos.get(0).getConfigId());
 
         for (ImportRoomFee tmpImportRoomFee : tmpImportRoomFees) {
             tmpImportRoomFee.setCommunityId(communityId);
@@ -177,6 +169,7 @@ public class ImportRoomFeeImpl implements IImportRoomFee {
         List<ImportFeeDetailPo> importFeeDetailPos = new ArrayList<>();
         PayFeePo payFeePo = null;
         ImportFeeDetailPo importFeeDetailPo = null;
+        String endTime = "";
         for (ImportRoomFee importRoomFee : tmpImportRoomFees) {
             if (StringUtil.isEmpty(importRoomFee.getRoomId()) || importRoomFee.getRoomId().startsWith("-") ||
                     StringUtil.isEmpty(importRoomFee.getFloorNum()) || importRoomFee.getFloorNum().startsWith("-") ||
@@ -185,6 +178,11 @@ public class ImportRoomFeeImpl implements IImportRoomFee {
                 errorCount++;
                 continue;
             }
+            endTime = importRoomFee.getEndTime();
+            if(!endTime.contains(":")){
+                endTime += " 23:59:59";
+            }
+
             successCount++;
             payFeePo = new PayFeePo();
             payFeePo.setFeeId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_feeId, true));
@@ -218,7 +216,7 @@ public class ImportRoomFeeImpl implements IImportRoomFee {
             feeAttrPo.setCommunityId(communityId);
             feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId, true));
             feeAttrPo.setSpecCd(FeeAttrDto.SPEC_CD_ONCE_FEE_DEADLINE_TIME);
-            feeAttrPo.setValue(importRoomFee.getEndTime());
+            feeAttrPo.setValue(endTime);
             feeAttrPo.setFeeId(payFeePo.getFeeId());
             feeAttrPos.add(feeAttrPo);
 
@@ -371,6 +369,7 @@ public class ImportRoomFeeImpl implements IImportRoomFee {
         List<ImportFeeDetailPo> importFeeDetailPos = new ArrayList<>();
         PayFeePo payFeePo = null;
         ImportFeeDetailPo importFeeDetailPo = null;
+        String endTime = "";
         for (ImportRoomFee importCarFee : tmpImportCarFees) {
             if (StringUtil.isEmpty(importCarFee.getCarId()) || importCarFee.getCarId().startsWith("-") ||
                     StringUtil.isEmpty(importCarFee.getCarNum()) || importCarFee.getCarNum().startsWith("-")
@@ -378,6 +377,10 @@ public class ImportRoomFeeImpl implements IImportRoomFee {
                 errorCount++;
                 continue;
             }
+            endTime = importCarFee.getEndTime();
+            if(!endTime.contains(":")){
+                endTime += " 23:59:59";
+            }
             successCount++;
             payFeePo = new PayFeePo();
             payFeePo.setFeeId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_feeId));
@@ -411,7 +414,7 @@ public class ImportRoomFeeImpl implements IImportRoomFee {
             feeAttrPo.setCommunityId(communityId);
             feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
             feeAttrPo.setSpecCd(FeeAttrDto.SPEC_CD_ONCE_FEE_DEADLINE_TIME);
-            feeAttrPo.setValue(importCarFee.getEndTime());
+            feeAttrPo.setValue(endTime);
             feeAttrPo.setFeeId(payFeePo.getFeeId());
             feeAttrPos.add(feeAttrPo);
 

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

@@ -143,7 +143,7 @@ public class QueryOweFeeImpl implements IQueryOweFee {
 
         List<FeeDto> feeDtos = feeInnerServiceSMOImpl.queryFees(feeDto);
 
-        if (feeDtos == null || feeDtos.size() < 1) {
+        if (ListUtil.isNull(feeDtos)) {
             return ResultVo.success();
         }
         String cycel = null;
@@ -182,7 +182,7 @@ public class QueryOweFeeImpl implements IQueryOweFee {
                 throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_ERROR, "未查到房屋信息，查询多条数据");
             }
             roomDto = roomDtos.get(0);
-            feeDto.setPayerObjName(roomDto.getFloorNum() + "栋" + roomDto.getUnitNum() + "单元" + roomDto.getRoomNum() + "室");
+            feeDto.setPayerObjName(roomDto.getFloorNum() + "-" + roomDto.getUnitNum() + "-" + roomDto.getRoomNum() );
             feeDto.setBuiltUpArea(roomDto.getBuiltUpArea());
 
         } else if (FeeDto.PAYER_OBJ_TYPE_CAR.equals(feeDto.getPayerObjType())) {//车位相关
@@ -196,7 +196,7 @@ public class QueryOweFeeImpl implements IQueryOweFee {
             parkingSpaceDto.setCommunityId(feeDto.getCommunityId());
             parkingSpaceDto.setPsId(ownerCarDtos.get(0).getPsId());
             List<ParkingSpaceDto> parkingSpaceDtos = parkingSpaceInnerServiceSMOImpl.queryParkingSpaces(parkingSpaceDto);
-            if (parkingSpaceDtos == null || parkingSpaceDtos.size() < 1) { //数据有问题
+            if (ListUtil.isNull(parkingSpaceDtos)) { //数据有问题
                 throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_ERROR, "未查到停车位信息，查询多条数据");
             }
             ownerCarDto = ownerCarDtos.get(0);

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

@@ -127,7 +127,8 @@ public class ListFeeCmd extends Cmd {
         int count = feeInnerServiceSMOImpl.queryFeesCount(feeDto);
         if (count > 0) {
             List<FeeDto> feeDtos = feeInnerServiceSMOImpl.queryFees(feeDto);//查询费用项目
-            computeFeePrice(feeDtos);//计算费用
+            //todo 计算费用
+            computeFeePrice(feeDtos);
             List<ApiFeeDataVo> apiFeeDataVos = BeanConvertUtil.covertBeanList(feeDtos, ApiFeeDataVo.class);
             for (ApiFeeDataVo apiFeeDataVo : apiFeeDataVos) {
                 //获取付费对象类型
@@ -183,7 +184,7 @@ public class ListFeeCmd extends Cmd {
         floorDto.setFloorNum(floorNum);
         floorDto.setCommunityId(reqJson.getString("communityId"));
         List<FloorDto> floorDtos = floorInnerServiceSMOImpl.queryFloors(floorDto);
-        if (floorDtos == null || floorDtos.size() < 1) {
+        if (ListUtil.isNull(floorDtos)) {
             return;
         }
         for (FloorDto floor : floorDtos) {
@@ -217,7 +218,7 @@ public class ListFeeCmd extends Cmd {
     }
 
     private void computeFeePrice(List<FeeDto> feeDtos) {
-        if (feeDtos == null || feeDtos.isEmpty()) {
+        if (ListUtil.isNull(feeDtos)) {
             return;
         }
         String val = CommunitySettingFactory.getValue(feeDtos.get(0).getCommunityId(), TOTAL_FEE_PRICE);

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

@@ -21,6 +21,7 @@ import com.java110.po.payFee.PayFeeBatchPo;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.DateUtil;
+import com.java110.utils.util.ListUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.text.ParseException;
@@ -54,6 +55,13 @@ public class RoomCreatePayFeeCmd extends Cmd {
         Assert.hasKeyAndValue(reqJson, "communityId", "未包含小区ID");
         Assert.hasKeyAndValue(reqJson, "configId", "未包含收费项目");
         Assert.hasKeyAndValue(reqJson, "startTime", "开始时间不存在");
+        Assert.hasKeyAndValue(reqJson, "endTime", "结束时间不存在");
+
+        String endTime = reqJson.getString("endTime");
+        if (!endTime.contains(":")) {
+            endTime += " 23:59:59";
+            reqJson.put("endTime", endTime);
+        }
 
         FeeConfigDto feeConfigDto = new FeeConfigDto();
         feeConfigDto.setCommunityId(reqJson.getString("communityId"));
@@ -69,20 +77,9 @@ public class RoomCreatePayFeeCmd extends Cmd {
         }
 
         JSONArray roomIds = reqJson.getJSONArray("roomIds");
-        if (roomIds == null || roomIds.isEmpty()) {
+        if (ListUtil.isNull(roomIds)) {
             throw new IllegalArgumentException("未包含房屋");
         }
-        //todo 不是周期性费用 endTime 必须存在
-        if (!FeeDto.FEE_FLAG_CYCLE.equals(feeConfigDtos.get(0).getFeeFlag())) {
-            Assert.hasKeyAndValue(reqJson, "endTime", "结束时间不存在");
-            Date endTime = null;
-            Date configEndTime = null;
-            endTime = DateUtil.getDateFromStringB(reqJson.getString("endTime"));
-            configEndTime = DateUtil.getDateFromStringA(feeConfigDtos.get(0).getEndTime());
-            if (endTime.getTime() > configEndTime.getTime()) {
-                throw new IllegalArgumentException("结束时间不能超过费用项时间");
-            }
-        }
 
         //todo 动态费用
         if (FeeConfigDto.COMPUTING_FORMULA_DYNAMIC.equals(feeConfigDtos.get(0).getComputingFormula())) {
@@ -109,20 +106,6 @@ public class RoomCreatePayFeeCmd extends Cmd {
     public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
 
         //todo 生成批次
-        generatorBatch(reqJson);
-
-
-        //todo 交给databus 异步方式处理，同步方式处理很容易超时
-        dataBusInnerServiceSMOImpl.databusData(new DatabusDataDto(DatabusDataDto.BUSINESS_TYPE_ROOM_CREATE_PAY_FEE, reqJson));
-
-    }
-
-    /**
-     * 生成批次号
-     *
-     * @param reqJson
-     */
-    private void generatorBatch(JSONObject reqJson) {
         PayFeeBatchPo payFeeBatchPo = new PayFeeBatchPo();
         payFeeBatchPo.setBatchId(GenerateCodeFactory.getGeneratorId("12"));
         payFeeBatchPo.setCommunityId(reqJson.getString("communityId"));
@@ -141,5 +124,11 @@ public class RoomCreatePayFeeCmd extends Cmd {
         }
 
         reqJson.put("batchId", payFeeBatchPo.getBatchId());
+
+
+        //todo 交给databus 异步方式处理，同步方式处理很容易超时
+        dataBusInnerServiceSMOImpl.databusData(new DatabusDataDto(DatabusDataDto.BUSINESS_TYPE_ROOM_CREATE_PAY_FEE, reqJson));
+
     }
+
 }

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

@@ -25,10 +25,7 @@ import com.java110.po.fee.FeeAttrPo;
 import com.java110.po.fee.PayFeePo;
 import com.java110.po.payFee.PayFeeBatchPo;
 import com.java110.utils.exception.CmdException;
-import com.java110.utils.util.Assert;
-import com.java110.utils.util.BeanConvertUtil;
-import com.java110.utils.util.DateUtil;
-import com.java110.utils.util.StringUtil;
+import com.java110.utils.util.*;
 import com.java110.vo.ResultVo;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -75,7 +72,14 @@ public class SaveContractCreateFeeCmd extends Cmd {
         // super.validatePageInfo(pd);
         Assert.hasKeyAndValue(reqJson, "communityId", "未包含小区ID");
         Assert.hasKeyAndValue(reqJson, "configId", "未包含收费项目");
-        //Assert.hasKeyAndValue(reqJson, "startTime", "未包含收费其实时间");
+        Assert.hasKeyAndValue(reqJson, "startTime", "未包含收费其实时间");
+        Assert.hasKeyAndValue(reqJson, "endTime", "未包含计费结束时间");
+
+        String endTime = reqJson.getString("endTime");
+        if (!endTime.contains(":")) {
+            endTime += " 23:59:59";
+            reqJson.put("endTime", endTime);
+        }
         //Assert.hasKeyAndValue(reqJson, "billType", "未包含出账类型");
         //Assert.hasKeyAndValue(reqJson, "storeId", "未包含商户ID");
     }
@@ -176,16 +180,13 @@ public class SaveContractCreateFeeCmd extends Cmd {
         for (int roomIndex = 0; roomIndex < contractDtos.size(); roomIndex++) {
             curFailRoomCount++;
             feePos.add(BeanConvertUtil.covertBean(feeBMOImpl.addContractFee(contractDtos.get(roomIndex), reqJson, context), PayFeePo.class));
+            feeAttrsPos.add(feeBMOImpl.addFeeAttr(reqJson, context, FeeAttrDto.SPEC_CD_ONCE_FEE_DEADLINE_TIME,
+                    reqJson.getString("endTime")));
             if (!StringUtil.isEmpty(contractDtos.get(roomIndex).getObjId())) {
-                if (!FeeDto.FEE_FLAG_CYCLE.equals(reqJson.getString("feeFlag"))) {
-                    feeAttrsPos.add(feeBMOImpl.addFeeAttr(reqJson, context, FeeAttrDto.SPEC_CD_ONCE_FEE_DEADLINE_TIME,
-                            reqJson.containsKey("endTime") ? reqJson.getString("endTime") : reqJson.getString("configEndTime")));
-                }
                 feeAttrsPos.add(feeBMOImpl.addFeeAttr(reqJson, context, FeeAttrDto.SPEC_CD_OWNER_ID, contractDtos.get(roomIndex).getObjId()));
                 feeAttrsPos.add(feeBMOImpl.addFeeAttr(reqJson, context, FeeAttrDto.SPEC_CD_OWNER_LINK, contractDtos.get(roomIndex).getbLink()));
                 feeAttrsPos.add(feeBMOImpl.addFeeAttr(reqJson, context, FeeAttrDto.SPEC_CD_OWNER_NAME, contractDtos.get(roomIndex).getPartyB()));
             }
-
             //付费对象名称
             feeAttrsPos.add(feeBMOImpl.addFeeAttr(reqJson, context, FeeAttrDto.SPEC_CD_PAY_OBJECT_NAME,
                     contractDtos.get(roomIndex).getContractName()));
@@ -201,7 +202,7 @@ public class SaveContractCreateFeeCmd extends Cmd {
                 }
             }
         }
-        if (feePos != null && feePos.size() > 0) {
+        if (!ListUtil.isNull(feePos)) {
             saveFlag = saveFeeAndAttrs(feePos, feeAttrsPos);
             if (saveFlag < 1) {
                 failRooms += curFailRoomCount;
@@ -212,7 +213,7 @@ public class SaveContractCreateFeeCmd extends Cmd {
         paramOut.put("successRoom", contractDtos.size() - failRooms);
         paramOut.put("errorRoom", failRooms);
 
-        context.setResponseEntity( ResultVo.createResponseEntity(paramOut));
+        context.setResponseEntity(ResultVo.createResponseEntity(paramOut));
     }
 
 

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

@@ -78,7 +78,14 @@ public class SaveParkingSpaceCreateFeeCmd extends Cmd {
         Assert.hasKeyAndValue(reqJson, "locationObjId", "未包含收费对象");
         Assert.hasKeyAndValue(reqJson, "configId", "未包含收费项目");
         Assert.hasKeyAndValue(reqJson, "storeId", "未包含商户ID");
-        //Assert.hasKeyAndValue(reqJson, "startTime", "未包含费用起始时间");
+        Assert.hasKeyAndValue(reqJson, "startTime", "未包含费用起始时间");
+        Assert.hasKeyAndValue(reqJson, "endTime", "未包含费用结束时间");
+
+        String endTime = reqJson.getString("endTime");
+        if (!endTime.contains(":")) {
+            endTime += " 23:59:59";
+            reqJson.put("endTime", endTime);
+        }
     }
 
     @Override
@@ -93,19 +100,6 @@ public class SaveParkingSpaceCreateFeeCmd extends Cmd {
         reqJson.put("feeFlag", feeConfigDtos.get(0).getFeeFlag());
         reqJson.put("configEndTime", feeConfigDtos.get(0).getEndTime());
 
-        if (!FeeDto.FEE_FLAG_CYCLE.equals(feeConfigDtos.get(0).getFeeFlag()) && reqJson.containsKey("endTime")) {
-            Date endTime = null;
-            Date configEndTime = null;
-            try {
-                endTime = DateUtil.getDateFromString(reqJson.getString("endTime"), DateUtil.DATE_FORMATE_STRING_B);
-                configEndTime = DateUtil.getDateFromString(feeConfigDtos.get(0).getEndTime(), DateUtil.DATE_FORMATE_STRING_A);
-                if (endTime.getTime() > configEndTime.getTime()) {
-                    throw new IllegalArgumentException("结束时间不能超过费用项时间");
-                }
-            } catch (ParseException e) {
-                throw new IllegalArgumentException("结束时间错误" + reqJson.getString("endTime"));
-            }
-        }
         //生成批次
         generatorBatch(reqJson);
         //判断收费范围
@@ -224,11 +218,9 @@ public class SaveParkingSpaceCreateFeeCmd extends Cmd {
         for (int ownerCarIndex = 0; ownerCarIndex < ownerCarDtos.size(); ownerCarIndex++) {
             curFailRoomCount++;
             feePos.add(BeanConvertUtil.covertBean(feeBMOImpl.addFee(ownerCarDtos.get(ownerCarIndex), reqJson, context), PayFeePo.class));
+            feeAttrsPos.add(feeBMOImpl.addFeeAttr(reqJson, context, FeeAttrDto.SPEC_CD_ONCE_FEE_DEADLINE_TIME,
+                    reqJson.getString("endTime")));
             if (!StringUtil.isEmpty(ownerCarDtos.get(ownerCarIndex).getOwnerId())) {
-                if (!FeeDto.FEE_FLAG_CYCLE.equals(reqJson.getString("feeFlag"))) {
-                    feeAttrsPos.add(feeBMOImpl.addFeeAttr(reqJson, context, FeeAttrDto.SPEC_CD_ONCE_FEE_DEADLINE_TIME,
-                            reqJson.containsKey("endTime") ? reqJson.getString("endTime") : reqJson.getString("configEndTime")));
-                }
                 feeAttrsPos.add(feeBMOImpl.addFeeAttr(reqJson, context, FeeAttrDto.SPEC_CD_OWNER_ID, ownerCarDtos.get(ownerCarIndex).getOwnerId()));
                 feeAttrsPos.add(feeBMOImpl.addFeeAttr(reqJson, context, FeeAttrDto.SPEC_CD_OWNER_LINK, ownerCarDtos.get(ownerCarIndex).getLink()));
                 feeAttrsPos.add(feeBMOImpl.addFeeAttr(reqJson, context, FeeAttrDto.SPEC_CD_OWNER_NAME, ownerCarDtos.get(ownerCarIndex).getOwnerName()));

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

@@ -83,6 +83,14 @@ public class SaveRoomCreateFeeCmd extends Cmd {
         Assert.hasKeyAndValue(reqJson, "locationObjId", "未包含收费对象");
         Assert.hasKeyAndValue(reqJson, "configId", "未包含收费项目");
         Assert.hasKeyAndValue(reqJson, "storeId", "未包含商户ID");
+        Assert.hasKeyAndValue(reqJson, "startTime", "未包含计费起始时间");
+        Assert.hasKeyAndValue(reqJson, "endTime", "未包含计费结束时间");
+
+        String endTime = reqJson.getString("endTime");
+        if (!endTime.contains(":")) {
+            endTime += " 23:59:59";
+            reqJson.put("endTime", endTime);
+        }
 
         FeeConfigDto feeConfigDto = new FeeConfigDto();
         feeConfigDto.setCommunityId(reqJson.getString("communityId"));
@@ -93,18 +101,6 @@ public class SaveRoomCreateFeeCmd extends Cmd {
         reqJson.put("feeFlag", feeConfigDtos.get(0).getFeeFlag());
         reqJson.put("configEndTime", feeConfigDtos.get(0).getEndTime());
 
-
-        if (!FeeDto.FEE_FLAG_CYCLE.equals(feeConfigDtos.get(0).getFeeFlag()) && reqJson.containsKey("endTime")) {
-            Date endTime = null;
-            Date configEndTime = null;
-
-            endTime = DateUtil.getDateFromStringB(reqJson.getString("endTime"));
-            configEndTime = DateUtil.getDateFromStringA(feeConfigDtos.get(0).getEndTime());
-            if (endTime.getTime() > configEndTime.getTime()) {
-                throw new IllegalArgumentException("结束时间不能超过费用项时间");
-            }
-        }
-
         if (FeeConfigDto.COMPUTING_FORMULA_RANT_RATE.equals(feeConfigDtos.get(0).getComputingFormula())) {
             Assert.hasKeyAndValue(reqJson, "rateCycle", "未包含递增周期");
             Assert.hasKeyAndValue(reqJson, "rate", "未包含递增率");
@@ -169,10 +165,12 @@ public class SaveRoomCreateFeeCmd extends Cmd {
             return;
         }
 
+        feeAttrsPos.add(feeBMOImpl.addFeeAttr(reqJson,
+                context,
+                FeeAttrDto.SPEC_CD_ONCE_FEE_DEADLINE_TIME,
+                reqJson.getString("endTime")));
+
         if (!StringUtil.isEmpty(roomDto.getOwnerId())) {
-            if (!FeeDto.FEE_FLAG_CYCLE.equals(reqJson.getString("feeFlag"))) {
-                feeAttrsPos.add(feeBMOImpl.addFeeAttr(reqJson, context, FeeAttrDto.SPEC_CD_ONCE_FEE_DEADLINE_TIME, reqJson.containsKey("endTime") ? reqJson.getString("endTime") : reqJson.getString("configEndTime")));
-            }
             feeAttrsPos.add(feeBMOImpl.addFeeAttr(reqJson, context, FeeAttrDto.SPEC_CD_OWNER_ID, roomDto.getOwnerId()));
             feeAttrsPos.add(feeBMOImpl.addFeeAttr(reqJson, context, FeeAttrDto.SPEC_CD_OWNER_LINK, roomDto.getLink()));
             feeAttrsPos.add(feeBMOImpl.addFeeAttr(reqJson, context, FeeAttrDto.SPEC_CD_OWNER_NAME, roomDto.getOwnerName()));

service-fee/src/main/java/com/java110/fee/cmd/meterWater/SaveProxyFeeCmd.java

@@ -74,6 +74,12 @@ public class SaveProxyFeeCmd extends Cmd {
         Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含communityId");
         Assert.hasKeyAndValue(reqJson, "startTime", "请求报文中未包含开始时间");
         Assert.hasKeyAndValue(reqJson, "endTime", "请求报文中未包含结束时间");
+
+        String endTime = reqJson.getString("endTime");
+        if (!endTime.contains(":")) {
+            endTime += " 23:59:59";
+            reqJson.put("endTime", endTime);
+        }
     }
 
     @Override

service-job/src/main/java/com/java110/job/importData/adapt/ImportCustomFeeQueueDataAdapt.java

@@ -84,6 +84,11 @@ public class ImportCustomFeeQueueDataAdapt extends DefaultImportData implements
         JSONObject data = JSONObject.parseObject(assetImportLogDetailDto.getContent());
         ImportCustomCreateFeeDto importExportMeterWaterDto = BeanConvertUtil.covertBean(data, ImportCustomCreateFeeDto.class);
 
+        //todo 处理结束时间
+        if (!importExportMeterWaterDto.getEndTime().contains(":")) {
+            importExportMeterWaterDto.setEndTime(importExportMeterWaterDto.getEndTime() + " 23:59:59");
+        }
+
         String communityId = importExportMeterWaterDto.getCommunityId();
         String batchId = importExportMeterWaterDto.getBatchId();
 

springboot/src/main/java/com/java110/boot/importData/adapt/ImportCustomFeeDataCleaningAdapt.java

@@ -84,7 +84,7 @@ public class ImportCustomFeeDataCleaningAdapt extends DefaultImportDataAdapt imp
             Assert.isDate(createTime, DateUtil.DATE_FORMATE_STRING_B, (osIndex + 1) + "行建账时间格式错误 请填写YYYY-MM-DD 文本格式");
             Assert.isDate(startTime, DateUtil.DATE_FORMATE_STRING_B, (osIndex + 1) + "行计费起始时间格式错误 请填写YYYY-MM-DD 文本格式");
             String endTime = "";
-            if(os.length > 6 && os[6] != null){
+            if (os.length > 6 && os[6] != null) {
                 endTime = excelDoubleToDate(os[6].toString());
                 Assert.isDate(startTime, DateUtil.DATE_FORMATE_STRING_B, (osIndex + 1) + "行计费结束时间格式错误 请填写YYYY-MM-DD 文本格式");
             }

springboot/src/main/java/com/java110/boot/smo/assetExport/impl/ExportRoomSMOImpl.java

@@ -175,7 +175,7 @@ public class ExportRoomSMOImpl extends DefaultAbstractComponentSMO implements IE
         cell0.setCellValue("费用名称: 请填写系统中费用类型，如物业费，押金等 ；\n计费起始时间: " +
                 "计费起始时间，格式为YYYY-MM-DD；\n计费结束时间，格式为YYYY-MM-DD；\n" +
                 "建账时间: 建账时间，格式为YYYY-MM-DD； \n 类型：表明是合同 房屋 还是车辆 房屋 1001 车辆 2002 合同 3003" +
-                "\n注意：所有单元格式为文本，计费结束时间只有一次性费用和间接性费用时需要填写");
+                "\n注意：所有单元格式为文本");
         CellStyle cs = workbook.createCellStyle();
         cs.setWrapText(true);  //关键
         cell0.setCellStyle(cs);

springboot/src/main/java/com/java110/boot/smo/assetImport/impl/ImportRoomFeeSMOImpl.java

@@ -209,8 +209,7 @@ public class ImportRoomFeeSMOImpl extends DefaultAbstractComponentSMO implements
                 tmpImportRoomFees = new ArrayList<>();
             }
         }
-        if (tmpImportRoomFees != null && tmpImportRoomFees.size() > 0) {
-
+        if (!ListUtil.isNull(tmpImportRoomFees)) {
             createRoomFee(pd, tmpImportRoomFees, data, paramOut);
         }
         return ResultVo.createResponseEntity(ResultVo.CODE_OK, "成功：" + paramOut.getString("successCount") + ",失败：" + paramOut.getString("errorCount"));