feat:银行流水关联多个合同，新增预收款开票，所有List校验调整为ColUtil

shiyunteng

4 小时以前 2db76f2066701cbe292f206ad49a7f8523b8aa9f

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

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

import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -11,13 +11,13 @@
import com.by4cloud.platformx.business.service.ContractService;
import com.by4cloud.platformx.business.service.PaymentOffsetService;
import com.by4cloud.platformx.common.core.util.R;
import com.by4cloud.platformx.common.security.util.SecurityUtils;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;

import java.math.BigDecimal;
import java.util.List;
import java.util.Objects;

;

/**
 * 抵抹账
@@ -80,7 +80,7 @@
      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())){
      if (CollUtil.isNotEmpty(scheduleList)){
         BigDecimal remain = paymentOffset.getOffsetAmount();
         for (ContractPaymentSchedule schedule:scheduleList) {
            BigDecimal lastRemain = remain;
@@ -143,7 +143,7 @@
      }
      contractService.updateById(contract);
      // 查询所有付款阶段是否都付款完成
//      if (ArrayUtil.isNotEmpty(scheduleList.toArray())){
//      if (.isNotEmpty(scheduleList)){
//         if (scheduleList.stream().allMatch(item -> Objects.equals(item.getPaymentStatus(), 2))){
//            contract.setContractStatus(3);
//            contractService.updateById(contract);