feat:合同审核、出库及履约阶段代码优化

shiyunteng

2026-08-27 b1b3da5393c75ced1afa1467be69d60af5403878

 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractPaymentScheduleProcessServiceImpl.java

@@ -1,32 +1,27 @@
package com.by4cloud.platformx.business.service.impl;

import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.by4cloud.platformx.business.dto.ContractPaymentScheduleProcessAddDTO;
import com.by4cloud.platformx.business.entity.Contract;
import com.by4cloud.platformx.business.entity.ContractPaymentSchedule;
import com.by4cloud.platformx.business.entity.ContractPaymentScheduleProcess;
import com.by4cloud.platformx.business.entity.PaymentConfirm;
import com.by4cloud.platformx.business.mapper.ContractMapper;
import com.by4cloud.platformx.business.mapper.ContractPaymentScheduleMapper;
import com.by4cloud.platformx.business.mapper.ContractPaymentScheduleProcessMapper;
import com.by4cloud.platformx.business.mapper.PaymentConfirmMapper;
import com.by4cloud.platformx.business.entity.*;
import com.by4cloud.platformx.business.mapper.*;
import com.by4cloud.platformx.business.service.ContractPaymentScheduleProcessService;
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.math.RoundingMode;
import java.util.*;
import java.util.stream.Collectors;

