feat:银行流水绑定合同问题 出库单据查看 历史当前逾期新增删除去掉 完成开票隐藏开票按钮 出库业务单据文件类型

shiyunteng

9 小时以前 cd11bc80579a629e8ab6f9ee9e1cd982f4396408

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

@@ -15,6 +15,7 @@
import com.by4cloud.platformx.admin.api.feign.RemoteDeptService;
import com.by4cloud.platformx.business.dto.AgingQueryDTO;
import com.by4cloud.platformx.business.dto.PaymentConfirmAddDTO;
import com.by4cloud.platformx.business.dto.SyncPaymentRecepitDTO;
import com.by4cloud.platformx.business.entity.*;
import com.by4cloud.platformx.business.mapper.*;
import com.by4cloud.platformx.business.service.BusinessCustomerService;
@@ -63,6 +64,7 @@
   private final BipRequestRecordMapper bipRequestRecordMapper;
   private final ContractExecDateMapper contractExecDateMapper;
   private final MeterReadRecordMapper meterReadRecordMapper;
   private final BankStatementMapper bankStatementMapper;
   private final RemoteDeptService remoteDeptService;
   private final RedisTemplate redisTemplate;

@@ -105,7 +107,7 @@
            //新增付款单
            PaymentSlip slip = new PaymentSlip();
            slip.setBusGuestId(customer.getId());
            slip.setBusGuestName(customer.getRegisterName());
            slip.setBusGuestName(customer.getCompanyName());
            slip.setPayeeCompId(SecurityUtils.getUser().getCompId());
            slip.setPaymentTime(addDTO.getConfirmTime());
            slip.setPaymentAmount(addDTO.getTransationAmount());
