2025/platformx-business-finance.git

			@@ -62,6 +62,7 @@
			private final PaymentSlipMapper paymentSlipMapper;
			private final BipRequestRecordMapper bipRequestRecordMapper;
			private final ContractExecDateMapper contractExecDateMapper;
			private final MeterReadRecordMapper meterReadRecordMapper;
			private final RemoteDeptService remoteDeptService;
			private final RedisTemplate redisTemplate;

			@@ -141,6 +142,7 @@
			entity.setConfirmTime(new Date());
			baseMapper.insert(entity);
			}

			//更新付款阶段付款
			List<ContractPaymentSchedule> scheduleList = contractPaymentScheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery()
			.eq(ContractPaymentSchedule::getContractId, contract.getId()).ne(ContractPaymentSchedule::getPaymentStatus, 2).ne(ContractPaymentSchedule::getPaymentStatus, 3)
			@@ -192,6 +194,9 @@
			}
			}
			}
			}
			//非房屋租赁水电
			if (!StrUtil.equals(contract.getContractCategory(), "water_house")) {
			//更新合同已付款
			BigDecimal paid = new BigDecimal("0");
			if (ObjUtil.isNotNull(contract.getPaidAmount())) {
			@@ -199,10 +204,31 @@
			}
			paid = paid.add(addDTO.getTransationAmount());
			contract.setPaidAmount(paid);
			if (paid.compareTo(contract.getAmount()) > 0) {
			if (paid.compareTo(contract.getAmount()) == 0) {
			contract.setContractStatus(3);
			contract.setPaidAmount(contract.getAmount());
			}
			contractService.updateById(contract);
			}else {
			List<ContractExecDate> execDateList = contractExecDateMapper.selectList(Wrappers.<ContractExecDate>lambdaQuery().eq(ContractExecDate::getContractId,contract.getId())
			.eq(ContractExecDate::getGenFlag,"0"));
			List<MeterReadRecord> recordList = meterReadRecordMapper.selectList(Wrappers.<MeterReadRecord>lambdaQuery()
			.eq(MeterReadRecord::getContractId,contract.getId())
			.isNull(MeterReadRecord::getMeterReadNum));
			if (ArrayUtil.isEmpty(execDateList.toArray())&&ArrayUtil.isEmpty(recordList.toArray())){
			//更新合同已付款
			BigDecimal paid = new BigDecimal("0");
			if (ObjUtil.isNotNull(contract.getPaidAmount())) {
			paid = contract.getPaidAmount();
			}
			paid = paid.add(addDTO.getTransationAmount());
			contract.setPaidAmount(paid);
			if (contract.getAmount().compareTo(new BigDecimal("0"))==0&&paid.compareTo(contract.getAmount()) >= 0) {
			contract.setContractStatus(3);
			contract.setPaidAmount(contract.getAmount());
			}
			contractService.updateById(contract);
			}
			}
			//转出
			if (StrUtil.equals(addDTO.getInOrOut(), "2")) {
			@@ -227,209 +253,203 @@
			entity.setConfirmTime(new Date());
			baseMapper.insert(entity);
			}
			// 查询所有付款阶段是否都付款完成
			List<ContractPaymentSchedule> scheduleList = contractPaymentScheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery().eq(ContractPaymentSchedule::getContractId, contract.getId()));
			if (ArrayUtil.isNotEmpty(scheduleList.toArray())) {
			if (scheduleList.stream().allMatch(item -> Objects.equals(item.getPaymentStatus(), 2))) {
			contract.setContractStatus(3);
			contractService.updateById(contract);
			}
			;
			}
			}else {

			List<Contract> customerContractList = contractService.list(Wrappers.<Contract>lambdaQuery().eq(Contract::getPartyAId, addDTO.getBusGuestId())
			.eq(Contract::getPartyBId,SecurityUtils.getUser().getCompId()).orderByAsc(Contract::getCreateTime).apply(" amount != paid_amount"));
			if (ArrayUtil.isEmpty(customerContractList.toArray())) {
			return R.failed("为查询到未付款合同");
			}
			BusinessCustomer customer = businessCustomerService.getOne(Wrappers.<BusinessCustomer>lambdaQuery()
			.eq(StrUtil.isNotBlank(addDTO.getBusGuestName()), BusinessCustomer::getRegisterName, addDTO.getBusGuestName())
			.eq(ObjUtil.isNotNull(addDTO.getBusGuestId()), BusinessCustomer::getId, addDTO.getBusGuestId())
			.last("limit 1"));
			if (ObjUtil.isNull(customer)) {
			return R.failed("客商查询失败");
			}
			//新增付款单
			PaymentSlip slip = new PaymentSlip();
			slip.setBusGuestId(customer.getId());
			slip.setBusGuestName(customer.getRegisterName());
			slip.setPayeeCompId(SecurityUtils.getUser().getCompId());
			slip.setPaymentTime(addDTO.getConfirmTime());
			slip.setPaymentAmount(addDTO.getTransationAmount());
			slip.setPayType(addDTO.getPayType());
			paymentSlipMapper.insert(slip);

			BigDecimal transtionAmount = addDTO.getTransationAmount();
			//剩余付款
			BigDecimal transtionRemainAmount = transtionAmount;
			//收到付款的合同
			List<Contract> payContractList = new ArrayList<>();
			//付款完成的合同
			List<Contract> payCompleteContractList = new ArrayList<>();
			//付款未完成的合同
			List<Contract> payNoCompleteContractList = new ArrayList<>();
			//有预付款的合同
			List<Contract> advanceContractList = new ArrayList<>();
			//付款时间
			Date payDate = addDTO.getConfirmTime();
			Iterator<Contract> iterator = customerContractList.iterator();
			while (iterator.hasNext()) {
			Contract contract = iterator.next();
			PaymentConfirm lastConfirm = baseMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId, contract.getId())
			.orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
			BigDecimal lastTotal = new BigDecimal("0");
			if (ObjUtil.isNotNull(lastConfirm)) {
			lastTotal = lastConfirm.getTotalAmount();
			}else {

			}

			//合同最近明细总额为0 或 > 0 情况下
			if (lastTotal.compareTo(new BigDecimal("0")) >= 0) {
			log.info("当前合同号：{},明细总额无应收款", contract.getContractNo());
			advanceContractList.add(contract);
			if (iterator.hasNext()) {
			continue;
			}
			}

			transtionRemainAmount = transtionRemainAmount.add(lastTotal);
			PaymentConfirm entity = new PaymentConfirm();
			entity.setContractId(contract.getId());
			entity.setContractName(contract.getContractName());
			entity.setContractNo(contract.getContractNo());
			if (ObjUtil.isNotNull(lastConfirm)) {
			entity.setScheduleId(lastConfirm.getScheduleId());
			entity.setScheduleName(lastConfirm.getScheduleName());
			}
			entity.setBusGuestId(customer.getId());
			entity.setBusGuestName(customer.getRegisterName());
			entity.setBusinessType("客户付款");
			if (transtionRemainAmount.compareTo(new BigDecimal("0")) > 0) {
			entity.setConfirmTime(payDate);
			// 判断是否是最后一个
			if (!iterator.hasNext()) {
			entity.setTransationAmount(transtionRemainAmount.subtract(lastTotal));
			entity.setAdvanceAmount(transtionRemainAmount);
			entity.setTotalAmount(transtionRemainAmount);
			}else {
			entity.setTransationAmount(lastTotal.multiply(new BigDecimal("-1")));
			entity.setTotalAmount(new BigDecimal("0"));
			}
			baseMapper.insert(entity);
			payContractList.add(contract);
			} else if (transtionRemainAmount.compareTo(new BigDecimal("0")) == 0) {
			entity.setTransationAmount(lastTotal.multiply(new BigDecimal("-1")));
			entity.setTotalAmount(new BigDecimal("0"));
			entity.setConfirmTime(payDate);
			baseMapper.insert(entity);
			payContractList.add(contract);
			break;
			} else {
			entity.setTransationAmount(transtionRemainAmount.subtract(lastTotal));
			entity.setReceivableAmount(transtionRemainAmount.multiply(new BigDecimal("-1")));
			entity.setTotalAmount(transtionRemainAmount);
			entity.setConfirmTime(payDate);
			baseMapper.insert(entity);
			payContractList.add(contract);
			break;
			}
			}

			payContractList.stream().forEach(contract -> {
			//更新付款阶段付款
			List<ContractPaymentSchedule> scheduleList = contractPaymentScheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery()
			.eq(ContractPaymentSchedule::getContractId, contract.getId()).ne(ContractPaymentSchedule::getPaymentStatus, 2)
			.ne(ContractPaymentSchedule::getPaymentStatus, 3)
			.orderByAsc(ContractPaymentSchedule::getCreateTime));
			if (ArrayUtil.isNotEmpty(scheduleList.toArray())) {
			BigDecimal remain = transtionAmount;
			for (ContractPaymentSchedule schedule : scheduleList) {
			BigDecimal lastRemain = remain;
			remain = lastRemain.subtract(StrUtil.equals(schedule.getPaymentStatus() + "", "0") ? schedule.getPlannedAmount() :
			schedule.getPlannedAmount().subtract(schedule.getActualAmount()));
			if (remain.compareTo(new BigDecimal("0")) >= 0) {
			schedule.setActualAmount(schedule.getPlannedAmount());
			schedule.setPaymentDate(payDate);
			schedule.setPaymentStatus(2);
			contractPaymentScheduleMapper.updateById(schedule);
			//查询是否有当前逾期
			CurrentOverdue currentOverdue = currentOverdueMapper.selectOne(Wrappers.<CurrentOverdue>lambdaQuery().eq(CurrentOverdue::getScheduleId, schedule.getId())
			.eq(CurrentOverdue::getContractId, schedule.getContractId()).last("limit 1"));
			if (ObjUtil.isNotNull(currentOverdue)) {
			//新增逾期历史
			HistoryOverdue historyOverdue = BeanUtil.copyProperties(currentOverdue, HistoryOverdue.class, "id");
			historyOverdue.setPaymentTime(payDate);
			historyOverdue.setCompId(schedule.getCompId());
			historyOverdueMapper.insert(historyOverdue);
			//删除当前逾期
			currentOverdueMapper.deleteById(currentOverdue);
			}
			} else {
			schedule.setActualAmount(StrUtil.equals(schedule.getPaymentStatus() + "", "0") ? schedule.getPlannedAmount().add(remain) :
			schedule.getActualAmount().add(lastRemain));
			schedule.setPaymentDate(payDate);
			schedule.setPaymentStatus(1);
			contractPaymentScheduleMapper.updateById(schedule);
			//查询是否有当前逾期
			CurrentOverdue currentOverdue = currentOverdueMapper.selectOne(Wrappers.<CurrentOverdue>lambdaQuery().eq(CurrentOverdue::getScheduleId, schedule.getId())
			.eq(CurrentOverdue::getContractId, schedule.getContractId()).last("limit 1"));
			if (ObjUtil.isNotNull(currentOverdue)) {
			//新增逾期历史
			HistoryOverdue historyOverdue = BeanUtil.copyProperties(currentOverdue, HistoryOverdue.class, "id");
			historyOverdue.setReceivableAmount(lastRemain);
			historyOverdue.setPaymentTime(payDate);
			historyOverdue.setCompId(schedule.getCompId());
			historyOverdueMapper.insert(historyOverdue);
			//查询历史已付逾期金额
			List<HistoryOverdue> historyOverdueList = historyOverdueMapper.selectList(Wrappers.<HistoryOverdue>lambdaQuery().eq(HistoryOverdue::getScheduleId, currentOverdue.getScheduleId()));
			BigDecimal hisTotal = historyOverdueList.stream().map(item -> item.getReceivableAmount()).reduce(BigDecimal.ZERO, BigDecimal::add);
			//更新当前逾期
			currentOverdue.setReceivableAmount(schedule.getPlannedAmount().subtract(hisTotal));
			currentOverdueMapper.updateById(currentOverdue);
			}
			break;
			}
			}
			}
			//合同所有付款阶段
			List<ContractPaymentSchedule> payComScheduleList = contractPaymentScheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery()
			.eq(ContractPaymentSchedule::getContractId, contract.getId()).ne(ContractPaymentSchedule::getPaymentStatus, 0)
			.ne(ContractPaymentSchedule::getPaymentStatus, 3));
			if (ArrayUtil.isNotEmpty(payComScheduleList.toArray())){
			BigDecimal payTotal = payComScheduleList.stream().map(item->StrUtil.equals(item.getPaymentStatus() + "", "2") ? item.getPlannedAmount() :
			item.getActualAmount()).reduce(BigDecimal.ZERO,BigDecimal::add);
			contract.setPaidAmount(payTotal);
			// if (payComScheduleList.stream().allMatch(item -> Objects.equals(item.getPaymentStatus(), 2))) {
			// contract.setContractStatus(3);
			// else {
			//
			// List<Contract> customerContractList = contractService.list(Wrappers.<Contract>lambdaQuery().eq(Contract::getPartyAId, addDTO.getBusGuestId())
			// .eq(Contract::getPartyBId, SecurityUtils.getUser().getCompId()).orderByAsc(Contract::getCreateTime)
			// .apply(" ((contract_category != 'water_house' and amount != paid_amount) or contract_category = 'water_house')"));
			// if (ArrayUtil.isEmpty(customerContractList.toArray())) {
			// return R.failed("为查询到未付款合同");
			// }
			if (contract.getAmount().compareTo(contract.getPaidAmount()) == 0) {
			contract.setBillingStatus("2");
			contract.setContractStatus(3);
			payCompleteContractList.add(contract);
			}
			//付款且付款未全付
			if (contract.getAmount().compareTo(contract.getPaidAmount()) > 0) {
			payNoCompleteContractList.add(contract);
			}
			if (StrUtil.isNotEmpty(contract.getContractCategory())&&StrUtil.equals(contract.getContractCategory(),"water_house")){
			List<ContractExecDate> execDateList = contractExecDateMapper.selectList(Wrappers.<ContractExecDate>lambdaQuery()
			.eq(ContractExecDate::getContractId,contract.getId()).eq(ContractExecDate::getGenFlag,"0"));
			if (ArrayUtil.isEmpty(execDateList.toArray())){
			List<ContractPaymentSchedule> contractPaymentScheduleList = contractPaymentScheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery()
			.eq(ContractPaymentSchedule::getContractId, contract.getId()));
			if (ArrayUtil.isNotEmpty(contractPaymentScheduleList.toArray())&&contractPaymentScheduleList.stream().allMatch(item -> Objects.equals(item.getPaymentStatus(), 2))) {
			contract.setContractStatus(3);
			contractService.updateById(contract);
			}
			}
			}else {
			contractService.updateById(contract);
			}

			}
			});
			// BusinessCustomer customer = businessCustomerService.getOne(Wrappers.<BusinessCustomer>lambdaQuery()
			// .eq(StrUtil.isNotBlank(addDTO.getBusGuestName()), BusinessCustomer::getRegisterName, addDTO.getBusGuestName())
			// .eq(ObjUtil.isNotNull(addDTO.getBusGuestId()), BusinessCustomer::getId, addDTO.getBusGuestId())
			// .last("limit 1"));
			// if (ObjUtil.isNull(customer)) {
			// return R.failed("客商查询失败");
			// }
			// //新增付款单
			// PaymentSlip slip = new PaymentSlip();
			// slip.setBusGuestId(customer.getId());
			// slip.setBusGuestName(customer.getRegisterName());
			// slip.setPayeeCompId(SecurityUtils.getUser().getCompId());
			// slip.setPaymentTime(addDTO.getConfirmTime());
			// slip.setPaymentAmount(addDTO.getTransationAmount());
			// slip.setPayType(addDTO.getPayType());
			// paymentSlipMapper.insert(slip);
			//
			// BigDecimal transtionAmount = addDTO.getTransationAmount();
			// //剩余付款
			// BigDecimal transtionRemainAmount = transtionAmount;
			// //收到付款的合同
			// List<Contract> payContractList = new ArrayList<>();
			// //付款完成的合同
			// List<Contract> payCompleteContractList = new ArrayList<>();
			// //付款未完成的合同
			// List<Contract> payNoCompleteContractList = new ArrayList<>();
			// //有预付款的合同
			// List<Contract> advanceContractList = new ArrayList<>();
			// //付款时间
			// Date payDate = addDTO.getConfirmTime();
			// Iterator<Contract> iterator = customerContractList.iterator();
			// while (iterator.hasNext()) {
			// Contract contract = iterator.next();
			// PaymentConfirm lastConfirm = baseMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId, contract.getId())
			// .orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
			// BigDecimal lastTotal = new BigDecimal("0");
			// if (ObjUtil.isNotNull(lastConfirm)) {
			// lastTotal = lastConfirm.getTotalAmount();
			// } else {
			//
			// }
			//
			// //合同最近明细总额为0 或 > 0 情况下
			// if (lastTotal.compareTo(new BigDecimal("0")) >= 0) {
			// log.info("当前合同号：{},明细总额无应收款", contract.getContractNo());
			// advanceContractList.add(contract);
			// if (iterator.hasNext()) {
			// continue;
			// }
			// }
			//
			// transtionRemainAmount = transtionRemainAmount.add(lastTotal);
			// PaymentConfirm entity = new PaymentConfirm();
			// entity.setContractId(contract.getId());
			// entity.setContractName(contract.getContractName());
			// entity.setContractNo(contract.getContractNo());
			// if (ObjUtil.isNotNull(lastConfirm)) {
			// entity.setScheduleId(lastConfirm.getScheduleId());
			// entity.setScheduleName(lastConfirm.getScheduleName());
			// }
			// entity.setBusGuestId(customer.getId());
			// entity.setBusGuestName(customer.getRegisterName());
			// entity.setBusinessType("客户付款");
			// if (transtionRemainAmount.compareTo(new BigDecimal("0")) > 0) {
			// entity.setConfirmTime(payDate);
			// // 判断是否是最后一个
			// if (!iterator.hasNext()) {
			// entity.setTransationAmount(transtionRemainAmount.subtract(lastTotal));
			// entity.setAdvanceAmount(transtionRemainAmount);
			// entity.setTotalAmount(transtionRemainAmount);
			// } else {
			// entity.setTransationAmount(lastTotal.multiply(new BigDecimal("-1")));
			// entity.setTotalAmount(new BigDecimal("0"));
			// }
			// baseMapper.insert(entity);
			// payContractList.add(contract);
			// } else if (transtionRemainAmount.compareTo(new BigDecimal("0")) == 0) {
			// entity.setTransationAmount(lastTotal.multiply(new BigDecimal("-1")));
			// entity.setTotalAmount(new BigDecimal("0"));
			// entity.setConfirmTime(payDate);
			// baseMapper.insert(entity);
			// payContractList.add(contract);
			// break;
			// } else {
			// entity.setTransationAmount(transtionRemainAmount.subtract(lastTotal));
			// entity.setReceivableAmount(transtionRemainAmount.multiply(new BigDecimal("-1")));
			// entity.setTotalAmount(transtionRemainAmount);
			// entity.setConfirmTime(payDate);
			// baseMapper.insert(entity);
			// payContractList.add(contract);
			// break;
			// }
			// }
			//
			// payContractList.stream().forEach(contract -> {
			// //更新付款阶段付款
			// List<ContractPaymentSchedule> scheduleList = contractPaymentScheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery()
			// .eq(ContractPaymentSchedule::getContractId, contract.getId()).ne(ContractPaymentSchedule::getPaymentStatus, 2)
			// .ne(ContractPaymentSchedule::getPaymentStatus, 3)
			// .orderByAsc(ContractPaymentSchedule::getCreateTime));
			// if (ArrayUtil.isNotEmpty(scheduleList.toArray())) {
			// BigDecimal remain = transtionAmount;
			// for (ContractPaymentSchedule schedule : scheduleList) {
			// BigDecimal lastRemain = remain;
			// remain = lastRemain.subtract(StrUtil.equals(schedule.getPaymentStatus() + "", "0") ? schedule.getPlannedAmount() :
			// schedule.getPlannedAmount().subtract(schedule.getActualAmount()));
			// if (remain.compareTo(new BigDecimal("0")) >= 0) {
			// schedule.setActualAmount(schedule.getPlannedAmount());
			// schedule.setPaymentDate(payDate);
			// schedule.setPaymentStatus(2);
			// contractPaymentScheduleMapper.updateById(schedule);
			// //查询是否有当前逾期
			// CurrentOverdue currentOverdue = currentOverdueMapper.selectOne(Wrappers.<CurrentOverdue>lambdaQuery().eq(CurrentOverdue::getScheduleId, schedule.getId())
			// .eq(CurrentOverdue::getContractId, schedule.getContractId()).last("limit 1"));
			// if (ObjUtil.isNotNull(currentOverdue)) {
			// //新增逾期历史
			// HistoryOverdue historyOverdue = BeanUtil.copyProperties(currentOverdue, HistoryOverdue.class, "id");
			// historyOverdue.setPaymentTime(payDate);
			// historyOverdue.setCompId(schedule.getCompId());
			// historyOverdueMapper.insert(historyOverdue);
			// //删除当前逾期
			// currentOverdueMapper.deleteById(currentOverdue);
			// }
			// } else {
			// schedule.setActualAmount(StrUtil.equals(schedule.getPaymentStatus() + "", "0") ? schedule.getPlannedAmount().add(remain) :
			// schedule.getActualAmount().add(lastRemain));
			// schedule.setPaymentDate(payDate);
			// schedule.setPaymentStatus(1);
			// contractPaymentScheduleMapper.updateById(schedule);
			// //查询是否有当前逾期
			// CurrentOverdue currentOverdue = currentOverdueMapper.selectOne(Wrappers.<CurrentOverdue>lambdaQuery().eq(CurrentOverdue::getScheduleId, schedule.getId())
			// .eq(CurrentOverdue::getContractId, schedule.getContractId()).last("limit 1"));
			// if (ObjUtil.isNotNull(currentOverdue)) {
			// //新增逾期历史
			// HistoryOverdue historyOverdue = BeanUtil.copyProperties(currentOverdue, HistoryOverdue.class, "id");
			// historyOverdue.setReceivableAmount(lastRemain);
			// historyOverdue.setPaymentTime(payDate);
			// historyOverdue.setCompId(schedule.getCompId());
			// historyOverdueMapper.insert(historyOverdue);
			// //查询历史已付逾期金额
			// List<HistoryOverdue> historyOverdueList = historyOverdueMapper.selectList(Wrappers.<HistoryOverdue>lambdaQuery().eq(HistoryOverdue::getScheduleId, currentOverdue.getScheduleId()));
			// BigDecimal hisTotal = historyOverdueList.stream().map(item -> item.getReceivableAmount()).reduce(BigDecimal.ZERO, BigDecimal::add);
			// //更新当前逾期
			// currentOverdue.setReceivableAmount(schedule.getPlannedAmount().subtract(hisTotal));
			// currentOverdueMapper.updateById(currentOverdue);
			// }
			// break;
			// }
			// }
			// }
			// //合同所有付款阶段
			// List<ContractPaymentSchedule> payComScheduleList = contractPaymentScheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery()
			// .eq(ContractPaymentSchedule::getContractId, contract.getId()).ne(ContractPaymentSchedule::getPaymentStatus, 0)
			// .ne(ContractPaymentSchedule::getPaymentStatus, 3));
			// if (ArrayUtil.isNotEmpty(payComScheduleList.toArray())) {
			// BigDecimal payTotal = payComScheduleList.stream().map(item -> StrUtil.equals(item.getPaymentStatus() + "", "2") ? item.getPlannedAmount() :
			// item.getActualAmount()).reduce(BigDecimal.ZERO, BigDecimal::add);
			// contract.setPaidAmount(payTotal);
			//// if (payComScheduleList.stream().allMatch(item -> Objects.equals(item.getPaymentStatus(), 2))) {
			//// contract.setContractStatus(3);
			//// }
			// if (contract.getAmount().compareTo(contract.getPaidAmount()) == 0) {
			//
			// contract.setContractStatus(3);
			// payCompleteContractList.add(contract);
			// }
			// //付款且付款未全付
			// if (contract.getAmount().compareTo(contract.getPaidAmount()) > 0) {
			// payNoCompleteContractList.add(contract);
			// }
			// if (StrUtil.isNotEmpty(contract.getContractCategory()) && StrUtil.equals(contract.getContractCategory(), "water_house")) {
			// List<ContractExecDate> execDateList = contractExecDateMapper.selectList(Wrappers.<ContractExecDate>lambdaQuery()
			// .eq(ContractExecDate::getContractId, contract.getId()).eq(ContractExecDate::getGenFlag, "0"));
			// if (ArrayUtil.isEmpty(execDateList.toArray())) {
			// List<ContractPaymentSchedule> contractPaymentScheduleList = contractPaymentScheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery()
			// .eq(ContractPaymentSchedule::getContractId, contract.getId()));
			// if (ArrayUtil.isNotEmpty(contractPaymentScheduleList.toArray()) && contractPaymentScheduleList.stream().allMatch(item -> Objects.equals(item.getPaymentStatus(), 2))) {
			// contract.setContractStatus(3);
			// contractService.updateById(contract);
			// }
			// }
			// } else {
			// contractService.updateById(contract);
			// }
			//
			// }
			// });

			//客户预付有剩余且有预付款的合同
			// if (transtionRemainAmount.compareTo(new BigDecimal("0")) > 0) {
			@@ -454,7 +474,7 @@
			//
			// }
			// }
			}
			// }
			return R.ok();
			}

			@@ -750,7 +770,7 @@
			// payCompleteContractList.add(contract);
			// }
			if (contract.getAmount().compareTo(contract.getPaidAmount()) == 0) {
			contract.setBillingStatus("2");
			// contract.setBillingStatus("2");
			contract.setContractStatus(3);
			payCompleteContractList.add(contract);
			}