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

shiyunteng

10 小时以前 2db76f2066701cbe292f206ad49a7f8523b8aa9f

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

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

import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.date.DatePattern;
import cn.hutool.core.date.DateUtil;
@@ -9,10 +10,8 @@
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.http.HttpUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -30,23 +29,21 @@
import com.by4cloud.platformx.business.vo.*;
import com.by4cloud.platformx.common.core.util.R;
import com.by4cloud.platformx.common.data.datascope.DataScope;
import com.by4cloud.platformx.common.data.mybatis.BaseModel;
import com.by4cloud.platformx.common.security.util.SecurityUtils;
import com.by4cloud.platformx.flow.task.dto.ProcessInstanceParamDto;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import io.swagger.v3.oas.annotations.Operation;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springdoc.core.annotations.ParameterObject;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.web.bind.annotation.GetMapping;

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

@Slf4j
@@ -55,6 +52,7 @@
public class ContractInvoiceServiceImpl extends ServiceImpl<ContractInvoiceMapper, ContractInvoice> implements ContractInvoiceService {

   private final ContractMapper contractMapper;
   private final ContractSubjectMatterMapper contractSubjectMatterMapper;
   private final BusinessCustomerMapper businessCustomerMapper;
   private final ContractOutBoundMapper contractOutBoundMapper;
   private final PaymentConfirmMapper paymentConfirmMapper;
@@ -67,7 +65,7 @@
   private final RemoteDeptService remoteDeptService;
   private final RemoteFlowProcessService remoteFlowProcessService;
   private final PaymentConfirmService paymentConfirmService;
   private final RedisTemplate redisTemplate;
   private final StringRedisTemplate redisTemplate;


   @Value("${BWInvoice.url}")
@@ -92,9 +90,35 @@
            .selectAll(ContractOutBound.class)
            .eq(ContractOutBound::getContractId, contractId);
      List<ContractInvoiceOutBoundVo> invoiceOutBoundVoList = contractOutBoundMapper.selectJoinList(ContractInvoiceOutBoundVo.class, wrapper);
      if (ArrayUtil.isNotEmpty(invoiceOutBoundVoList.toArray())) {
      if (CollUtil.isNotEmpty(invoiceOutBoundVoList)) {
         invoiceOutBoundVoList.stream().forEach(contractInvoiceOutBoundVo -> {

            contractInvoiceOutBoundVo.setInvoiceNum(contractInvoiceOutBoundVo.getOutBoundNum().subtract(contractInvoiceOutBoundVo.getInvoiceNum()));
            ContractSubjectMatter subjectMatter = contractSubjectMatterMapper.selectOne(Wrappers.<ContractSubjectMatter>lambdaQuery().eq(ContractSubjectMatter::getContractId,contractId)
                  .eq(ContractSubjectMatter::getMaterialCode,contractInvoiceOutBoundVo.getSubjectMatterCode())
                  .eq(StrUtil.isNotBlank(contractInvoiceOutBoundVo.getLineNo()),ContractSubjectMatter::getLineNo,contractInvoiceOutBoundVo.getLineNo())
                  .last("limit 1"));
            if (ObjUtil.isNotNull(subjectMatter)&&subjectMatter.getAdvanceNum().compareTo(new BigDecimal("0"))>0){
               contractInvoiceOutBoundVo.setInvoiceNum(contractInvoiceOutBoundVo.getOutBoundNum().subtract(subjectMatter.getAdvanceNum()));
            }
            contractInvoiceOutBoundVo.setToInvoiceNum(contractInvoiceOutBoundVo.getInvoiceNum());
         });
      }
      return R.ok(invoiceOutBoundVoList);
   }

   @Override
   public R getContractAdvance(Long contractId) {
      MPJLambdaWrapper<ContractSubjectMatter> wrapper = new MPJLambdaWrapper<ContractSubjectMatter>()
            .selectAll(ContractSubjectMatter.class)
            .selectAs(ContractSubjectMatter::getMaterialCode, "subjectMatterCode")
            .selectAs(ContractSubjectMatter::getMaterialName, "subjectMatterName")
            .selectAs(ContractSubjectMatter::getQuantity, "outBoundNum")
            .eq(ContractSubjectMatter::getContractId, contractId);
      List<ContractInvoiceOutBoundVo> invoiceOutBoundVoList = contractSubjectMatterMapper.selectJoinList(ContractInvoiceOutBoundVo.class, wrapper);
      if (ArrayUtil.isNotEmpty(invoiceOutBoundVoList)) {
         invoiceOutBoundVoList.stream().forEach(contractInvoiceOutBoundVo -> {
            contractInvoiceOutBoundVo.setInvoiceNum(contractInvoiceOutBoundVo.getOutBoundNum().subtract(contractInvoiceOutBoundVo.getAdvanceNum()));
            contractInvoiceOutBoundVo.setToInvoiceNum(contractInvoiceOutBoundVo.getInvoiceNum());
         });
      }
@@ -117,6 +141,39 @@
         return R.failed("请选择开票出库单后再操作");
      }
      Long contractId = null;
      if (StrUtil.isNotBlank(genInvoiceInfoDTO.getContractId())) {
         ContractPaymentSchedule schedule = contractPaymentScheduleMapper.selectOne(Wrappers.<ContractPaymentSchedule>lambdaQuery()
               .eq(ContractPaymentSchedule::getStageName, "合同签订").eq(ContractPaymentSchedule::getContractId,genInvoiceInfoDTO.getContractId())
               .last("limit 1"));
         if (ObjUtil.isNull(schedule)) {
            return R.failed("合同预收款阶段异常，请联系技术人员");
         }
         Contract contract = contractMapper.selectById(genInvoiceInfoDTO.getContractId());
         if (ObjUtil.isNull(contract)) {
            return R.failed("合同信息异常，请联系技术人员");
         }
         R<SysDept> r = remoteDeptService.getById(contract.getPartyBId());
         if (!r.isOk()) {
            return R.failed("获取开票单位异常");
         }
         SysDept b = r.getData();
         BigDecimal advanceAmount = new BigDecimal("0");
         for (ContractOutBoundInvoiceVo contractOutBoundInvoiceVo : genInvoiceInfoDTO.getOutBoundInvoiceList()) {
            ContractSubjectMatter subjectMatter = contractSubjectMatterMapper.selectById(contractOutBoundInvoiceVo.getContractOutBoundId());
            if (ObjUtil.isNotNull(subjectMatter)) {
               advanceAmount = advanceAmount.add(contractOutBoundInvoiceVo.getInvoiceNum().multiply(subjectMatter.getUnitPrice()));
            }
         }
         log.info("advanceAmount:{}",advanceAmount);
         log.info("schedule.getPlannedAmount:{}",schedule.getPlannedAmount());
         if (advanceAmount.compareTo(schedule.getPlannedAmount()) > 0) {
            return R.failed("开票金额超出合同签订阶段应收金额:" + schedule.getPlannedAmount() + ",请调整开票数量");
         }
         GenInvoiceInfoVo vo = genAdvanceInvoiceInfoVo(genInvoiceInfoDTO, contract, b);

         return R.ok(vo);
      }