@@ -122,7 +124,7 @@
               entity.setScheduleName(lastConfirm.getScheduleName());
            }
            entity.setBusGuestId(customer.getId());
            entity.setBusGuestName(customer.getRegisterName());
            entity.setBusGuestName(customer.getCompanyName());
            entity.setBusinessType("客户付款");
            if (newtotal.compareTo(new BigDecimal("0")) > 0) {
               entity.setTransationAmount(addDTO.getTransationAmount());
@@ -238,7 +240,7 @@
            entity.setContractNo(addDTO.getContractNo());

            entity.setBusGuestId(customer.getId());
            entity.setBusGuestName(customer.getRegisterName());
            entity.setBusGuestName(customer.getCompanyName());
            entity.setBusinessType("退款");
            entity.setTransationAmount(addDTO.getTransationAmount());
            BigDecimal newtotal = addDTO.getTransationAmount().multiply(new BigDecimal("-1")).add(lastConfirm.getTotalAmount());
@@ -479,7 +481,7 @@
   }

   @Override
   public R syncPaymentRecepit() {
   public R syncPaymentRecepit(SyncPaymentRecepitDTO dto) {
      String accessToken = "";
      if (redisTemplate.hasKey("BIP_TOKEN")) {
         accessToken = (String) redisTemplate.opsForValue().get("BIP_TOKEN");
@@ -489,10 +491,22 @@
      if (StrUtil.isEmpty(accessToken)) {
         return R.failed("获取token失败");
      }
      String[] bipCodeArr = codes.split(",");
      String[] bipCodeArr = StrUtil.isNotBlank(dto.getBipCode())?dto.getBipCode().split(","):codes.split(",");
      for (String bipCode : bipCodeArr) {
         //入参
         JSONObject params = genParams(bipCode);
         JSONObject params = new JSONObject();
         if (StrUtil.isNotBlank(dto.getStartDate())){
            params.put("begindate",dto.getStartDate());
         }else {
            params.put("begindate", DateUtil.formatDate(DateUtil.offsetDay(new Date(), -1)));
         }
         if (StrUtil.isNotBlank(dto.getStartDate())){
            params.put("enddate", dto.getEndDate());
         }else {
            params.put("enddate", DateUtil.today());
         }
         //单据状态已审批
         params.put("accentity_code", bipCode);
         String finalAccessToken = accessToken;
         new Thread(() -> {
            try {
@@ -500,11 +514,11 @@
            } catch (InterruptedException e) {
               throw new RuntimeException(e);
            }
            log.info("SK_CX Request:", params.toJSONString());
            String result = HttpUtil.post(url + "/yonbip/EFI/collection/list?access_token=" + finalAccessToken, params.toJSONString());
            log.info("SK_CX Response:{}", result);
            log.info("银行流水查询 Request:{}", params.toJSONString());
            String result = HttpUtil.post(url + "/iuap-api-auth/yonbip/ctm/cmp/bankReconciliationQuery?access_token=" + finalAccessToken, params.toJSONString());
            log.info("银行流水查询 Response:{}", result);
            //保存请求记录
            saveBipRequestRecord(params, "<XSJZ_SK_CX_001>-收款单查询接口", result);
            saveBipRequestRecord(params, "银行流水查询接口", result);
            JSONObject resultJson = JSONObject.parseObject(result);
            if (resultJson.containsKey("code") && resultJson.getString("code").equals("200")) {
               handleAndSave(bipCode, resultJson);
@@ -513,23 +527,6 @@
         }).start();
      }
      return R.ok();
   }

   private JSONObject genParams(String bipCode) {
      JSONObject params = new JSONObject();
      params.put("pageIndex", 1);
      params.put("pageSize", 999);
      params.put("open_billDate_begin", DateUtil.offsetDay(new Date(), -1) + " 00:00:00");
      params.put("open_billDate_begin", DateUtil.today() + " 00:00:00");
      //单据状态已审批
      params.put("verifyState", new String[]{"2"});
      //往来对象客户
      params.put("objectType", new String[]{"1"});
      //单位
      JSONObject simpleMap = new JSONObject();
      simpleMap.put("financeOrg.code", bipCode);
      params.put("simple", simpleMap);
      return params;
   }

   @Override
@@ -550,9 +547,9 @@
      }
      String getTokenResult = HttpUtil.get(url + "/iuap-api-auth/open-auth/selfAppAuth/getAccessToken?appKey=" + appKey + "&timestamp=" + timestamp
            + "&signature=" + signature);
      log.info("Get access_token Response:", getTokenResult);
      log.info("Get access_token Response:{}", getTokenResult);
      JSONObject tokenJson = JSONObject.parseObject(getTokenResult);
      if (!tokenJson.containsKey("code") || !tokenJson.getString("code").equals("200")) {
      if (!tokenJson.containsKey("code") || !tokenJson.getString("code").equals("00000")) {
         log.error("Get access_token ERROR");
         return "";
      }
@@ -561,8 +558,8 @@
         return "";
      }
      accessToken = JSONObject.parseObject(tokenJson.getString("data")).getString("access_token");
      log.info("access_token value:", accessToken);
      redisTemplate.opsForValue().set("BIP_TOKEN", accessToken, tokenJson.getIntValue("expire") - 10, TimeUnit.SECONDS);
      log.info("access_token value:{}", accessToken);
      redisTemplate.opsForValue().set("BIP_TOKEN", accessToken, JSONObject.parseObject(tokenJson.getString("data")).getIntValue("expire") - 10, TimeUnit.SECONDS);
      return accessToken;
   }

@@ -593,291 +590,63 @@
         log.error("返回结果中recordList为空");
         return;
      }
      log.info("==================开始处理收款单信息===================");
      log.info("==================开始处理银行流水信息===================");
      recordList.stream().forEach(record -> {

         savePaymentConfirm((JSONObject) record, dept);
      });
      log.info("==================结束处理收款单信息===================");
      log.info("==================结束处理银行流水信息===================");
   }

   private void savePaymentConfirm(JSONObject record, SysDept dept) {

      List<Contract> contractList = contractService.list(Wrappers.<Contract>lambdaQuery().eq(Contract::getPartyA, record.getString("bodyItemCustomerName"))
            .eq(Contract::getPartyBId, dept.getDeptId()).orderByAsc(Contract::getCreateTime));
      if (ArrayUtil.isEmpty(contractList.toArray())) {
         log.error("付款单id：{},甲方：{},乙方：{},无相关合同", record.getString("id"), record.getString("bodyItemCustomerName"), dept.getName());
      if (record.containsKey("to_acct_name")){
         log.error("付款单id：{},付款公司为空", record.getString("id"));
         return;
      }
      BusinessCustomer customer = businessCustomerService.getOne(Wrappers.<BusinessCustomer>lambdaQuery()
            .eq(StrUtil.isNotBlank(record.getString("bodyItemCustomerName")), BusinessCustomer::getRegisterName, record.getString("bodyItemCustomerName"))
            .eq(BusinessCustomer::getCompanyName, record.getString("to_acct_name"))
            .eq(BusinessCustomer::getCompId,dept.getDeptId())
      );
      if (ObjUtil.isNull(customer)) {
         log.error("付款单id：{},客商查询失败，请检查客商", record.getString("id"));
         return;
      }
      if (ObjUtil.isNull(record.getBigDecimal("bodyItemOriTaxExcludedAmount"))) {
         log.error("付款单id：{},付款单无税金额，异常", record.getString("id"));
      if (ObjUtil.isNull(record.getBigDecimal("tran_amt"))) {
         log.error("付款单id：{},交易金额异常", record.getString("id"));
         return;
      }
      //保存付款单
      Boolean codeFlag = savePaymentSlip(customer, record, dept);
      Boolean codeFlag = saveBankStatement(customer, record);
      if (codeFlag) {
         log.error("付款单id：{},付款单已存在");
         return;
      }
      BigDecimal transtionAmount = record.getBigDecimal("bodyItemOriTaxExcludedAmount");
      //剩余付款
      BigDecimal transtionRemainAmount = transtionAmount;
      //收到付款的合同
      List<Contract> payContractList = new ArrayList<>();
      //付款完成的合同
      List<Contract> payCompleteContractList = new ArrayList<>();
      //付款未完成的合同
      List<Contract> payNoCompleteContractList = new ArrayList<>();
      //有预付款的合同
      List<Contract> advanceContractList = new ArrayList<>();
      //付款时间
      Date payDate = DateUtil.parse(record.getString("billDate"), DatePattern.NORM_DATETIME_FORMAT);
      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");
         if (ObjUtil.isNotNull(lastConfirm)) {
            lastTotal = lastConfirm.getTotalAmount();

         }

         //合同最近明细总额为0 或 > 0 情况下
         if (lastTotal.compareTo(new BigDecimal("0")) >= 0) {
            log.info("当前合同号：{},明细总额无应收款", contract.getContractNo());
            advanceContractList.add(contract);
            continue;
         }

         transtionRemainAmount = transtionRemainAmount.add(lastTotal);
         PaymentConfirm entity = new PaymentConfirm();
         entity.setContractId(contract.getId());
         entity.setContractName(contract.getContractName());
         entity.setContractNo(contract.getContractNo());
         if (ObjUtil.isNotNull(lastConfirm)) {
            entity.setScheduleId(lastConfirm.getScheduleId());
            entity.setScheduleName(lastConfirm.getScheduleName());
         }
         entity.setBusGuestId(customer.getId());
         entity.setBusGuestName(customer.getRegisterName());
         entity.setBusinessType("客户付款");
         entity.setIsBip(1);
         entity.setPaymentCode(record.getString("code"));
         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"));
            }
            baseMapper.insert(entity);
         } else if (transtionRemainAmount.compareTo(new BigDecimal("0")) == 0) {
            entity.setTransationAmount(lastTotal.multiply(new BigDecimal("-1")));
            entity.setTotalAmount(new BigDecimal("0"));
            entity.setConfirmTime(payDate);
            baseMapper.insert(entity);
            break;
         } else {
            entity.setTransationAmount(transtionRemainAmount.subtract(lastTotal));
            entity.setTotalAmount(transtionAmount);
            entity.setConfirmTime(payDate);
            baseMapper.insert(entity);
            break;
         }
      }

      payContractList.stream().forEach(contract -> {
         //更新付款阶段付款
         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())) {
            BigDecimal remain = transtionAmount;
            for (ContractPaymentSchedule schedule : scheduleList) {
               BigDecimal lastRemain = remain;
               remain = remain.subtract(StrUtil.equals(schedule.getPaymentStatus() + "", "0") ? schedule.getPlannedAmount() :
                     schedule.getPlannedAmount().subtract(schedule.getActualAmount()));
               if (remain.compareTo(new BigDecimal("0")) >= 0) {
                  schedule.setActualAmount(schedule.getPlannedAmount());
                  schedule.setPaymentDate(payDate);
                  schedule.setPaymentStatus(2);
                  contractPaymentScheduleMapper.updateById(schedule);
                  //查询是否有当前逾期
                  CurrentOverdue currentOverdue = currentOverdueMapper.selectOne(Wrappers.<CurrentOverdue>lambdaQuery().eq(CurrentOverdue::getScheduleId, schedule.getId())
                        .eq(CurrentOverdue::getContractId, schedule.getContractId()).last("limit 1"));
                  if (ObjUtil.isNotNull(currentOverdue)) {
                     //新增逾期历史
                     HistoryOverdue historyOverdue = BeanUtil.copyProperties(currentOverdue, HistoryOverdue.class, "id");
                     historyOverdue.setPaymentTime(payDate);
                     historyOverdue.setCompId(schedule.getCompId());
                     historyOverdueMapper.insert(historyOverdue);
                     //删除当前逾期
                     currentOverdueMapper.deleteById(currentOverdue);
                  }
               } else {
                  schedule.setActualAmount(StrUtil.equals(schedule.getPaymentStatus() + "", "0") ? schedule.getPlannedAmount().add(remain) :
                        schedule.getActualAmount().add(lastRemain));
                  schedule.setPaymentDate(payDate);
                  schedule.setPaymentStatus(1);
                  contractPaymentScheduleMapper.updateById(schedule);
                  //查询是否有当前逾期
                  CurrentOverdue currentOverdue = currentOverdueMapper.selectOne(Wrappers.<CurrentOverdue>lambdaQuery().eq(CurrentOverdue::getScheduleId, schedule.getId())
                        .eq(CurrentOverdue::getContractId, schedule.getContractId()).last("limit 1"));
                  if (ObjUtil.isNotNull(currentOverdue)) {
                     //新增逾期历史
                     HistoryOverdue historyOverdue = BeanUtil.copyProperties(currentOverdue, HistoryOverdue.class, "id");
                     historyOverdue.setReceivableAmount(lastRemain);
                     historyOverdue.setPaymentTime(payDate);
                     historyOverdue.setCompId(schedule.getCompId());
                     historyOverdueMapper.insert(historyOverdue);
                     //查询历史已付逾期金额
                     List<HistoryOverdue> historyOverdueList = historyOverdueMapper.selectList(Wrappers.<HistoryOverdue>lambdaQuery().eq(HistoryOverdue::getScheduleId, currentOverdue.getScheduleId()));
                     BigDecimal hisTotal = historyOverdueList.stream().map(item -> item.getReceivableAmount()).reduce(BigDecimal.ZERO, BigDecimal::add);
                     //更新当前逾期
                     currentOverdue.setReceivableAmount(schedule.getPlannedAmount().subtract(hisTotal));
                     currentOverdueMapper.updateById(currentOverdue);
                  }
                  break;
               }
            }
         }
         //合同所有付款阶段
         List<ContractPaymentSchedule> payComScheduleList = contractPaymentScheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery()
               .eq(ContractPaymentSchedule::getContractId, contract.getId()).ne(ContractPaymentSchedule::getPaymentStatus, 0).ne(ContractPaymentSchedule::getPaymentStatus, 3)
         );
         if (ArrayUtil.isNotEmpty(payComScheduleList.toArray())) {
            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 (contract.getAmount().compareTo(contract.getPaidAmount()) == 0) {
//               payCompleteContractList.add(contract);
//            }
            if (contract.getAmount().compareTo(contract.getPaidAmount()) == 0) {
//               contract.setBillingStatus("2");
               contract.setContractStatus(3);
               payCompleteContractList.add(contract);
            }
            //付款 且 付款未全付
            if (contract.getAmount().compareTo(contract.getPaidAmount()) > 0) {
               payNoCompleteContractList.add(contract);
            }
            if (StrUtil.isNotEmpty(contract.getContractCategory()) && StrUtil.equals(contract.getContractCategory(), "water_house")) {
               List<ContractExecDate> execDateList = contractExecDateMapper.selectList(Wrappers.<ContractExecDate>lambdaQuery()
                     .eq(ContractExecDate::getContractId, contract.getId()).eq(ContractExecDate::getGenFlag, "0"));
               if (ArrayUtil.isEmpty(execDateList)) {
                  List<ContractPaymentSchedule> contractPaymentScheduleList = contractPaymentScheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery()
                        .eq(ContractPaymentSchedule::getContractId, contract.getId()));
                  if (ArrayUtil.isNotEmpty(contractPaymentScheduleList.toArray()) && contractPaymentScheduleList.stream().allMatch(item -> Objects.equals(item.getPaymentStatus(), 2))) {
                     contract.setContractStatus(3);
                     contractService.updateById(contract);
                  }
               }
            } else {
               contractService.updateById(contract);
            }
         }
      });

      //客户预付有剩余 且 有预付款的合同
