feat:测试调整

shiyunteng

2026-05-26 5b1c84423d590c7240209fa9a68d33c0116457af

feat:测试调整

 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/PaymentOffsetController.java

@@ -52,7 +52,7 @@
        wrapper.like(StrUtil.isNotBlank(paymentOffset.getBusGuestName()),PaymentOffset::getBusGuestName,paymentOffset.getBusGuestName());
        wrapper.like(StrUtil.isNotBlank(paymentOffset.getContractName()),PaymentOffset::getContractName,paymentOffset.getContractName());
        wrapper.orderByDesc(PaymentOffset::getCreateTime);
        return R.ok(paymentOffsetService.page(page, wrapper));
        return R.ok(paymentOffsetService.pageByScope(page, wrapper));
    }



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

@@ -1,10 +1,10 @@
package com.by4cloud.platformx.business.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.by4cloud.platformx.business.entity.PaymentOffset;
import com.by4cloud.platformx.common.core.util.R;
import com.by4cloud.platformx.common.data.mybatis.IIService;

public interface PaymentOffsetService extends IService<PaymentOffset> {
public interface PaymentOffsetService extends IIService<PaymentOffset> {

    R add(PaymentOffset paymentOffset);
}

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

@@ -176,6 +176,18 @@
                    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);
                            }
                        }

                    }

                    //查询是否有后续阶段
@@ -213,6 +225,7 @@
                            newConfim.setTotalAmount(lastNewTotal.subtract(newConfim.getReceivableAmount()));
                            if (endSchedule.getPaymentRatio().compareTo(new BigDecimal("0")) > 0) {
                                paymentConfirmMapper.insert(newConfim);

                            }

                        }
@@ -265,6 +278,17 @@
            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);
                    }
                }
            }

            //查询是否有后续阶段
@@ -302,6 +326,17 @@
                    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);
                            }
                        }
                    }

                }

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

@@ -367,26 +367,32 @@
                }
            }
            if (ArrayUtil.isNotEmpty(outAmountList.toArray())) {
                BigDecimal currentSum = new BigDecimal("0");
                for (BigDecimal currentAmount : outAmountList
                ) {
                    currentSum = currentSum.add(currentAmount);
                BigDecimal currentInSum = outAmountList.stream().reduce(BigDecimal.ZERO, BigDecimal::add);
                    //新增当前合同 资金转入
                    PaymentConfirm inConfirm = BeanUtil.copyProperties(paymentConfirm, PaymentConfirm.class, "id", "transationAmount",
                            "advanceAmount", "receivableAmount", "overdueAmount", "totalAmount");
                    inConfirm.setBusinessType("资金转入");
                    inConfirm.setConfirmTime(new Date());
                    inConfirm.setTransationAmount(currentSum.subtract(currentAmount));
                    inConfirm.setTotalAmount(paymentConfirm.getTotalAmount().add(currentSum));
                inConfirm.setTransationAmount(currentInSum);
                inConfirm.setTotalAmount(paymentConfirm.getTotalAmount().add(currentInSum));
                //更新当前阶段实际收款 和 收款状态
                schedule.setActualAmount(inConfirm.getTransationAmount());
                schedule.setPaymentStatus(2);
                    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")));
                    schedule.setActualAmount(currentInSum);
                    schedule.setPaymentStatus(1);
                    }
                    paymentConfirmMapper.insert(inConfirm);
                }
                //更新当前阶段实际收款 和 收款状态
                contractPaymentScheduleMapper.updateById(schedule);
            }


        }else {
            paymentConfirmMapper.insert(paymentConfirm);
        }
    }


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

@@ -244,24 +244,27 @@
                                    }
                                }
                                if (ArrayUtil.isNotEmpty(outAmountList.toArray())){
                                    BigDecimal currentSum = new BigDecimal("0");
                                    for (BigDecimal currentAmount:outAmountList
                                    ) {
                                        currentSum=currentSum.add(currentAmount);
                                    BigDecimal currentInSum = outAmountList.stream().reduce(BigDecimal.ZERO, BigDecimal::add);
                                        //新增当前合同 资金转入
                                        PaymentConfirm inConfirm = BeanUtil.copyProperties(paymentConfirm,PaymentConfirm.class,"id","transationAmount",
                                                "advanceAmount","receivableAmount","overdueAmount","totalAmount");
                                        inConfirm.setBusinessType("资金转入");
                                        inConfirm.setConfirmTime(new Date());
                                        inConfirm.setTransationAmount(currentSum.subtract(currentAmount));
                                        inConfirm.setTotalAmount(paymentConfirm.getTotalAmount().add(currentSum));
                                    inConfirm.setTransationAmount(currentInSum);
                                    inConfirm.setTotalAmount(paymentConfirm.getTotalAmount().add(currentInSum));
                                    //更新当前阶段实际收款 和 收款状态
                                    schedule.setActualAmount(inConfirm.getTransationAmount());
                                    schedule.setPaymentStatus(2);
                                        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")));
                                        schedule.setActualAmount(paymentConfirm.getTotalAmount().subtract(currentInSum));
                                        schedule.setPaymentStatus(1);
                                        }
                                        paymentConfirmMapper.insert(inConfirm);
                                    }
                                    //更新当前阶段实际收款 和 收款状态
                                    scheduleMapper.updateById(schedule);
                                }
                            }
                        }

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

