2025/platformx-business-finance.git

			@@ -14,15 +14,13 @@
			import com.by4cloud.platformx.business.vo.ContractPaymentScheduleVo;
			import com.by4cloud.platformx.business.vo.ScheduleProcessVo;
			import com.by4cloud.platformx.common.core.util.R;
			import com.by4cloud.platformx.common.security.util.SecurityUtils;
			import com.github.yulichang.wrapper.MPJLambdaWrapper;
			import lombok.RequiredArgsConstructor;
			import org.springframework.stereotype.Service;

			import java.math.BigDecimal;
			import java.util.Date;
			import java.util.List;
			import java.util.Map;
			import java.util.Objects;
			import java.util.*;
			import java.util.stream.Collectors;

			/**
			@@ -83,17 +81,17 @@

			//更新当前阶段
			if (ObjUtil.isNull(schedule.getEffectiveDate()) && ObjUtil.isNull(schedule.getEffectiveEndDate())) {
			schedule.setEffectiveDate(DateUtil.offsetDay(addDTO.getProcessDate(), schedule.getAgreedDays()));
			schedule.setEffectiveEndDate(DateUtil.offsetDay(addDTO.getProcessDate(), schedule.getAgreedDays()));
			contractPaymentScheduleMapper.updateById(schedule);
			}

			//查询是否有之前阶段
			ContractPaymentSchedule beforeSchedule = contractPaymentScheduleMapper.selectOne(Wrappers.<ContractPaymentSchedule>lambdaQuery().eq(ContractPaymentSchedule::getContractId, schedule.getContractId())
			.lt(ContractPaymentSchedule::getStageOrder, schedule.getStageOrder()).orderByDesc(ContractPaymentSchedule::getCreateTime).last("limit 1"));
			if (ObjUtil.isNotNull(beforeSchedule) && ObjUtil.isNull(beforeSchedule.getEffectiveEndDate())) {
			beforeSchedule.setEffectiveEndDate(schedule.getEffectiveDate());
			contractPaymentScheduleMapper.updateById(beforeSchedule);
			}
			// //查询是否有之前阶段
			// ContractPaymentSchedule beforeSchedule = contractPaymentScheduleMapper.selectOne(Wrappers.<ContractPaymentSchedule>lambdaQuery().eq(ContractPaymentSchedule::getContractId, schedule.getContractId())
			// .lt(ContractPaymentSchedule::getStageOrder, schedule.getStageOrder()).orderByDesc(ContractPaymentSchedule::getCreateTime).last("limit 1"));
			// if (ObjUtil.isNotNull(beforeSchedule) && ObjUtil.isNull(beforeSchedule.getEffectiveEndDate())) {
			// beforeSchedule.setEffectiveEndDate(schedule.getEffectiveDate());
			// contractPaymentScheduleMapper.updateById(beforeSchedule);
			// }

			List<ContractOutBound> contractOutBoundList = contractOutBoundMapper.selectList(Wrappers.<ContractOutBound>lambdaQuery().eq(ContractOutBound::getContractId, contract.getId())
			.isNotNull(ContractOutBound::getArrivalTime));
			@@ -130,10 +128,66 @@
			BigDecimal lastTotal = new BigDecimal("0");
			if (ObjUtil.isNotNull(lastConfirm)) {
			lastTotal = lastConfirm.getTotalAmount();
			}else {
			//客户付款完成合同
			List<Contract> customerCompleteContractList = contractMapper.selectList(Wrappers.<Contract>lambdaQuery().eq(Contract::getPartyAId, contract.getPartyAId())
			.eq(Contract::getPartyBId, SecurityUtils.getUser().getCompId()).apply(" amount = paid_amount"));
			if (ArrayUtil.isNotEmpty(customerCompleteContractList)){
			List<BigDecimal> outAmountList = new ArrayList<>();
			for (Contract completeContract:customerCompleteContractList
			) {
			PaymentConfirm contractLastConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId,completeContract.getId())
			.orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
			//查询客户付款完成合同中最后明细金额有预收转入当前合同
			if (contractLastConfirm.getTotalAmount().compareTo(new BigDecimal("0"))>0){
			//新增完成付款合同资金转出
			PaymentConfirm outConfirm = BeanUtil.copyProperties(contractLastConfirm,PaymentConfirm.class,"id","transationAmount",
			"advanceAmount","receivableAmount","overdueAmount","totalAmount");
			outConfirm.setBusinessType("资金转出");
			outConfirm.setConfirmTime(new Date());
			outConfirm.setTransationAmount(contractLastConfirm.getTotalAmount());
			outConfirm.setTotalAmount(new BigDecimal("0"));
			paymentConfirmMapper.insert(outConfirm);
			outAmountList.add(outConfirm.getTransationAmount());
			}
			}
			if (ArrayUtil.isNotEmpty(outAmountList.toArray())){
			BigDecimal currentSum = new BigDecimal("0");
			for (BigDecimal currentAmount:outAmountList
			) {
			currentSum=currentSum.add(currentAmount);
			//新增当前合同资金转入
			PaymentConfirm inConfirm = BeanUtil.copyProperties(lastConfirm,PaymentConfirm.class,"id","transationAmount",
			"advanceAmount","receivableAmount","overdueAmount","totalAmount");
			inConfirm.setBusinessType("资金转入");
			inConfirm.setConfirmTime(new Date());
			inConfirm.setTransationAmount(currentSum.subtract(currentAmount));
			inConfirm.setTotalAmount(lastConfirm.getTotalAmount().add(currentSum));
			if (inConfirm.getTotalAmount().compareTo(new BigDecimal("0"))>0){
			inConfirm.setAdvanceAmount(inConfirm.getTotalAmount());
			}else if (inConfirm.getTotalAmount().compareTo(new BigDecimal("0"))<0){
			inConfirm.setReceivableAmount(inConfirm.getTotalAmount().multiply(new BigDecimal("-1")));
			}
			paymentConfirmMapper.insert(inConfirm);
			}
			}
			}
			}
			currentConfim.setTotalAmount(lastTotal.subtract(currentConfim.getReceivableAmount()));
			if (schedule.getPaymentRatio().compareTo(new BigDecimal("0")) > 0) {
			paymentConfirmMapper.insert(currentConfim);
			//更新当前阶段付款情况
			if (lastTotal.compareTo(new BigDecimal("0"))>0){
			if (currentConfim.getTotalAmount().compareTo(new BigDecimal("0"))>=0) {
			schedule.setPaymentStatus(2);
			schedule.setPlannedAmount(schedule.getPlannedAmount());
			contractPaymentScheduleMapper.updateById(schedule);
			}else {
			schedule.setPaymentStatus(1);
			schedule.setPlannedAmount(lastTotal);
			}
			}

			}

			//查询是否有后续阶段
			@@ -144,13 +198,11 @@
			//最后阶段生效时间
			ContractPaymentSchedule endSchedule = afterSchedule.get(0);
			if (StrUtil.equals(endSchedule.getStageName(), "质保金")) {
			endSchedule.setEffectiveDate(DateUtil.offsetDay(addDTO.getProcessDate(), endSchedule.getAgreedDays()));
			endSchedule.setEffectiveEndDate(contract.getExpirationDate());
			endSchedule.setEffectiveEndDate(DateUtil.offsetDay(addDTO.getProcessDate(), endSchedule.getAgreedDays()));
			contractPaymentScheduleMapper.updateById(endSchedule);
			//当前阶段生效时间
			schedule.setEffectiveDate(DateUtil.offsetDay(addDTO.getProcessDate(), schedule.getAgreedDays()));
			schedule.setEffectiveEndDate(endSchedule.getEffectiveDate());
			contractPaymentScheduleMapper.updateById(schedule);
			// schedule.setEffectiveEndDate(DateUtil.offsetDay(addDTO.getProcessDate(), schedule.getAgreedDays()));
			// contractPaymentScheduleMapper.updateById(schedule);
			//最后阶段应收
			PaymentConfirm newConfim = new PaymentConfirm();
			newConfim.setBusinessType(endSchedule.getStageName() + "应收");
			@@ -173,6 +225,7 @@
			newConfim.setTotalAmount(lastNewTotal.subtract(newConfim.getReceivableAmount()));
			if (endSchedule.getPaymentRatio().compareTo(new BigDecimal("0")) > 0) {
			paymentConfirmMapper.insert(newConfim);

			}

			}
			@@ -186,8 +239,8 @@
			contractMapper.updateById(contract);
			}
			if (ArrayUtil.isEmpty(afterSchedule.toArray())) {
			schedule.setEffectiveEndDate(contract.getExpirationDate());
			contractPaymentScheduleMapper.updateById(schedule);
			// schedule.setEffectiveEndDate(contract.getExpirationDate());
			// contractPaymentScheduleMapper.updateById(schedule);
			//更新合同下个阶段
			contract.setNextScheduleName("无");
			contractMapper.updateById(contract);
			@@ -202,7 +255,7 @@
			}
			}
			}
			} else {
			} else if (schedule.getStageName().equals("调试完成或验收")){
			//新增当前阶段应收
			PaymentConfirm currentConfim = new PaymentConfirm();
			currentConfim.setBusinessType(schedule.getStageName() + "应收");
			@@ -225,48 +278,69 @@
			currentConfim.setTotalAmount(lastTotal.subtract(currentConfim.getReceivableAmount()));
			if (schedule.getPaymentRatio().compareTo(new BigDecimal("0")) > 0) {
			paymentConfirmMapper.insert(currentConfim);
			//更新当前阶段付款情况
			if (lastTotal.compareTo(new BigDecimal("0"))>0){
			if (currentConfim.getTotalAmount().compareTo(new BigDecimal("0"))>=0) {
			schedule.setPaymentStatus(2);
			schedule.setPlannedAmount(schedule.getPlannedAmount());
			contractPaymentScheduleMapper.updateById(schedule);
			}else {
			schedule.setPaymentStatus(1);
			schedule.setPlannedAmount(lastTotal);
			}
			}
			}

			//查询是否有后续阶段
			List<ContractPaymentSchedule> afterSchedule = contractPaymentScheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery()
			.eq(ContractPaymentSchedule::getContractId, schedule.getContractId())
			.gt(ContractPaymentSchedule::getStageOrder, schedule.getStageOrder()));
			.gt(ContractPaymentSchedule::getStageOrder, schedule.getStageOrder())
			.gt(ContractPaymentSchedule::getPaymentRatio,"0"));
			if (ArrayUtil.isNotEmpty(afterSchedule.toArray()) && afterSchedule.size() == 1) {
			//最后阶段生效时间
			ContractPaymentSchedule endSchedule = afterSchedule.get(0);
			if (StrUtil.equals(endSchedule.getStageName(), "质保金")) {
			endSchedule.setEffectiveDate(DateUtil.offsetDay(addDTO.getProcessDate(), endSchedule.getAgreedDays()));
			endSchedule.setEffectiveEndDate(contract.getExpirationDate());
			contractPaymentScheduleMapper.updateById(endSchedule);
			//当前阶段生效时间
			schedule.setEffectiveDate(DateUtil.offsetDay(addDTO.getProcessDate(), schedule.getAgreedDays()));
			schedule.setEffectiveEndDate(endSchedule.getEffectiveDate());
			contractPaymentScheduleMapper.updateById(schedule);
			//最后阶段应收
			PaymentConfirm newConfim = new PaymentConfirm();
			newConfim.setBusinessType(endSchedule.getStageName() + "应收");
			newConfim.setBusGuestId(contract.getPartyAId());
			newConfim.setBusGuestName(contract.getPartyA());
			newConfim.setContractId(contract.getId());
			newConfim.setContractName(contract.getContractName());
			newConfim.setContractNo(contract.getContractNo());
			newConfim.setScheduleId(endSchedule.getId());
			newConfim.setScheduleName(schedule.getStageName());
			newConfim.setConfirmTime(addDTO.getProcessDate());
			newConfim.setTransationAmount(endSchedule.getPlannedAmount());
			newConfim.setReceivableAmount(endSchedule.getPlannedAmount());
			PaymentConfirm lastNewConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId, contract.getId())
			.orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
			BigDecimal lastNewTotal = new BigDecimal("0");
			if (ObjUtil.isNotNull(lastNewConfirm)) {
			lastNewTotal = lastNewConfirm.getTotalAmount();
			}
			newConfim.setTotalAmount(lastNewTotal.subtract(newConfim.getReceivableAmount()));
			if (endSchedule.getPaymentRatio().compareTo(new BigDecimal("0")) > 0) {
			paymentConfirmMapper.insert(newConfim);
			}

			}
			// if (StrUtil.equals(endSchedule.getStageName(), "质保金")) {
			// endSchedule.setEffectiveEndDate(DateUtil.offsetDay(addDTO.getProcessDate(), endSchedule.getAgreedDays()));
			// contractPaymentScheduleMapper.updateById(endSchedule);
			// //当前阶段生效时间
			// schedule.setEffectiveEndDate(DateUtil.offsetDay(addDTO.getProcessDate(), schedule.getAgreedDays()));
			// contractPaymentScheduleMapper.updateById(schedule);
			// //最后阶段应收
			// PaymentConfirm newConfim = new PaymentConfirm();
			// newConfim.setBusinessType(endSchedule.getStageName() + "应收");
			// newConfim.setBusGuestId(contract.getPartyAId());
			// newConfim.setBusGuestName(contract.getPartyA());
			// newConfim.setContractId(contract.getId());
			// newConfim.setContractName(contract.getContractName());
			// newConfim.setContractNo(contract.getContractNo());
			// newConfim.setScheduleId(endSchedule.getId());
			// newConfim.setScheduleName(schedule.getStageName());
			// newConfim.setConfirmTime(addDTO.getProcessDate());
			// newConfim.setTransationAmount(endSchedule.getPlannedAmount());
			// newConfim.setReceivableAmount(endSchedule.getPlannedAmount());
			// PaymentConfirm lastNewConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId, contract.getId())
			// .orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
			// BigDecimal lastNewTotal = new BigDecimal("0");
			// if (ObjUtil.isNotNull(lastNewConfirm)) {
			// lastNewTotal = lastNewConfirm.getTotalAmount();
			// }
			// newConfim.setTotalAmount(lastNewTotal.subtract(newConfim.getReceivableAmount()));
			// if (endSchedule.getPaymentRatio().compareTo(new BigDecimal("0")) > 0) {
			// paymentConfirmMapper.insert(newConfim);
			// //更新当前阶段付款情况
			// if (lastNewTotal.compareTo(new BigDecimal("0"))>0){
			// if (newConfim.getTotalAmount().compareTo(new BigDecimal("0"))>=0) {
			// schedule.setPaymentStatus(2);
			// schedule.setPlannedAmount(schedule.getPlannedAmount());
			// contractPaymentScheduleMapper.updateById(schedule);
			// }else {
			// schedule.setPaymentStatus(1);
			// schedule.setPlannedAmount(lastNewTotal);
			// }
			// }
			// }
			//
			// }
			//更新合同下个阶段
			contract.setNextScheduleName(endSchedule.getStageName());
			contractMapper.updateById(contract);
			@@ -277,8 +351,8 @@
			contractMapper.updateById(contract);
			}
			if (ArrayUtil.isEmpty(afterSchedule.toArray())) {
			schedule.setEffectiveEndDate(contract.getExpirationDate());
			contractPaymentScheduleMapper.updateById(schedule);
			// schedule.setEffectiveEndDate(contract.getExpirationDate());
			// contractPaymentScheduleMapper.updateById(schedule);
			//更新合同下个阶段
			contract.setNextScheduleName("无");
			contractMapper.updateById(contract);
			@@ -291,6 +365,45 @@
			contractMapper.updateById(contract);
			}
			}
			}else {

			//最后阶段应收
			PaymentConfirm newConfim = new PaymentConfirm();
			newConfim.setBusinessType(schedule.getStageName() + "应收");
			newConfim.setBusGuestId(contract.getPartyAId());
			newConfim.setBusGuestName(contract.getPartyA());
			newConfim.setContractId(contract.getId());
			newConfim.setContractName(contract.getContractName());
			newConfim.setContractNo(contract.getContractNo());
			newConfim.setScheduleId(schedule.getId());
			newConfim.setScheduleName(schedule.getStageName());
			newConfim.setConfirmTime(addDTO.getProcessDate());
			newConfim.setTransationAmount(schedule.getPlannedAmount());
			newConfim.setReceivableAmount(schedule.getPlannedAmount());
			PaymentConfirm lastNewConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId, contract.getId())
			.orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
			BigDecimal lastNewTotal = new BigDecimal("0");
			if (ObjUtil.isNotNull(lastNewConfirm)) {
			lastNewTotal = lastNewConfirm.getTotalAmount();
			}
			newConfim.setTotalAmount(lastNewTotal.subtract(newConfim.getReceivableAmount()));
			if (schedule.getPaymentRatio().compareTo(new BigDecimal("0")) > 0) {
			paymentConfirmMapper.insert(newConfim);
			//更新当前阶段付款情况
			if (lastNewTotal.compareTo(new BigDecimal("0"))>0){
			if (newConfim.getTotalAmount().compareTo(new BigDecimal("0"))>=0) {
			schedule.setPaymentStatus(2);
			schedule.setPlannedAmount(schedule.getPlannedAmount());
			}else {
			schedule.setPaymentStatus(1);
			schedule.setPlannedAmount(lastNewTotal);
			}
			contractPaymentScheduleMapper.updateById(schedule);
			}
			}
			//更新合同下个阶段
			contract.setNextScheduleName("");
			contractMapper.updateById(contract);
			}


			@@ -354,7 +467,7 @@
			ContractPaymentSchedule::getPlannedAmount, ContractPaymentSchedule::getPlannedAmount,
			ContractPaymentSchedule::getEffectiveEndDate, ContractPaymentSchedule::getPaymentDate,
			ContractPaymentSchedule::getPaymentStatus, ContractPaymentSchedule::getActualAmount,
			ContractPaymentSchedule::getAgreedDays)
			ContractPaymentSchedule::getAgreedDays,ContractPaymentSchedule::getPaymentRatio)
			.select(ContractPaymentScheduleProcess::getProcessDate)
			.leftJoin(ContractPaymentScheduleProcess.class, ContractPaymentScheduleProcess::getScheduleId, ContractPaymentSchedule::getId)
			.eq(ContractPaymentSchedule::getContractId, id)