      if (!StrUtil.equals(genInvoiceInfoDTO.getContractCategory(),"water_house")) {
         ContractOutBound outBound = contractOutBoundMapper.selectById(genInvoiceInfoDTO.getOutBoundInvoiceList().get(0).getContractOutBoundId());
         contractId = outBound.getContractId();
@@ -155,11 +212,11 @@
//      List<ContractOutBound> outBounds = contractOutBoundMapper.selectList(Wrappers.<ContractOutBound>lambdaQuery()
//            .in(ContractOutBound::getId, genInvoiceInfoDTO.getOutBoundInvoiceList().stream().map(item->item.getContractOutBoundId()).collect(Collectors.toList())));
      if (!StrUtil.equals(contract.getContractCategory(), "water_house")){
         if (ArrayUtil.isNotEmpty(genInvoiceInfoDTO.getOutBoundInvoiceList().toArray())) {
         if (CollUtil.isNotEmpty(genInvoiceInfoDTO.getOutBoundInvoiceList())) {
            genInvoiceInfoDTO.getOutBoundInvoiceList().stream().forEach(contractOutBoundInvoiceVo -> {
               ContractOutBound contractOutBound = contractOutBoundMapper.selectById(contractOutBoundInvoiceVo.getContractOutBoundId());

               if (!ArrayUtil.contains(erpCode.toArray(), contractOutBound.getSubjectMatterCode())) {
               if (!CollUtil.contains(erpCode, contractOutBound.getSubjectMatterCode())) {
                  erpCode.add(contractOutBound.getSubjectMatterCode());
                  ContractOutBoundMergeVo mergeVo = new ContractOutBoundMergeVo();
                  mergeVo.setMaterialCode(contractOutBound.getSubjectMatterCode());
@@ -198,12 +255,12 @@
                  List<ContractOutBoundMergeVo> filteredList = mergeOutBounds.stream()
                        .filter(item -> contractOutBound.getSubjectMatterCode().equals(item.getMaterialCode())) // 防止空指针，建议常量在前
                        .collect(Collectors.toList());
                  if (ArrayUtil.isNotEmpty(filteredList.toArray())) {
                  if (ArrayUtil.isNotEmpty(filteredList)) {
                     filteredList.get(0).setQuantity(filteredList.get(0).getQuantity().add(contractOutBound.getOutBoundNum()));
                  }
               }
            });
            if (ArrayUtil.isNotEmpty(mergeOutBounds.toArray())) {
            if (ArrayUtil.isNotEmpty(mergeOutBounds)) {
               invoiceItemVoList = BeanUtil.copyToList(mergeOutBounds, InvoiceItemVo.class);
               invoiceItemVoList.stream().forEach(invoiceItemVo -> {
//            for (InvoiceItemVo invoiceItemVo:invoiceItemVoList) {
@@ -218,11 +275,11 @@
            }
         }
      }else {
         if (ArrayUtil.isNotEmpty(genInvoiceInfoDTO.getOutBoundInvoiceList().toArray())) {
         if (ArrayUtil.isNotEmpty(genInvoiceInfoDTO.getOutBoundInvoiceList())) {
            genInvoiceInfoDTO.getOutBoundInvoiceList().stream().forEach(contractOutBoundInvoiceVo -> {
               ContractPaymentSchedule schedule = contractPaymentScheduleMapper.selectById(contractOutBoundInvoiceVo.getContractOutBoundId());

               if (!ArrayUtil.contains(erpCode.toArray(), schedule.getSubjectMatterCode())) {
               if (!CollUtil.contains(erpCode, schedule.getSubjectMatterCode())) {
                  erpCode.add(schedule.getSubjectMatterCode());
                  ContractOutBoundMergeVo mergeVo = new ContractOutBoundMergeVo();
                  mergeVo.setMaterialCode(schedule.getSubjectMatterCode());
@@ -259,12 +316,12 @@
               }else {
                  List<ContractOutBoundMergeVo> filterMergeVo = mergeOutBounds.stream().filter(item->item.getMaterialCode()
                        .equals(schedule.getSubjectMatterCode())).collect(Collectors.toList());
                  if (ArrayUtil.isNotEmpty(filterMergeVo.toArray())){
                  if (ArrayUtil.isNotEmpty(filterMergeVo)) {
                     filterMergeVo.get(0).setPriceAndTax(schedule.getPlannedAmount().add(filterMergeVo.get(0).getPriceAndTax()));
                  }
               }
            });
            if (ArrayUtil.isNotEmpty(mergeOutBounds.toArray())) {
            if (ArrayUtil.isNotEmpty(mergeOutBounds)) {
               invoiceItemVoList = BeanUtil.copyToList(mergeOutBounds, InvoiceItemVo.class);
               invoiceItemVoList.stream().forEach(invoiceItemVo -> {
//            for (InvoiceItemVo invoiceItemVo:invoiceItemVoList) {
@@ -282,12 +339,137 @@
      return vo;
   }

   private GenInvoiceInfoVo genAdvanceInvoiceInfoVo(GenInvoiceInfoDTO genInvoiceInfoDTO, Contract contract, SysDept b) {
      GenInvoiceInfoVo vo = new GenInvoiceInfoVo();
      BusinessCustomer a = businessCustomerMapper.selectById(contract.getPartyAId());
      vo.setAdvanceInvoice("111");
      vo.setPartyA(a.getCompanyName());
      vo.setPartyAOrgCode(a.getCreditCode());
      vo.setPartyAOpenBank(a.getBankName());
      vo.setPartyABankAccount(a.getBankAccount());
      vo.setPartyB(b.getOrgName());
      vo.setPartyBOrgCode(b.getOrgCode());
      vo.setPartyBOpenBank(b.getOrgBank());
      vo.setPartyBBankAccount(b.getOrgBankAccount());
      List<InvoiceItemVo> invoiceItemVoList = new ArrayList<>();
      List<String> erpCode = new ArrayList<>();
      List<ContractOutBoundMergeVo> mergeOutBounds = new ArrayList<>();

      if (CollUtil.isNotEmpty(genInvoiceInfoDTO.getOutBoundInvoiceList())) {
         genInvoiceInfoDTO.getOutBoundInvoiceList().stream().forEach(contractOutBoundInvoiceVo -> {
            ContractSubjectMatter subjectMatter = contractSubjectMatterMapper.selectById(contractOutBoundInvoiceVo.getContractOutBoundId());
            if (ObjUtil.isNotNull(subjectMatter)) {
               if (!CollUtil.contains(erpCode, subjectMatter.getMaterialCode())) {
                  erpCode.add(subjectMatter.getMaterialCode());
                  ContractOutBoundMergeVo mergeVo = new ContractOutBoundMergeVo();
                  mergeVo.setMaterialCode(subjectMatter.getMaterialCode());
                  mergeVo.setMaterialInternalName(subjectMatter.getMaterialName());
                  mergeVo.setQuantity(contractOutBoundInvoiceVo.getInvoiceNum());
                  Product product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getErpCode, subjectMatter.getMaterialCode())
                        .eq(Product::getCompId, SecurityUtils.getUser().getCompId()).last("limit 1"));
                  if (ObjUtil.isNotNull(product)) {
                     mergeVo.setTaxClass(product.getTaxClass());
                     mergeVo.setSpecification(product.getProductType());
                     mergeVo.setTaxRate(new BigDecimal(product.getTaxRate()));
                     mergeVo.setTaxCode(product.getTaxCode());
                     Product productClass = productMapper.selectById(product.getParentId());
                     if (ObjUtil.isNotNull(product)) {
                        if (StrUtil.equals(product.getErpCode(), "water_bill")) {
                           mergeVo.setItemName("*" + product.getTaxClass() + "*水费");
                        } else if (StrUtil.equals(product.getErpCode(), "electricity_bill")) {
                           mergeVo.setItemName("*" + product.getTaxClass() + "*电费");
                        } else if (StrUtil.equals(product.getErpCode(), "house_rental")) {
                           mergeVo.setItemName("*" + product.getTaxClass() + "*房屋租赁");
                        } else {
                           mergeVo.setItemName("*" + product.getTaxClass() + "*" + productClass.getProductName());
                        }

                     }
                  }
                  mergeVo.setUnitPrice(subjectMatter.getUnitPrice());
                  mergeVo.setUnit(subjectMatter.getUnit());
                  mergeOutBounds.add(mergeVo);
               }

            }
         });
         if (ArrayUtil.isNotEmpty(mergeOutBounds)) {
            invoiceItemVoList = BeanUtil.copyToList(mergeOutBounds, InvoiceItemVo.class);
            invoiceItemVoList.stream().forEach(invoiceItemVo -> {
//            for (InvoiceItemVo invoiceItemVo:invoiceItemVoList) {
               BigDecimal itemPrice = invoiceItemVo.getUnitPrice().multiply(invoiceItemVo.getQuantity());
               BigDecimal itemPriceTax = itemPrice.divide(new BigDecimal("100").add(invoiceItemVo.getTaxRate()), 2, RoundingMode.HALF_UP).multiply(invoiceItemVo.getTaxRate());
               invoiceItemVo.setPriceTax(itemPriceTax);
               invoiceItemVo.setPriceNoTax(itemPrice.subtract(itemPriceTax));
            });
            vo.setTotalPrice(invoiceItemVoList.stream().map(item -> item.getPriceTax().add(item.getPriceNoTax())).reduce(BigDecimal.ZERO, BigDecimal::add));
            vo.setInvoiceItemList(invoiceItemVoList);
            vo.setPriceWords(Convert.digitToChinese(vo.getTotalPrice()));
         }
      }

      return vo;
   }

   @Override
   public R toInvoice(GenInvoiceInfoDTO genInvoiceInfoDTO) {
      if (ArrayUtil.isEmpty(genInvoiceInfoDTO.getOutBoundInvoiceList().toArray())) {
      if (ArrayUtil.isEmpty(genInvoiceInfoDTO.getOutBoundInvoiceList())) {
         return R.failed("请选择开票出库单后再操作");
      }
      Long contractId = null;
      if (StrUtil.isNotBlank(genInvoiceInfoDTO.getContractId())) {

         ContractPaymentSchedule schedule = contractPaymentScheduleMapper.selectOne(Wrappers.<ContractPaymentSchedule>lambdaQuery()
               .eq(ContractPaymentSchedule::getStageName, "合同签订").eq(ContractPaymentSchedule::getContractId,genInvoiceInfoDTO.getContractId())
               .last("limit 1"));
         if (ObjUtil.isNull(schedule)) {
            return R.failed("合同预收款阶段异常，请联系技术人员");
         }
         Contract contract = contractMapper.selectById(genInvoiceInfoDTO.getContractId());
         if (ObjUtil.isNull(contract)) {
            return R.failed("合同信息异常，请联系技术人员");
         }
         ContractInvoice lastInvoice = baseMapper.selectOne(Wrappers.<ContractInvoice>lambdaQuery().eq(ContractInvoice::getContractId,contract.getId())
               .orderByDesc(ContractInvoice::getCreateTime).last("limit 1"));
         if (ObjUtil.isNotNull(lastInvoice)&&StrUtil.equals(lastInvoice.getApprovalStatus(),"0")){
            return R.failed("请等待最近的发票审核完成后再进行预收开票");
         }
         R<SysDept> r = remoteDeptService.getById(contract.getPartyBId());
         if (!r.isOk()) {
            return R.failed("获取开票单位异常");
         }
         SysDept b = r.getData();
         BigDecimal advanceAmount = new BigDecimal("0");
         for (ContractOutBoundInvoiceVo contractOutBoundInvoiceVo : genInvoiceInfoDTO.getOutBoundInvoiceList()) {
            ContractSubjectMatter subjectMatter = contractSubjectMatterMapper.selectById(contractOutBoundInvoiceVo.getContractOutBoundId());
            if (ObjUtil.isNotNull(subjectMatter)) {
               advanceAmount = advanceAmount.add(contractOutBoundInvoiceVo.getInvoiceNum().multiply(subjectMatter.getUnitPrice()));
            }
         }

         if (advanceAmount.compareTo(schedule.getPlannedAmount()) > 0) {
            return R.failed("开票金额超出合同签订阶段应收金额:" + schedule.getPlannedAmount() + ",请调整开票数量");
         }
         GenInvoiceInfoVo vo = genAdvanceInvoiceInfoVo(genInvoiceInfoDTO, contract, b);
         //发票保存
         ContractInvoice invoice = saveContractInvoice(vo, contract, genInvoiceInfoDTO.getOutBoundInvoiceList(), DateUtil.current() + "","1");
         //启动流程
         ProcessInstanceParamDto dto = new ProcessInstanceParamDto();
         Map<String, Object> map = BeanUtil.beanToMap(invoice);
         dto.setParamMap(map);
         dto.setFlowName(FlowNameEnum.销售挂账审批.name());
         R r1 = remoteFlowProcessService.startProcessInstance(dto);
         if (r1.getCode() == 1) {
            return R.failed("流程启动失败");
         }
         //更新合同出库单状态
         genInvoiceInfoDTO.getOutBoundInvoiceList().stream().forEach(contractOutBoundInvoiceVo -> {
            ContractSubjectMatter subjectMatter = contractSubjectMatterMapper.selectById(contractOutBoundInvoiceVo.getContractOutBoundId());
            subjectMatter.setAdvanceNum(subjectMatter.getAdvanceNum().add(contractOutBoundInvoiceVo.getInvoiceNum()));
            contractSubjectMatterMapper.updateById(subjectMatter);
         });
         return R.ok();
      }
      if (!StrUtil.equals(genInvoiceInfoDTO.getContractCategory(),"water_house")) {
         ContractOutBound outBound = contractOutBoundMapper.selectById(genInvoiceInfoDTO.getOutBoundInvoiceList().get(0).getContractOutBoundId());
         contractId = outBound.getContractId();
@@ -306,7 +488,7 @@
      SysDept b = r.getData();
      GenInvoiceInfoVo vo = genInvoiceInfoVo(genInvoiceInfoDTO, contract, b);
      //发票保存
      ContractInvoice invoice = saveContractInvoice(vo, contract, genInvoiceInfoDTO.getOutBoundInvoiceList(), DateUtil.current() + "");
      ContractInvoice invoice = saveContractInvoice(vo, contract, genInvoiceInfoDTO.getOutBoundInvoiceList(), DateUtil.current() + "","0");
      //启动流程
      ProcessInstanceParamDto dto = new ProcessInstanceParamDto();
      Map<String, Object> map = BeanUtil.beanToMap(invoice);
@@ -355,7 +537,6 @@
      //销方
      jsonObject.put("taxNo", vo.getPartyBOrgCode());//税号
      jsonObject.put("isSplit", false);//超过发票单张限额是否需要拆分开具，默认不拆分（拆分只支持发票类型代码为 专票 004 普票 007 电子票 026的
      jsonObject.put("taxUserName", "");//登录名为税局页面登      录名
      jsonObject.put("formatGenerate", false);//是否需要生成版式返回版式链接(true / false)
      jsonObject.put("formatPushType", false);//版式生成是否推送(true / false)
      //data
@@ -375,9 +556,9 @@
         invoiceDetail.put("goodsQuantity", invoiceItemVo.getQuantity());
         invoiceDetail.put("goodsPrice", invoiceItemVo.getUnitPrice());
         if (!StrUtil.equals(vo.getContractCategory(),"water_house")) {
            invoiceDetail.put("goodsTotalPrice", invoiceItemVo.getUnitPrice().multiply(invoiceItemVo.getQuantity()));
            invoiceDetail.put("goodsTotalPrice", invoiceItemVo.getPriceNoTax());
         }else {
            invoiceDetail.put("goodsTotalPrice", invoiceItemVo.getPriceAndTax());
            invoiceDetail.put("goodsTotalPrice", invoiceItemVo.getPriceNoTax());
         }
         invoiceDetail.put("goodsTotalTax", invoiceItemVo.getPriceTax());

@@ -388,8 +569,7 @@
      //购方
      data.put("buyerTaxNo", vo.getPartyAOrgCode());
      data.put("buyerName", vo.getPartyA());
      data.put("invoiceTotalPrice", vo.getTotalPrice().subtract(vo.getInvoiceItemList().stream().map(item -> item.getPriceTax()).reduce(BigDecimal.ZERO, BigDecimal::add)));
      data.put("invoiceTotalTax", vo.getInvoiceItemList().stream().map(item -> item.getPriceTax()).reduce(BigDecimal.ZERO, BigDecimal::add));
      data.put("drawer", SecurityUtils.getUser().getPhone());// TODO 税务总局系统登陆人手机号
      data.put("invoiceTotalPriceTax", vo.getTotalPrice());
      data.put("buyerBankName", vo.getPartyAOpenBank());
      data.put("buyerBankNumber", vo.getPartyABankAccount());
@@ -398,15 +578,17 @@
      return jsonObject;
   }

   private ContractInvoice saveContractInvoice(GenInvoiceInfoVo genInvoiceInfoVo, Contract contract, List<ContractOutBoundInvoiceVo> outBoundInvoiceVoList, String serialNo) {
   private ContractInvoice saveContractInvoice(GenInvoiceInfoVo genInvoiceInfoVo, Contract contract,
            List<ContractOutBoundInvoiceVo> outBoundInvoiceVoList, String serialNo,String advanceFlag) {
      ContractInvoice invoice = new ContractInvoice();
      invoice.setContractId(contract.getId());
      invoice.setInvoiceCategory("1");
      invoice.setRedReversal("0");
      invoice.setSerialNo(serialNo);
      invoice.setTexNo(genInvoiceInfoVo.getPartyBOrgCode());
      invoice.setTaxNo(genInvoiceInfoVo.getPartyBOrgCode());
      invoice.setSellerTaxName(genInvoiceInfoVo.getPartyB());
      invoice.setBuyerTaxName(genInvoiceInfoVo.getPartyA());
      invoice.setBuyerTaxNo(genInvoiceInfoVo.getPartyAOrgCode());
      invoice.setInvoiceTotalTax(genInvoiceInfoVo.getInvoiceItemList().stream().map(item -> item.getPriceTax()).reduce(BigDecimal.ZERO, BigDecimal::add));
      invoice.setInvoiceTotalPrice(genInvoiceInfoVo.getTotalPrice().subtract(invoice.getInvoiceTotalTax()));
      invoice.setInvoiceTotalPriceTax(genInvoiceInfoVo.getTotalPrice());
@@ -417,6 +599,7 @@
            .map(item-> String.valueOf(item.getContractOutBoundId())) // 或者 .map(Object::toString)
            .collect(Collectors.joining(",")));
      invoice.setInvoicePreviewParam(JSONObject.toJSONString(outBoundInvoiceVoList));
      invoice.setAdvanceFlag(advanceFlag);
      baseMapper.insert(invoice);
      return invoice;
   }
@@ -438,9 +621,10 @@
      Contract contract = contractMapper.selectById(blueInvoice.getContractId());
      ContractInvoice invoice = new ContractInvoice();
      invoice.setContractId(blueInvoice.getContractId());
      invoice.setTexNo(blueInvoice.getTexNo());
      invoice.setTaxNo(blueInvoice.getTaxNo());
      invoice.setSellerTaxName(blueInvoice.getSellerTaxName());
      invoice.setBuyerTaxName(blueInvoice.getBuyerTaxName());
      invoice.setBuyerTaxNo(blueInvoice.getBuyerTaxNo());
      invoice.setInvoiceTotalTax(blueInvoice.getInvoiceTotalTax());
      invoice.setInvoiceTotalPrice(blueInvoice.getInvoiceTotalPrice());
      invoice.setInvoiceTotalPriceTax(blueInvoice.getInvoiceTotalPriceTax());
@@ -457,6 +641,7 @@
      invoice.setBlueInvoiceId(invoiceId);
      invoice.setApprovalStatus("0");
      invoice.setInvoicePreviewParam(blueInvoice.getInvoicePreviewParam());
      invoice.setAdvanceFlag(blueInvoice.getAdvanceFlag());
      baseMapper.insert(invoice);
      //启动流程
      ProcessInstanceParamDto dto = new ProcessInstanceParamDto();
@@ -477,40 +662,38 @@

   private JSONObject genRedInvoice(Contract contract,ContractInvoice blueInvoice, String redConfirmSerialNo) {
      JSONObject jsonObject = new JSONObject();
      jsonObject.put("taxNo", blueInvoice.getTexNo());
      jsonObject.put("taxNo", blueInvoice.getTaxNo());
      jsonObject.put("redConfirmSerialNo", redConfirmSerialNo);
      jsonObject.put("entryIdentity", "01");
      jsonObject.put("sellerTaxNo", blueInvoice.getTexNo());
      jsonObject.put("sellerTaxNo", blueInvoice.getTaxNo());
      jsonObject.put("sellerTaxName", blueInvoice.getSellerTaxName());
      jsonObject.put("buyerTaxName", blueInvoice.getBuyerTaxName());
      jsonObject.put("originalInvoiceNo", blueInvoice.getInvoiceNo());
      jsonObject.put("originInvoiceIsPaper", "N");
      jsonObject.put("buyerTaxNo", blueInvoice.getBuyerTaxNo());
      jsonObject.put("originInvoiceDate", blueInvoice.getInvoiceTime());
      jsonObject.put("originInvoiceTotalPrice", blueInvoice.getInvoiceTotalPrice());
      jsonObject.put("originInvoiceTotalTax", blueInvoice.getInvoiceTotalPrice());
      jsonObject.put("originInvoiceTotalTax", blueInvoice.getInvoiceTotalTax());
      jsonObject.put("invoiceTotalPrice", blueInvoice.getInvoiceTotalPrice().multiply(new BigDecimal("-1")));
      jsonObject.put("invoiceTotalTax", blueInvoice.getInvoiceTotalTax().multiply(new BigDecimal("-1")));
      jsonObject.put("originInvoiceIsPaper", "N");
      jsonObject.put("originInvoiceType", "01");
      jsonObject.put("invoiceTotalPrice", blueInvoice.getInvoiceTotalPrice());
      jsonObject.put("invoiceTotalTax", blueInvoice.getInvoiceTotalPrice());
      jsonObject.put("redInvoiceLabel", "2");
      jsonObject.put("redInvoiceLabel", "01");
      jsonObject.put("invoiceSource", "2");
      jsonObject.put("originalInvoiceNo", blueInvoice.getInvoiceNo());
      GenInvoiceInfoVo vo = BeanUtil.copyProperties(JSONObject.parseObject(blueInvoice.getInvoicePreview()), GenInvoiceInfoVo.class);
      JSONArray invoiceDetailsList = new JSONArray();
      Integer lineNo = 1;
      for (InvoiceItemVo invoiceItemVo : vo.getInvoiceItemList()) {
         JSONObject invoiceDetail = new JSONObject();
         invoiceDetail.put("originalInvoiceDetailNo", lineNo);
         invoiceDetail.put("projectName", invoiceItemVo.getItemName());
         invoiceDetail.put("goodsLineNo", lineNo);
         invoiceDetail.put("goodsCode", invoiceItemVo.getTaxCode());
         invoiceDetail.put("goodsTaxRate", invoiceItemVo.getTaxRate().divide(new BigDecimal("100")));
         invoiceDetail.put("goodsUnit", invoiceItemVo.getUnit());
         invoiceDetail.put("goodsQuantity", invoiceItemVo.getQuantity());
         invoiceDetail.put("goodsPrice", invoiceItemVo.getUnitPrice());
         if (!StrUtil.equals(contract.getContractCategory(),"water_house")) {
            invoiceDetail.put("goodsTotalPrice", invoiceItemVo.getUnitPrice().multiply(invoiceItemVo.getQuantity()));
         }else {
            invoiceDetail.put("goodsTotalPrice", invoiceItemVo.getPriceAndTax());
         }
         invoiceDetail.put("goodsTotalTax", invoiceItemVo.getPriceTax());

         invoiceDetail.put("goodsTotalPrice", invoiceItemVo.getPriceNoTax().multiply(new BigDecimal("-1")));
         invoiceDetail.put("goodsTotalTax", invoiceItemVo.getPriceTax().multiply(new BigDecimal("-1")));
         invoiceDetailsList.add(invoiceDetail);
         lineNo++;
      }
@@ -524,14 +707,16 @@
      if (bwFlag) {
         List<ContractInvoice> contractInvoices = baseMapper.selectList(Wrappers.<ContractInvoice>lambdaQuery()
               .eq(ContractInvoice::getInvoiceCategory, "1").eq(ContractInvoice::getInvoiceStatus, "1"));
         if (ArrayUtil.isNotEmpty(contractInvoices.toArray())) {
         if (ArrayUtil.isNotEmpty(contractInvoices)) {
            contractInvoices.stream().forEach(contractInvoice -> {
               JSONObject request = new JSONObject();
               request.put("tax_no", contractInvoice.getTexNo());
               request.put("taxNo", contractInvoice.getTaxNo());
               JSONObject data = new JSONObject();
               data.put("serial_no", contractInvoice.getSerialNo());
               data.put("return_type", "1");
               data.put("taxNo", contractInvoice.getSerialNo());
               data.put("returnType", "3");
               data.put("invoiceIssueMode", "1");
               String requestId = IdUtil.fastUUID();

               log.info("serial_no:{},发票查询入参：{},", contractInvoice.getSerialNo(), request.toJSONString());
               String result = HttpUtil.post("method=baiwang.output.format.query&version=1.0&request_id=" + requestId, request.toJSONString());
               log.info("serial_no:{},发票查询回参：{},", contractInvoice.getSerialNo(), result);
@@ -539,7 +724,7 @@
               JSONObject resultObj = JSONObject.parseObject(result);
               if (resultObj.containsKey("requestId") && StrUtil.equals(resultObj.getString("requestId"), requestId) && resultObj.getBoolean("success")) {
                  JSONObject model = resultObj.getJSONObject("model");
                  contractInvoice.setInvoicePath(model.getString("query_data"));
                  contractInvoice.setInvoicePath(model.getString("queryData"));
                  contractInvoice.setInvoiceStatus("2");
                  baseMapper.updateById(contractInvoice);
               }
@@ -556,18 +741,34 @@
      if (redisTemplate.hasKey("BIP_TOKEN")) {
         accessToken = (String) redisTemplate.opsForValue().get("BIP_TOKEN");
      } else {
         paymentConfirmService.getAccessToken(accessToken);
         accessToken = paymentConfirmService.getAccessToken(accessToken);
      }
      if (StrUtil.isEmpty(accessToken)) {
         log.error("bip accessToken 获取异常");
         return;
      }
      Contract contract = contractMapper.selectById(contractInvoice.getContractId());
      if (ObjUtil.isNull(contract)) {
         log.error("查询合同信息异常");
         return;
      }
      BusinessCustomer customer = businessCustomerMapper.selectById(contract.getPartyAId());
      if (ObjUtil.isNull(customer) || StrUtil.isEmpty(customer.getBipCode())) {
         log.error("查询合同信息异常");
         return;
      }
      R<SysDept> r = remoteDeptService.getById(contract.getPartyBId());
      if (!r.isOk()) {
         log.error("查询单位信息异常");
         return;
      }
      SysDept dept = r.getData();
      //蓝票
      if (StrUtil.equals(contractInvoice.getInvoiceCategory(),"1")) {
         JSONObject params = genBlueReceiveParams(contractInvoice);
         JSONObject params = genBlueReceiveParams(contractInvoice, contract, customer, dept);
         String finalAccessToken = accessToken;

         log.info("XSJZ_YS_DJ_INSERT Request:", params.toJSONString());
         log.info("XSJZ_YS_DJ_INSERT Request:{}", params.toJSONString());
         String result = HttpUtil.post(url + "/yonbip/EFI/receivable/save?access_token=" + finalAccessToken, params.toJSONString());
         log.info("XSJZ_YS_DJ_INSERT Response:{}", result);
         //保存请求记录
@@ -600,14 +801,15 @@
   }

   private JSONObject genRedReceiveParams(ContractInvoice contractInvoice) {
      ContractInvoice blue = contractInvoice.selectById(contractInvoice.getBlueInvoiceId());
      JSONObject jsonObject = new JSONObject();
      JSONObject data = new JSONObject();
      data.put("id",contractInvoice.getBipId());
      data.put("id", blue.getBipId());
      jsonObject.put("data",data);
      return  jsonObject;
   }

   private JSONObject genBlueReceiveParams(ContractInvoice contractInvoice) {
   private JSONObject genBlueReceiveParams(ContractInvoice contractInvoice, Contract contract, BusinessCustomer customer, SysDept dept) {
      JSONObject jsonObject = new JSONObject();
      JSONObject data = new JSONObject();
      if (contractInvoice.getInvoiceCategory().equals("1")){
@@ -616,25 +818,24 @@
         data.put("direction","-1");
      }
      data.put("billDate",DateUtil.format(contractInvoice.getInvoiceTime(),DatePattern.NORM_DATETIME_FORMAT));
      data.put("exchangeRate", "1");//汇率
      data.put("exchangeRateDate", DateUtil.now());//汇率时间
      data.put("objectType","1");
      data.put("exchangeRate","1");
      data.put("exchangeRateDate",DateUtil.now());
      data.put("customerCode", customer.getBipCode());//客户编码
      data.put("financeOrgCode", dept.getBipCode());//开票组织编码
      data.put("orgCode", dept.getBipCode());//业务组织编码
      data.put("bustypeCode", "");//交易类型编码 暂估默认ZGYSFP，销售默认MJHYXGLXT
      data.put("contractNo", contract.getContractNo());
      data.put("oriCurrencyCode", "CNY");//币种
      data.put("_status","Insert");
      GenInvoiceInfoVo vo = BeanUtil.copyProperties(JSONObject.parseObject(contractInvoice.getInvoicePreview()), GenInvoiceInfoVo.class);
      JSONArray bodyItem = new JSONArray();
      for (InvoiceItemVo invoiceItemVo : vo.getInvoiceItemList()) {
         JSONObject item = new JSONObject();

         JSONObject freeCh = new JSONObject();
         freeCh.put("JT32","");
         item.put("freeChId",freeCh);

         item.put("invoiceNo",contractInvoice.getInvoiceNo());
         item.put("materialCode",invoiceItemVo.getErpCode());
         item.put("taxRate", invoiceItemVo.getTaxRate());
         item.put("oriTaxAmount", invoiceItemVo.getPriceTax());
         item.put("oriTaxExcludedAmount", invoiceItemVo.getPriceNoTax());
         item.put("oriTaxIncludedAmount", invoiceItemVo.getUnitPrice().multiply(invoiceItemVo.getQuantity()));
         item.put("oriTaxIncludedAmount", invoiceItemVo.getPriceAndTax());
         item.put("_status","Insert");

         bodyItem.add(item);
@@ -649,25 +850,36 @@
      if (bwFlag) {
         List<ContractInvoice> contractInvoices = baseMapper.selectList(Wrappers.<ContractInvoice>lambdaQuery()
               .eq(ContractInvoice::getInvoiceCategory, "2").eq(ContractInvoice::getInvoiceStatus, "3"));
         if (ArrayUtil.isNotEmpty(contractInvoices.toArray())) {
         if (ArrayUtil.isNotEmpty(contractInvoices)) {
            contractInvoices.stream().forEach(contractInvoice -> {
               JSONObject request = new JSONObject();
               request.put("taxNo", contractInvoice.getTexNo());
               JSONObject data = new JSONObject();
               data.put("redConfirmSerialNo", contractInvoice.getSerialNo());
               data.put("buySelSelector", "1");
               request.put("taxNo", contractInvoice.getTaxNo());
               request.put("redConfirmSerialNo", contractInvoice.getSerialNo());
               request.put("buySelSelector", "0");
               request.put("invoiceStartDate", DateUtil.formatDate(DateUtil.beginOfYear(new Date())));
               request.put("invoiceEndDate", DateUtil.formatDate(DateUtil.endOfYear(new Date())));
               String requestId = IdUtil.fastUUID();
               log.info("serial_no:{},红字确认单查询入参：{},", contractInvoice.getSerialNo(), request.toJSONString());
               String result = HttpUtil.post("method=baiwang.output.redinvoice.formlist&&version=1.0&request_id=" + requestId, request.toJSONString());
               log.info("serial_no:{},红字确认单查询回参：{},", contractInvoice.getSerialNo(), result);
               JSONObject resultObj = JSONObject.parseObject(result);
               saveBwRequestRecord("baiwang.output.redinvoice.formlist", requestId, request.toJSONString(), result);
               if (resultObj.containsKey("requestId") && StrUtil.equals(resultObj.getString("requestId"), requestId) && resultObj.getBoolean("success")) {
                  JSONArray models = JSONArray.parseArray(resultObj.getString("model"));
                  if (ArrayUtil.isNotEmpty(models.toArray())) {
                     contractInvoice.setInvoiceStatus("2");
               if (resultObj.containsKey("requestId") && StrUtil.equals(resultObj.getString("requestId"), requestId) &&
                     !resultObj.getBoolean("success")) {
                  log.error("红字确认单失败！！！");
                  return;
               }
               JSONArray models = resultObj.getJSONArray("model");
               if (ArrayUtil.isNotEmpty(models)) {
                  JSONObject model = (JSONObject) models.get(0);

                  if (StrUtil.isEmpty(model.getString("confirmBillingMark")) || StrUtil.equals(model.getString("confirmBillingMark"), "N")) {
                     //红冲失败
                     contractInvoice.setRedReversal("2");
                  } else if (StrUtil.equals(model.getString("confirmBillingMark"), "Y")) {
                     //确认即开
                     contractInvoice.setInvoiceNo(model.getString("redInvoiceNo"));
                     contractInvoice.setRedReversal("1");
                     baseMapper.updateById(contractInvoice);
                     //推送BIP
                     pushBipInvoice(contractInvoice);
                  }
@@ -684,12 +896,15 @@
      Contract contract = contractMapper.selectById(invoice.getContractId());
      GenInvoiceInfoVo vo = BeanUtil.copyProperties(JSONObject.parseObject(invoice.getInvoicePreview()), GenInvoiceInfoVo.class);
      vo.setContractCategory(contract.getContractCategory());
      invoice.setApprovalStatus("1");
      baseMapper.updateById(invoice);
      //蓝票
      if (invoice.getInvoiceCategory().equals("1")) {
         // TODO 开蓝票接口
         JSONObject request = genBlueInvoice(vo, invoice.getSerialNo());
         if (bwFlag) {
            String requestId = IdUtil.fastUUID();
            invoice.setBwRequestId(requestId);
            log.info("蓝票请求接口入参", request.toJSONString());
            String result = HttpUtil.post(bwUrl + "method=baiwang.output.invoice.issue&version=1.0&requestId=" + requestId, request.toJSONString());
            log.info("蓝票请求接口回参", result);
@@ -697,14 +912,22 @@
            JSONObject resultObj = JSONObject.parseObject(result);
            if (resultObj.containsKey("requestId") && StrUtil.equals(resultObj.getString("requestId"), requestId) &&
                  !resultObj.getBoolean("success")) {
               log.error("开票失败！！！");
               return;
            }
            JSONArray models = JSONArray.parseArray(resultObj.getString("success"));
            if (ArrayUtil.isNotEmpty(models.toArray())) {
            JSONObject modelJson = resultObj.getJSONObject("model");
            JSONArray models = modelJson.getJSONArray("success");
            if (ArrayUtil.isNotEmpty(models)) {
               JSONObject model = (JSONObject) models.get(0);
               Date invoiceDate = DateUtil.parse(model.getString("invoiceDate"), DatePattern.PURE_DATETIME_PATTERN);
               invoice.setInvoiceTime(invoiceDate);
               invoice.setInvoiceNo(model.getString("invoiceNo"));
            }
         }
         if (StrUtil.isNotBlank(vo.getAdvanceInvoice())){
            contract.setBillingAmout(vo.getTotalPrice().add(contract.getBillingAmout()));
            contractMapper.updateById(contract);
            return;
         }
         if (!StrUtil.equals(contract.getContractCategory(),"water_house")) {
            //合同状态
@@ -729,11 +952,11 @@
            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())) {
            if (ArrayUtil.isEmpty(execDateList) && ArrayUtil.isEmpty(recordList)) {
               //判断是否有可开票记录
               List<ContractPaymentSchedule> scheduleList = contractPaymentScheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery()
                     .eq(ContractPaymentSchedule::getContractId,contract.getId()).eq(ContractPaymentSchedule::getInvoiceFlag,"0"));
               if (ArrayUtil.isEmpty(scheduleList.toArray())){
               if (ArrayUtil.isEmpty(scheduleList)) {
                  contract.setBillingStatus("3");
               }else {
                  contract.setBillingStatus("2");
@@ -743,7 +966,7 @@
               //判断是否有可开票记录
               List<ContractPaymentSchedule> scheduleList = contractPaymentScheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery()
                     .eq(ContractPaymentSchedule::getContractId,contract.getId()));
               if (ArrayUtil.isEmpty(scheduleList.toArray())){
               if (ArrayUtil.isEmpty(scheduleList)) {
                  contract.setBillingStatus("1");
               }else {
                  contract.setBillingStatus("2");
@@ -763,16 +986,20 @@
         ContractInvoice blueInvoice = baseMapper.selectById(invoice.getBlueInvoiceId());
         JSONObject request = genRedInvoice(contract,blueInvoice, invoice.getSerialNo());
         String requestId = IdUtil.fastUUID();
         invoice.setBwRequestId(requestId);
         if (bwFlag) {
            log.info("红字确认单请求接口入参", request.toJSONString());
            log.info("红字确认单请求接口入参:{}", request.toJSONString());
            String result = HttpUtil.post(bwUrl + "method=baiwang.output.redinvoice.add&version=1.0&requestId=" + requestId, request.toJSONString());
            log.info("红字确认单请求接口回参", result);
            log.info("红字确认单请求接口回参:{}", result);
            saveBwRequestRecord("baiwang.output.redinvoice.add", requestId, request.toJSONString(), result);
            JSONObject resultObj = JSONObject.parseObject(result);
            if (resultObj.containsKey("requestId") && StrUtil.equals(resultObj.getString("requestId"), requestId) &&
                  !resultObj.getBoolean("success")) {
               JSONArray models = JSONArray.parseArray(resultObj.getString("success"));
               if (ArrayUtil.isNotEmpty(models.toArray())) {
               log.error("红字确认单失败！！！");
               return;
            }
            JSONArray models = resultObj.getJSONArray("model");
            if (ArrayUtil.isNotEmpty(models)) {
                  JSONObject model = (JSONObject) models.get(0);

                  if (StrUtil.isEmpty(model.getString("confirmBillingMark"))||StrUtil.equals(model.getString("confirmBillingMark"),"N")) {
@@ -787,21 +1014,38 @@
                  }
               }
            }
         }
         contract.setBillingAmout(contract.getBillingAmout().subtract(invoice.getInvoiceTotalPriceTax()));
         //防止重复审开票审核通过后 开票金额为负
         if (contract.getBillingAmout().compareTo(new BigDecimal("0"))<0){
            contract.setBillingAmout(new BigDecimal("0"));
         }
         //更新合同开票状态 前提出库完成
         contract.setBillingStatus("2");
         contractMapper.updateById(contract);
         blueInvoice.setRedReversal("1");
         baseMapper.updateById(blueInvoice);
         if (StrUtil.isNotBlank(vo.getAdvanceInvoice())){
            //还原预开数量
            List<ContractOutBoundInvoiceVo> outBoundInvoiceVoList = BeanUtil.copyToList(JSONArray.parseArray(blueInvoice.getInvoicePreviewParam()), ContractOutBoundInvoiceVo.class);
            if (ArrayUtil.isNotEmpty(outBoundInvoiceVoList)) {
               outBoundInvoiceVoList.stream().forEach(contractOutBoundInvoiceVo -> {
                  ContractSubjectMatter subjectMatter = contractSubjectMatterMapper.selectById(contractOutBoundInvoiceVo.getContractOutBoundId());
                  if (ObjUtil.isNotNull(subjectMatter)){
                     subjectMatter.setAdvanceNum(subjectMatter.getAdvanceNum().subtract(contractOutBoundInvoiceVo.getInvoiceNum()));
                     if (subjectMatter.getAdvanceNum().compareTo(new BigDecimal("0"))<=0){
                        subjectMatter.setAdvanceNum(new BigDecimal("0"));
                     }
                     contractSubjectMatterMapper.updateById(subjectMatter);
                  }
               });
            }
            return;
         }
         //更新合同开票状态 前提出库完成
         contract.setBillingStatus("2");
         contractMapper.updateById(contract);
         if (!StrUtil.equals(contract.getContractCategory(),"water_house")) {
            //更新合同出库单状态
            List<ContractOutBoundInvoiceVo> outBoundInvoiceVoList = BeanUtil.copyToList(JSONArray.parseArray(blueInvoice.getInvoicePreviewParam()), ContractOutBoundInvoiceVo.class);
            if (ArrayUtil.isNotEmpty(outBoundInvoiceVoList.toArray())) {
            if (ArrayUtil.isNotEmpty(outBoundInvoiceVoList)) {
               outBoundInvoiceVoList.stream().forEach(contractOutBoundInvoiceVo -> {
                  ContractOutBound contractOutBound = contractOutBoundMapper.selectById(contractOutBoundInvoiceVo.getContractOutBoundId());
                  if (contractOutBoundInvoiceVo.getInvoiceNum().compareTo(contractOutBound.getOutBoundNum().subtract(contractOutBound.getInvoiceNum()))<=0) {
@@ -813,7 +1057,7 @@
         }else {
            //更新合同房租 水电 费开票状态
            List<ContractOutBoundInvoiceVo> outBoundInvoiceVoList = BeanUtil.copyToList(JSONArray.parseArray(blueInvoice.getInvoicePreviewParam()), ContractOutBoundInvoiceVo.class);
            if (ArrayUtil.isNotEmpty(outBoundInvoiceVoList.toArray())) {
            if (ArrayUtil.isNotEmpty(outBoundInvoiceVoList)) {
               outBoundInvoiceVoList.stream().forEach(contractOutBoundInvoiceVo -> {
                  ContractPaymentSchedule schedule = contractPaymentScheduleMapper.selectById(contractOutBoundInvoiceVo.getContractOutBoundId());
                  schedule.setInvoiceFlag("0");
@@ -822,8 +1066,7 @@
            }
         }
      }
      invoice.setApprovalStatus("1");
      baseMapper.updateById(invoice);

   }

   @Override
@@ -837,7 +1080,7 @@
         if (!StrUtil.equals(contract.getContractCategory(),"water_house")) {
            //更新合同出库单状态
            List<ContractOutBoundInvoiceVo> outBoundInvoiceVoList = BeanUtil.copyToList(JSONArray.parseArray(invoice.getInvoicePreviewParam()), ContractOutBoundInvoiceVo.class);
            if (ArrayUtil.isNotEmpty(outBoundInvoiceVoList.toArray())) {
            if (ArrayUtil.isNotEmpty(outBoundInvoiceVoList)) {
               outBoundInvoiceVoList.stream().forEach(contractOutBoundInvoiceVo -> {
                  ContractOutBound contractOutBound = contractOutBoundMapper.selectById(contractOutBoundInvoiceVo.getContractOutBoundId());
                  if (contractOutBoundInvoiceVo.getInvoiceNum().compareTo(contractOutBound.getOutBoundNum().subtract(contractOutBound.getInvoiceNum()))<=0) {
@@ -849,7 +1092,7 @@
         }else {
            //更新合同房租 水电 费开票状态
            List<ContractOutBoundInvoiceVo> outBoundInvoiceVoList = BeanUtil.copyToList(JSONArray.parseArray(invoice.getInvoicePreviewParam()), ContractOutBoundInvoiceVo.class);
            if (ArrayUtil.isNotEmpty(outBoundInvoiceVoList.toArray())) {
            if (ArrayUtil.isNotEmpty(outBoundInvoiceVoList)) {
               outBoundInvoiceVoList.stream().forEach(contractOutBoundInvoiceVo -> {
                  ContractPaymentSchedule schedule = contractPaymentScheduleMapper.selectById(contractOutBoundInvoiceVo.getContractOutBoundId());
                  schedule.setInvoiceFlag("0");