@@ -253,19 +253,25 @@
            List<Contract> advanceContractList = new ArrayList<>();
            //付款时间
            Date payDate = addDTO.getConfirmTime();
            for (Contract contract : customerContractList) {
            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);
@@ -281,9 +287,16 @@
                entity.setBusGuestName(customer.getCompanyName());
                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"));
                    entity.setConfirmTime(payDate);
                    }
                    baseMapper.insert(entity);
                    payContractList.add(contract);
                } else if (transtionRemainAmount.compareTo(new BigDecimal("0")) == 0) {
@@ -371,10 +384,10 @@
//                    if (payComScheduleList.stream().allMatch(item -> Objects.equals(item.getPaymentStatus(), 2))) {
//                        contract.setContractStatus(3);
//                    }
                    contractService.updateById(contract);
                    if (contract.getAmount().compareTo(contract.getPaidAmount()) == 0) {
                        contract.setBillingStatus("2");
                        contract.setContractStatus(3);
                        contractService.updateById(contract);
                        payCompleteContractList.add(contract);
                    }
                    //付款 且 付款未全付
@@ -385,28 +398,28 @@
            });

            //客户预付有剩余 且 有预付款的合同
            if (transtionRemainAmount.compareTo(new BigDecimal("0")) > 0) {
                if (ArrayUtil.isNotEmpty(payNoCompleteContractList.toArray())){
                    //余额 放到付款未完成合同 预收
                    Contract lastContract = payNoCompleteContractList.get(0);
                    //保存明细
                    saveNewPaymentConfirm(customer,null,lastContract,transtionRemainAmount,payDate);
                }
                if (ArrayUtil.isEmpty(payNoCompleteContractList.toArray())&&ArrayUtil.isNotEmpty(advanceContractList.toArray())){
                    //客户预付有剩余 没有预付款的合同
                    Contract lastContract = advanceContractList.get(0);
                    //保存明细
                    saveNewPaymentConfirm(customer,null,lastContract,transtionRemainAmount,payDate);
                }
                if (ArrayUtil.isEmpty(payNoCompleteContractList.toArray())&&ArrayUtil.isEmpty(advanceContractList.toArray())
                        &&ArrayUtil.isNotEmpty(payCompleteContractList.toArray())) {
                    //客户预付有剩余 没有预付款的合同
                    Contract lastContract = payCompleteContractList.get(payCompleteContractList.size() - 1);
                    //保存明细
                    saveNewPaymentConfirm(customer,null,lastContract,transtionRemainAmount,payDate);

                }
            }
//            if (transtionRemainAmount.compareTo(new BigDecimal("0")) > 0) {
//                if (ArrayUtil.isNotEmpty(payNoCompleteContractList.toArray())){
//                    //余额 放到付款未完成合同 预收
//                    Contract lastContract = payNoCompleteContractList.get(0);
//                    //保存明细
//                    saveNewPaymentConfirm(customer,null,lastContract,transtionRemainAmount,payDate);
//                }
//                if (ArrayUtil.isEmpty(payNoCompleteContractList.toArray())&&ArrayUtil.isNotEmpty(advanceContractList.toArray())){
//                    //客户预付有剩余 没有预付款的合同
//                    Contract lastContract = advanceContractList.get(0);
//                    //保存明细
//                    saveNewPaymentConfirm(customer,null,lastContract,transtionRemainAmount,payDate);
//                }
//                if (ArrayUtil.isEmpty(payNoCompleteContractList.toArray())&&ArrayUtil.isEmpty(advanceContractList.toArray())
//                        &&ArrayUtil.isNotEmpty(payCompleteContractList.toArray())) {
//                    //客户预付有剩余 没有预付款的合同
//                    Contract lastContract = payCompleteContractList.get(payCompleteContractList.size() - 1);
//                    //保存明细
//                    saveNewPaymentConfirm(customer,null,lastContract,transtionRemainAmount,payDate);
//
//                }
//            }
        }
        return R.ok();
    }
