Lianxun_Java.git

			@@ -12,7 +12,7 @@
			import com.java110.dto.fee.FeeDto;
			import com.java110.dto.owner.OwnerCarDto;
			import com.java110.dto.parking.ParkingSpaceDto;
			import com.java110.dto.payFeeBatch.PayFeeBatchDto;
			import com.java110.dto.payFee.PayFeeBatchDto;
			import com.java110.dto.user.UserDto;
			import com.java110.fee.bmo.fee.IFeeBMO;
			import com.java110.intf.community.IParkingSpaceInnerServiceSMO;
			@@ -24,7 +24,7 @@
			import com.java110.intf.user.IUserInnerServiceSMO;
			import com.java110.po.fee.FeeAttrPo;
			import com.java110.po.fee.PayFeePo;
			import com.java110.po.payFeeBatch.PayFeeBatchPo;
			import com.java110.po.payFee.PayFeeBatchPo;
			import com.java110.utils.exception.CmdException;
			import com.java110.utils.util.Assert;
			import com.java110.utils.util.BeanConvertUtil;
			@@ -91,7 +91,7 @@
			reqJson.put("feeFlag", feeConfigDtos.get(0).getFeeFlag());
			reqJson.put("configEndTime", feeConfigDtos.get(0).getEndTime());

			if (FeeDto.FEE_FLAG_ONCE.equals(feeConfigDtos.get(0).getFeeFlag()) && reqJson.containsKey("endTime")) {
			if (!FeeDto.FEE_FLAG_CYCLE.equals(feeConfigDtos.get(0).getFeeFlag()) && reqJson.containsKey("endTime")) {
			Date endTime = null;
			Date configEndTime = null;
			try {
			@@ -227,7 +227,7 @@
			curFailRoomCount++;
			feePos.add(BeanConvertUtil.covertBean(feeBMOImpl.addFee(ownerCarDtos.get(ownerCarIndex), reqJson, context), PayFeePo.class));
			if (!StringUtil.isEmpty(ownerCarDtos.get(ownerCarIndex).getOwnerId())) {
			if (FeeDto.FEE_FLAG_ONCE.equals(reqJson.getString("feeFlag"))) {
			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")));
			}