/**
 * 履约节点
@@ -39,21 +34,86 @@
public class ContractPaymentScheduleProcessServiceImpl extends ServiceImpl<ContractPaymentScheduleProcessMapper, ContractPaymentScheduleProcess> implements ContractPaymentScheduleProcessService {

   private final ContractPaymentScheduleMapper contractPaymentScheduleMapper;
   private final ContractPaymentScheduleProcessMapper processMapper;
   private final ContractMapper contractMapper;
   private final ContractSubjectMatterMapper subjectMatterMapper;
   private final PaymentConfirmMapper paymentConfirmMapper;
   private final ContractOutBoundMapper contractOutBoundMapper;

   @Override
   public R add(ContractPaymentScheduleProcessAddDTO addDTO) {
      ContractPaymentSchedule schedule = contractPaymentScheduleMapper.selectById(addDTO.getScheduleId());
      if (ObjUtil.isNull(schedule)){
      if (ObjUtil.isNull(schedule)) {
         return R.failed("履约阶段与合同不一致，请联系技术人员");
      }
      //合同
      Contract contract = contractMapper.selectById(schedule.getContractId());
      if (ObjUtil.isNull(contract)) {
         return R.failed("合同信息异常");
      }
      return handleSchedule(addDTO, schedule, contract);

   }

   private void saveScheduleProcess(ContractPaymentScheduleProcessAddDTO addDTO, ContractPaymentSchedule schedule) {
      //履约
      ContractPaymentScheduleProcess contractPaymentScheduleProcess = BeanUtil.copyProperties(addDTO, ContractPaymentScheduleProcess.class);
      contractPaymentScheduleProcess.setContractId(schedule.getContractId());
      contractPaymentScheduleProcess.setContractName(schedule.getContractName());
      contractPaymentScheduleProcess.setScheduleId(schedule.getId());
      contractPaymentScheduleProcess.setScheduleName(schedule.getStageName());
      ContractPaymentScheduleProcess lastProcess = baseMapper.selectOne(Wrappers.<ContractPaymentScheduleProcess>lambdaQuery().eq(ContractPaymentScheduleProcess::getContractId, schedule.getContractId())
            .eq(ContractPaymentScheduleProcess::getScheduleId, schedule.getId()).last("limit 1"));
      if (ObjUtil.isNull(lastProcess)) {
         baseMapper.insert(contractPaymentScheduleProcess);
      }
   }

   private R handleSchedule(ContractPaymentScheduleProcessAddDTO addDTO, ContractPaymentSchedule schedule, Contract contract) {
      if (schedule.getStageName().equals("货到签收")) {
         if (CollUtil.isEmpty(addDTO.getContractOutBoundIds())) {
            return R.failed("签收信息不能为空");
         }
         //更新合同出库到货时间
         addDTO.getContractOutBoundIds().forEach(contractOutBoundId -> {
            ContractOutBound contractOutBound = contractOutBoundMapper.selectById(contractOutBoundId);
            contractOutBound.setArrivalTime(addDTO.getProcessDate());
            contractOutBound.setArrivalAttNames(addDTO.getOutBoundAttNames());
            contractOutBound.setArrivalAttPaths(addDTO.getOutBoundAttPaths());
            contractOutBoundMapper.updateById(contractOutBound);
         });
      }
      //付款比例不为0 保存收款明细
      if (schedule.getPaymentRatio().compareTo(new BigDecimal("0")) > 0) {
         savePaymentConfirm(addDTO, contract, schedule);
      }

      updateCurrentSchedule(addDTO.getProcessDate(), schedule, contract);
      //保存履约记录
      saveScheduleProcess(addDTO, schedule);
      return R.ok();
   }

   private void savePaymentConfirm(ContractPaymentScheduleProcessAddDTO addDTO, Contract contract, ContractPaymentSchedule schedule) {
      BigDecimal amount = schedule.getPlannedAmount();
      if (schedule.getStageName().equals("货到签收")) {
         amount = new BigDecimal("0");
         //计算签收价格
         for (Long contractOutBoundId : addDTO.getContractOutBoundIds()) {
            ContractOutBound contractOutBound = contractOutBoundMapper.selectById(contractOutBoundId);
            ContractSubjectMatter subjectMatter = subjectMatterMapper.selectOne(Wrappers.<ContractSubjectMatter>lambdaQuery()
                  .eq(ContractSubjectMatter::getContractId, contract.getId())
                  .eq(ContractSubjectMatter::getMaterialCode, contractOutBound.getSubjectMatterCode())
                  .eq(ContractSubjectMatter::getLineNo, contractOutBound.getLineNo())
                  .last("limit 1"));
            amount = amount.add(contractOutBound.getOutBoundNum().multiply(subjectMatter.getUnitPrice()));
         }
         //实际到货金额按比例计算
         amount = schedule.getPlannedAmount().multiply(amount.divide(contract.getAmount(), 2, RoundingMode.HALF_UP));
      }

      //新增当前阶段应收
      PaymentConfirm currentConfim = new PaymentConfirm();
      currentConfim.setBusinessType(schedule.getStageName()+"应收");
      currentConfim.setBusinessType(schedule.getStageName() + "应收");
      currentConfim.setBusGuestId(contract.getPartyAId());
      currentConfim.setBusGuestName(contract.getPartyA());
      currentConfim.setContractId(contract.getId());
@@ -62,120 +122,110 @@
      currentConfim.setScheduleId(schedule.getId());
      currentConfim.setScheduleName(schedule.getStageName());
      currentConfim.setConfirmTime(addDTO.getProcessDate());
      currentConfim.setTransationAmount(schedule.getPlannedAmount());
      currentConfim.setReceivableAmount(schedule.getPlannedAmount());
      PaymentConfirm lastConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId,contract.getId())
      currentConfim.setTransationAmount(amount);
      currentConfim.setReceivableAmount(amount);
      PaymentConfirm lastConfirm = paymentConfirmMapper.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();
      }
      currentConfim.setTotalAmount(lastTotal.subtract(currentConfim.getReceivableAmount()));
      paymentConfirmMapper.insert(currentConfim);
      //履约
      ContractPaymentScheduleProcess contractPaymentScheduleProcess = BeanUtil.copyProperties(addDTO,ContractPaymentScheduleProcess.class);
      contractPaymentScheduleProcess.setContractId(schedule.getContractId());
      contractPaymentScheduleProcess.setContractName(schedule.getContractName());
      contractPaymentScheduleProcess.setScheduleId(schedule.getId());
      contractPaymentScheduleProcess.setScheduleName(schedule.getStageName());
      baseMapper.insert(contractPaymentScheduleProcess);
      //更新当前阶段
      if (ObjUtil.isNull(schedule.getEffectiveDate())) {
         schedule.setEffectiveDate(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)){
         beforeSchedule.setEffectiveEndDate(DateUtil.offsetDay(addDTO.getProcessDate(),beforeSchedule.getAgreedDays()));
         contractPaymentScheduleMapper.updateById(beforeSchedule);
         //之前阶段是否收款完成
//         if (beforeSchedule.getPaymentStatus()!=2){
//            //新增之前阶段超期
//            PaymentConfirm beforeConfim = new PaymentConfirm();
//            beforeConfim.setBusinessType("应收超期");
//            beforeConfim.setBusGuestId(contract.getPartyAId());
//            beforeConfim.setBusGuestName(contract.getPartyA());
//            beforeConfim.setContractId(contract.getId());
//            beforeConfim.setContractName(contract.getContractName());
//            beforeConfim.setContractNo(contract.getContractNo());
//            beforeConfim.setScheduleId(schedule.getId());
//            beforeConfim.setScheduleName(schedule.getStageName());
//            beforeConfim.setConfirmTime(addDTO.getProcessDate());
//            beforeConfim.setTransationAmount(schedule.getPlannedAmount());
//            PaymentConfirm newLastConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId,contract.getId())
//                  .orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
//            beforeConfim.setOverdueAmount(StrUtil.equals(schedule.getPaymentStatus()+"","0")?
//                  schedule.getPlannedAmount():
//                  schedule.getPlannedAmount().subtract(schedule.getActualAmount()));
//            beforeConfim.setTotalAmount(newLastConfirm.getTotalAmount());
//            paymentConfirmMapper.insert(beforeConfim);
//         }

      }
      //查询是否有后续阶段
      List<ContractPaymentSchedule> afterSchedule = contractPaymentScheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery()
            .eq(ContractPaymentSchedule::getContractId, schedule.getContractId())
            .gt(ContractPaymentSchedule::getStageOrder, schedule.getStageOrder()));
      if (ArrayUtil.isNotEmpty(afterSchedule.toArray())&&afterSchedule.size()==1){
         //最后阶段生效时间
         ContractPaymentSchedule endSchedule = afterSchedule.get(0);
         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();
      if (ObjUtil.isNotNull(lastConfirm)) {
         currentConfim.setTotalAmount(lastConfirm.getTotalAmount().subtract(currentConfim.getTransationAmount()));
         if (contract.getContractNo().startsWith("ZB-")) {
            paymentConfirmMapper.insert(currentConfim);
         }
         newConfim.setTotalAmount(lastNewTotal.subtract(newConfim.getReceivableAmount()));
         paymentConfirmMapper.insert(newConfim);
      }else {
         schedule.setEffectiveEndDate(contract.getExpirationDate());
         contractPaymentScheduleMapper.updateById(schedule);
         return;
      }
      return R.ok();
      currentConfim.setTotalAmount(currentConfim.getTransationAmount().multiply(new BigDecimal("-1")));
      paymentConfirmMapper.insert(currentConfim);
      handleBeforeRemain(currentConfim, contract);
   }

   public void handleBeforeRemain(PaymentConfirm currentConfim, Contract contract) {
      //客户付款完成合同
      List<Contract> customerCompleteContractList = contractMapper.selectList(Wrappers.<Contract>lambdaQuery().eq(Contract::getPartyAId, contract.getPartyAId())
            .eq(Contract::getPartyBId, SecurityUtils.getUser().getCompId()).eq(Contract::getContractStatus, 3));
      if (CollUtil.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 &&
                  contract.getContractNo().startsWith("ZB-")) {
               //新增完成付款合同 资金转出
               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"));
               if (contract.getContractNo().startsWith("ZB-")) {
                  paymentConfirmMapper.insert(outConfirm);
               }
               outAmountList.add(contractLastConfirm.getTotalAmount());
            }
         }
         if (CollUtil.isNotEmpty(outAmountList)) {
            BigDecimal currentSum = outAmountList.stream().reduce(BigDecimal.ZERO, BigDecimal::add);
            //新增当前合同 资金转入
            PaymentConfirm inConfirm = BeanUtil.copyProperties(currentConfim, PaymentConfirm.class, "id", "transationAmount",
                  "advanceAmount", "receivableAmount", "overdueAmount", "totalAmount");
            inConfirm.setBusinessType("资金转入");
            inConfirm.setConfirmTime(new Date());
            inConfirm.setTransationAmount(currentSum);
            inConfirm.setTotalAmount(currentConfim.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")));
            }
            if (contract.getContractNo().startsWith("ZB-")) {
               paymentConfirmMapper.insert(inConfirm);
            }
            contract.setPaidAmount(currentSum);
            contractMapper.updateById(contract);
         }
      }
   }

   private void updateCurrentSchedule(Date date, ContractPaymentSchedule schedule, Contract contract) {

      //查询是否有后续阶段
      ContractPaymentSchedule afterOneSchedule = contractPaymentScheduleMapper.selectOne(Wrappers.<ContractPaymentSchedule>lambdaQuery()
            .eq(ContractPaymentSchedule::getContractId, schedule.getContractId())
            .gt(ContractPaymentSchedule::getStageOrder, schedule.getStageOrder())
            .orderByAsc(ContractPaymentSchedule::getCreateTime)
            .last("limit 1"));
      if (ObjUtil.isNotNull(afterOneSchedule)) {
         //更新下阶段名称
         List<ContractOutBound> contractOutBoundList = contractOutBoundMapper.selectList(Wrappers.<ContractOutBound>lambdaQuery().eq(ContractOutBound::getContractId, contract.getId())
               .isNull(ContractOutBound::getArrivalTime));
         if (CollUtil.isEmpty(contractOutBoundList)) {
            contract.setNextScheduleName(afterOneSchedule.getStageName());
         }
      }
      if (ObjUtil.isNull(afterOneSchedule)) {
         contract.setNextScheduleName("");
      }
      contractMapper.updateById(contract);
      //更新履约阶段时间
      if (ObjUtil.isNull(schedule.getEffectiveDate()) && ObjUtil.isNull(schedule.getEffectiveEndDate())) {
         schedule.setEffectiveEndDate(DateUtil.offsetDay(date, schedule.getAgreedDays()));
      }
      contractPaymentScheduleMapper.updateById(schedule);
   }

   @Override
   public R selectScheduleProcess(Long id) {
      MPJLambdaWrapper<ContractPaymentSchedule> wrapper = new MPJLambdaWrapper<ContractPaymentSchedule>()
            .select(ContractPaymentSchedule::getId,ContractPaymentSchedule::getStageName,ContractPaymentSchedule::getEffectiveDate,
                  ContractPaymentSchedule::getPlannedAmount,ContractPaymentSchedule::getPlannedAmount,
                  ContractPaymentSchedule::getEffectiveEndDate,ContractPaymentSchedule::getPaymentDate,
                  ContractPaymentSchedule::getPaymentStatus,ContractPaymentSchedule::getActualAmount)
            .eq(ContractPaymentSchedule::getContractId,id)
            .select(ContractPaymentSchedule::getId, ContractPaymentSchedule::getStageName, ContractPaymentSchedule::getEffectiveDate,
                  ContractPaymentSchedule::getPlannedAmount, ContractPaymentSchedule::getPlannedAmount,
                  ContractPaymentSchedule::getEffectiveEndDate, ContractPaymentSchedule::getPaymentDate,
                  ContractPaymentSchedule::getPaymentStatus, ContractPaymentSchedule::getActualAmount,
                  ContractPaymentSchedule::getAgreedDays, ContractPaymentSchedule::getPaymentRatio)
            .select(ContractPaymentScheduleProcess::getProcessDate)
            .leftJoin(ContractPaymentScheduleProcess.class, ContractPaymentScheduleProcess::getScheduleId, ContractPaymentSchedule::getId)
            .eq(ContractPaymentSchedule::getContractId, id)
            .orderByAsc(ContractPaymentSchedule::getCreateTime);
      List<ContractPaymentScheduleVo> scheduleVoList = contractPaymentScheduleMapper.selectJoinList(ContractPaymentScheduleVo.class,wrapper);
      if (ArrayUtil.isEmpty(scheduleVoList.toArray())){
         scheduleVoList.stream().forEach(contractPaymentScheduleVo -> {
            List<ContractPaymentScheduleProcess> paymentScheduleProcessList = processMapper.selectList(Wrappers.<ContractPaymentScheduleProcess>lambdaQuery()
                  .eq(ContractPaymentScheduleProcess::getContractId,contractPaymentScheduleVo.getId())
                  .orderByAsc(ContractPaymentScheduleProcess::getCreateTime));
            if (ArrayUtil.isNotEmpty(paymentScheduleProcessList.toArray())){
               contractPaymentScheduleVo.setProcessVoList(BeanUtil.copyToList(paymentScheduleProcessList, ScheduleProcessVo.class));
            }
         });
      }
      List<ContractPaymentScheduleVo> scheduleVoList = contractPaymentScheduleMapper.selectJoinList(ContractPaymentScheduleVo.class, wrapper);
      return R.ok(scheduleVoList);
   }
}