@@ -569,7 +582,9 @@
        List<Contract> advanceContractList = new ArrayList<>();
        //付款时间
        Date payDate = DateUtil.parse(record.getString("billDate"), DatePattern.NORM_DATETIME_FORMAT);
        for (Contract contract : contractList) {
        Iterator<Contract> iterator = contractList.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");
@@ -601,9 +616,16 @@
            entity.setPayType(record.get("bodyItemSettleModeName") != null ? record.getString("bodyItemSettleModeName").contains("承兑汇票") ? 1 : 0 : null);
            entity.setBipId(record.getString("id"));
            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"));
                entity.setConfirmTime(payDate);
                }
                baseMapper.insert(entity);
            } else if (transtionRemainAmount.compareTo(new BigDecimal("0")) == 0) {
                entity.setTransationAmount(lastTotal.multiply(new BigDecimal("-1")));
@@ -683,11 +705,17 @@
                BigDecimal payTotal = payComScheduleList.stream().map(item->StrUtil.equals(item.getPaymentStatus() + "", "0") ? 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);
                }
                contractService.updateById(contract);
//                if (payComScheduleList.stream().allMatch(item -> Objects.equals(item.getPaymentStatus(), 2))) {
//                    contract.setContractStatus(3);
//                }
//                contractService.updateById(contract);
//                if (contract.getAmount().compareTo(contract.getPaidAmount()) == 0) {
//                    payCompleteContractList.add(contract);
//                }
                if (contract.getAmount().compareTo(contract.getPaidAmount()) == 0) {
                    contract.setBillingStatus("2");
                    contract.setContractStatus(3);
                    contractService.updateById(contract);
                    payCompleteContractList.add(contract);
                }
                //付款 且 付款未全付
@@ -698,28 +726,28 @@
        });

        //客户预付有剩余 且 有预付款的合同
        if (transtionRemainAmount.compareTo(new BigDecimal("0")) > 0) {
            if (ArrayUtil.isNotEmpty(payNoCompleteContractList.toArray())){
                //余额 放到付款未完成合同 预收
                Contract lastContract = payNoCompleteContractList.get(payNoCompleteContractList.size() - 1);
                //保存明细
                saveNewPaymentConfirm(customer,record,lastContract,transtionRemainAmount,payDate);
            }
            if (ArrayUtil.isEmpty(payNoCompleteContractList.toArray())&&ArrayUtil.isNotEmpty(advanceContractList.toArray())){
                //客户预付有剩余 没有预付款的合同
                Contract lastContract = payNoCompleteContractList.get(payNoCompleteContractList.size() - 1);
                //保存明细
                saveNewPaymentConfirm(customer,record,lastContract,transtionRemainAmount,payDate);
            }
            if (ArrayUtil.isEmpty(payNoCompleteContractList.toArray())&&ArrayUtil.isEmpty(advanceContractList.toArray())
                    &&ArrayUtil.isNotEmpty(payCompleteContractList.toArray())) {
                //客户预付有剩余 没有预付款的合同
                Contract lastContract = payCompleteContractList.get(payCompleteContractList.size() - 1);
                //保存明细
                saveNewPaymentConfirm(customer,record,lastContract,transtionRemainAmount,payDate);

            }
        }
//        if (transtionRemainAmount.compareTo(new BigDecimal("0")) > 0) {
//            if (ArrayUtil.isNotEmpty(payNoCompleteContractList.toArray())){
//                //余额 放到付款未完成合同 预收
//                Contract lastContract = payNoCompleteContractList.get(payNoCompleteContractList.size() - 1);
//                //保存明细
//                saveNewPaymentConfirm(customer,record,lastContract,transtionRemainAmount,payDate);
//            }
//            if (ArrayUtil.isEmpty(payNoCompleteContractList.toArray())&&ArrayUtil.isNotEmpty(advanceContractList.toArray())){
//                //客户预付有剩余 没有预付款的合同
//                Contract lastContract = payNoCompleteContractList.get(payNoCompleteContractList.size() - 1);
//                //保存明细
//                saveNewPaymentConfirm(customer,record,lastContract,transtionRemainAmount,payDate);
//            }
//            if (ArrayUtil.isEmpty(payNoCompleteContractList.toArray())&&ArrayUtil.isEmpty(advanceContractList.toArray())
//                    &&ArrayUtil.isNotEmpty(payCompleteContractList.toArray())) {
//                //客户预付有剩余 没有预付款的合同
//                Contract lastContract = payCompleteContractList.get(payCompleteContractList.size() - 1);
//                //保存明细
//                saveNewPaymentConfirm(customer,record,lastContract,transtionRemainAmount,payDate);
//
//            }
//        }
    }

    private Boolean savePaymentSlip(BusinessCustomer customer, JSONObject record,SysDept dept) {