Lianxun_Java.git

			@@ -776,14 +776,14 @@
			BigDecimal cycles = null;
			Map feePriceAll = computeFeeSMOImpl.getFeePrice(feeDto);
			BigDecimal feePrice = new BigDecimal(feePriceAll.get("feePrice").toString());
			if ("-101".equals(paramInJson.getString("cycles"))) { // 自定义金额交费

			if ("-101".equals(paramInJson.getString("cycles"))) { // todo 自定义金额交费
			Date endTime = feeDto.getEndTime();
			Calendar endCalender = Calendar.getInstance();
			endCalender.setTime(endTime);
			BigDecimal receivedAmount = new BigDecimal(Double.parseDouble(paramInJson.getString("receivedAmount")));
			cycles = receivedAmount.divide(feePrice, 4, BigDecimal.ROUND_HALF_EVEN);
			endCalender = getTargetEndTime(endCalender, cycles.doubleValue());
			targetEndTime = endCalender.getTime();
			targetEndTime = computeFeeSMOImpl.getTargetEndTime(cycles.doubleValue(),endCalender.getTime());
			paramInJson.put("tmpCycles", cycles.doubleValue());
			businessFeeDetail.put("cycles", cycles.doubleValue());
			//处理可能还存在实收手工减免的情况
			@@ -796,7 +796,7 @@
			if (businessFeeDetail.getDoubleValue("receivableAmount") < receivedAmount.doubleValue()) {
			businessFeeDetail.put("receivableAmount", receivedAmount.doubleValue());
			}
			} else if ("-103".equals(paramInJson.getString("cycles"))) { //这里按缴费结束时间缴费
			} else if ("-103".equals(paramInJson.getString("cycles"))) { //todo 这里按缴费结束时间缴费
			String custEndTime = paramInJson.getString("custEndTime");
			if(!custEndTime.contains(":")){
			custEndTime += " 23:59:59";
			@@ -818,14 +818,12 @@
			if (businessFeeDetail.getDoubleValue("receivableAmount") < receivedAmount.doubleValue()) {
			businessFeeDetail.put("receivableAmount", receivedAmount.doubleValue());
			}
			} else if ("-105".equals(paramInJson.getString("cycles"))) { //这里按缴费结束时间缴费
			} else if ("-105".equals(paramInJson.getString("cycles"))) { //这里按自定义时间段
			String customEndTime = paramInJson.getString("customEndTime");
			Date endDates = DateUtil.getDateFromStringB(customEndTime);
			Calendar c = Calendar.getInstance();
			c.setTime(endDates);
			c.add(Calendar.DAY_OF_MONTH, 1);
			endDates = c.getTime();//这是明天
			targetEndTime = endDates;
			if(!customEndTime.contains(":")){
			customEndTime += " 23:59:59";
			}
			targetEndTime = DateUtil.getDateFromStringA(customEndTime);
			BigDecimal receivedAmount1 = new BigDecimal(Double.parseDouble(paramInJson.getString("receivedAmount")));
			cycles = receivedAmount1.divide(feePrice, 4, BigDecimal.ROUND_HALF_EVEN);
			paramInJson.put("tmpCycles", cycles.doubleValue());
			@@ -1213,21 +1211,6 @@
			feeConfigDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(tmpFeeConfigDto);

			tmpPayFeePo.setConfigId(feeConfigDtos.get(0).getConfigId());
			}

			private static Calendar getTargetEndTime(Calendar endCalender, Double cycles) {
			if (StringUtil.isInteger(cycles.toString())) {
			endCalender.add(Calendar.MONTH, new Double(cycles).intValue());
			return endCalender;
			}
			if (cycles >= 1) {
			endCalender.add(Calendar.MONTH, new Double(Math.floor(cycles)).intValue());
			cycles = cycles - Math.floor(cycles);
			}
			int futureDay = endCalender.getActualMaximum(Calendar.DAY_OF_MONTH);
			int hours = new Double(cycles * futureDay * 24).intValue();
			endCalender.add(Calendar.HOUR, hours);
			return endCalender;
			}

			}

	java110-core/src/main/java/com/java110/core/smo/impl/ComputeFeeSMOImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeeCmd.java	35 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -1842,11 +1842,13 @@
			endDate.add(Calendar.MONTH, intMonth.intValue());
			double doubleMonth = month - intMonth;
			if (doubleMonth <= 0) {
			endDate.add(Calendar.SECOND,-1);
			return endDate.getTime();
			}
			int futureDay = endDate.getActualMaximum(Calendar.DAY_OF_MONTH);
			Double hour = doubleMonth * futureDay * 24;
			endDate.add(Calendar.HOUR_OF_DAY, hour.intValue());
			endDate.add(Calendar.SECOND,-1);
			return endDate.getTime();
			}