Lianxun_Java.git

old mode 100644 new mode 100755

			@@ -7,7 +7,7 @@
			import com.java110.dto.fee.FeeDto;
			import com.java110.dto.feeDiscount.ComputeDiscountDto;
			import com.java110.dto.feeDiscount.FeeDiscountDto;
			import com.java110.dto.feeDiscountSpec.FeeDiscountSpecDto;
			import com.java110.dto.feeDiscount.FeeDiscountSpecDto;
			import com.java110.dto.payFeeConfigDiscount.PayFeeConfigDiscountDto;
			import com.java110.fee.dao.IFeeDiscountServiceDao;
			import com.java110.fee.discount.IComputeDiscount;
			@@ -169,6 +169,9 @@
			List<ComputeDiscountDto> computeDiscountDtoList = new ArrayList<>();
			for (ComputeDiscountDto computeDiscountDto : computeDiscountDtos) {
			computeDiscountDto.setValue(value);
			if (!StringUtil.isEmpty(computeDiscountDto.getDiscountType()) && "3003".equals(computeDiscountDto.getDiscountType())) {
			computeDiscountDto.setArdId(feeDetailDto.getArdId());
			}
			computeDiscountDtoList.add(computeDiscountDto);
			}
			return computeDiscountDtos;
			@@ -195,6 +198,9 @@
			List<ComputeDiscountDto> computeDiscountDtoList = new ArrayList<>();
			for (ComputeDiscountDto computeDiscountDto : computeDiscountDtos) {
			computeDiscountDto.setValue(value);
			if (!StringUtil.isEmpty(computeDiscountDto.getDiscountType()) && "3003".equals(computeDiscountDto.getDiscountType())) {
			computeDiscountDto.setArdId(feeDetailDto.getArdId());
			}
			computeDiscountDtoList.add(computeDiscountDto);
			}
			return computeDiscountDtoList;
			@@ -206,6 +212,8 @@
			ApplyRoomDiscountDto applyRoomDiscountDto = new ApplyRoomDiscountDto();
			//审核已通过
			applyRoomDiscountDto.setState("4");
			//是否可用状态标识(0表示在用；1表示不可用)
			applyRoomDiscountDto.setInUse("0");
			//小区ID
			applyRoomDiscountDto.setCommunityId(feeDetailDto.getCommunityId());
			//房屋id
			@@ -216,6 +224,7 @@
			c.setTime(feeDetailDto.getStartTime());
			double month = Double.parseDouble(feeDetailDto.getCycles());
			c.add(Calendar.MONTH, (int) month);
			c.add(Calendar.DAY_OF_MONTH, -5);//这里根据设置时间荣誉5天
			Date endTime = c.getTime();
			applyRoomDiscountDto.setEndTime(simpleDateFormat.format(endTime));
			//查询折扣申请表
			@@ -224,6 +233,8 @@
			if (applyRoomDiscountDtos != null && applyRoomDiscountDtos.size() > 0) {
			//获取优惠id
			String discountId = applyRoomDiscountDtos.get(0).getDiscountId();
			String ardId = applyRoomDiscountDtos.get(0).getArdId();
			feeDetailDto.setArdId(ardId);
			PayFeeConfigDiscountDto payFeeConfigDiscount = new PayFeeConfigDiscountDto();
			payFeeConfigDiscount.setCommunityId(applyRoomDiscountDtos.get(0).getCommunityId());
			payFeeConfigDiscount.setDiscountId(discountId);