//      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) {
      PaymentSlip slip = new PaymentSlip();
      slip.setBusGuestId(customer.getId());
      slip.setBusGuestName(customer.getRegisterName());
      slip.setPayee(dept.getName());
      slip.setPayeeCompId(dept.getDeptId());
      slip.setPaymentTime(ObjUtil.isNotNull(record.get("billDate")) ?
            DateUtil.parse(record.getString("billDate"), DatePattern.NORM_DATETIME_FORMAT) : new Date());
      slip.setPaymentAmount(ObjUtil.isNotNull(record.get("bodyItemOriTaxExcludedAmount")) ? record.getBigDecimal("bodyItemOriTaxExcludedAmount") : new BigDecimal("0"));
      slip.setPayType(ObjUtil.isNotNull(record.get("bodyItemSettleModeName")) ? record.getString("bodyItemSettleModeName") : "");
      if (ObjUtil.isNotNull(record.get("code"))) {
         slip.setPaymentNumber(record.getString("code"));
         PaymentSlip paymentSlip = paymentSlipMapper.selectOne(Wrappers.<PaymentSlip>lambdaQuery().eq(PaymentSlip::getPaymentNumber, slip.getPaymentNumber()));
         if (ObjUtil.isNull(paymentSlip)) {
            paymentSlipMapper.insert(slip);
   private Boolean saveBankStatement(BusinessCustomer customer, JSONObject record) {
      BankStatement bankStatement = new BankStatement();
      bankStatement.setBankSeqNo(record.getString("bank_seq_no"));
      bankStatement.setReceiveBankAcc(record.getString("bank_seq_no"));
      bankStatement.setReceiveBankAccAcc(record.getString("bankaccount_account"));
      bankStatement.setReceiveBankAccName(record.getString("bankaccount_acctName"));
      bankStatement.setPayBankNo(record.getString("to_acct_no"));
      bankStatement.setPayBankAccName(record.getString("to_acct_name"));
      bankStatement.setTranDate(DateUtil.parseDateTime(record.getString("tran_date")));
      bankStatement.setTranAmount(record.getBigDecimal("tran_amt"));
      bankStatement.setDataId(record.getLong("id"));
      bankStatement.setDataJson(record.toJSONString());
      bankStatement.setBusGuestId(customer.getId());
      BankStatement statement = bankStatementMapper.selectOne(Wrappers.<BankStatement>lambdaQuery().eq(BankStatement::getDataId,record.getLong("id")));
      if (ObjUtil.isNotNull(statement)){
            return false;
         }
      }
      statement.setCompId(customer.getCompId());
      bankStatementMapper.insert(bankStatement);
      return true;
   }

   public void saveNewPaymentConfirm(BusinessCustomer customer, JSONObject record, Contract contract, BigDecimal transtionRemainAmount
         , Date payDate) {
      PaymentConfirm entity = new PaymentConfirm();
      entity.setContractId(contract.getId());
      entity.setContractName(contract.getContractName());
      entity.setContractNo(contract.getContractNo());
      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();
      }

      if (ObjUtil.isNotNull(lastConfirm)) {
         entity.setScheduleId(lastConfirm.getScheduleId());
         entity.setScheduleName(lastConfirm.getScheduleName());
      }

      entity.setBusGuestId(customer.getId());
      entity.setBusGuestName(customer.getRegisterName());
      entity.setBusinessType("客户付款");
      if (ObjUtil.isNotNull(record)) {
         entity.setIsBip(1);
         entity.setPaymentCode(record.getString("code"));
         entity.setPayType(record.get("bodyItemSettleModeName") != null ? record.getString("bodyItemSettleModeName").contains("承兑汇票") ? 1 : 0 : null);
         entity.setBipId(record.getString("id"));
      }
      entity.setConfirmTime(payDate);
      entity.setTransationAmount(transtionRemainAmount);
      entity.setTotalAmount(transtionRemainAmount.add(lastTotal));
      if (entity.getTotalAmount().compareTo(new BigDecimal("0")) > 0) {
         entity.setAdvanceAmount(entity.getTotalAmount());
      } else if (entity.getTotalAmount().compareTo(new BigDecimal("0")) < 0) {
         entity.setReceivableAmount(entity.getTotalAmount().multiply(new BigDecimal("-1")));
      }
      baseMapper.insert(entity);
   }

   @Override
   public R queryAllBusinessType() {
@@ -903,12 +672,12 @@
         //补全数据
         if (ArrayUtil.isEmpty(companyAgingVo.toArray())) {
            companyAgingVo = new ArrayList<>();
            AgingVo agingVo1 = new AgingVo("0-30天", new BigDecimal("0"), null);
            AgingVo agingVo2 = new AgingVo("31-60天", new BigDecimal("0"), null);
            AgingVo agingVo3 = new AgingVo("61-90天", new BigDecimal("0"), null);
            AgingVo agingVo4 = new AgingVo("91-180天", new BigDecimal("0"), null);
            AgingVo agingVo5 = new AgingVo("181-365天", new BigDecimal("0"), null);
            AgingVo agingVo6 = new AgingVo("1年以上", new BigDecimal("0"), null);
            AgingVo agingVo1 = new AgingVo(1L,"0-30天", new BigDecimal("0"), null);
            AgingVo agingVo2 = new AgingVo(2L,"31-60天", new BigDecimal("0"), null);
            AgingVo agingVo3 = new AgingVo(3L,"61-90天", new BigDecimal("0"), null);
            AgingVo agingVo4 = new AgingVo(4L,"91-180天", new BigDecimal("0"), null);
            AgingVo agingVo5 = new AgingVo(5L,"181-365天", new BigDecimal("0"), null);
            AgingVo agingVo6 = new AgingVo(6L,"1年以上", new BigDecimal("0"), null);
            companyAgingVo.add(agingVo1);
            companyAgingVo.add(agingVo2);
            companyAgingVo.add(agingVo3);
@@ -918,27 +687,27 @@
         } else {
            List<String> overdueRanges = companyAgingVo.stream().map(AgingVo::getOverdueRange).collect(Collectors.toList());
            if (!ArrayUtil.contains(overdueRanges.toArray(), "0-30天")) {
               AgingVo agingVo1 = new AgingVo("0-30天", new BigDecimal("0"), null);
               AgingVo agingVo1 = new AgingVo(1L,"0-30天", new BigDecimal("0"), null);
               companyAgingVo.add(agingVo1);
            }
            if (!ArrayUtil.contains(overdueRanges.toArray(), "31-60天")) {
               AgingVo agingVo2 = new AgingVo("31-60天", new BigDecimal("0"), null);
               AgingVo agingVo2 = new AgingVo(2L,"31-60天", new BigDecimal("0"), null);
               companyAgingVo.add(agingVo2);
            }
            if (!ArrayUtil.contains(overdueRanges.toArray(), "61-90天")) {
               AgingVo agingVo3 = new AgingVo("61-90天", new BigDecimal("0"), null);
               AgingVo agingVo3 = new AgingVo(3L,"61-90天", new BigDecimal("0"), null);
               companyAgingVo.add(agingVo3);
            }
            if (!ArrayUtil.contains(overdueRanges.toArray(), "91-180天")) {
               AgingVo agingVo4 = new AgingVo("91-180天", new BigDecimal("0"), null);
               AgingVo agingVo4 = new AgingVo(4L,"91-180天", new BigDecimal("0"), null);
               companyAgingVo.add(agingVo4);
            }
            if (!ArrayUtil.contains(overdueRanges.toArray(), "181-365天")) {
               AgingVo agingVo5 = new AgingVo("181-365天", new BigDecimal("0"), null);
               AgingVo agingVo5 = new AgingVo(5L,"181-365天", new BigDecimal("0"), null);
               companyAgingVo.add(agingVo5);
            }
            if (!ArrayUtil.contains(overdueRanges.toArray(), "1年以上")) {
               AgingVo agingVo6 = new AgingVo("1年以上", new BigDecimal("0"), null);
               AgingVo agingVo6 = new AgingVo(6L,"1年以上", new BigDecimal("0"), null);
               companyAgingVo.add(agingVo6);
            }
         }