feat:抵抹账条件新增付款金额小于开票金额，红票审核拒绝后蓝票可重新开红票

shiyunteng

2026-06-10 6b969ca247b98e5a793e61ec5b0d89f4fccb3318

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

@@ -53,6 +53,7 @@
   private final HistoryOverdueMapper historyOverdueMapper;
   private final PaymentSlipMapper paymentSlipMapper;
   private final BipRequestRecordMapper bipRequestRecordMapper;
   private final ContractExecDateMapper contractExecDateMapper;
   private final RemoteDeptService remoteDeptService;
   private final RedisTemplate redisTemplate;

@@ -73,7 +74,7 @@
      if (StrUtil.isNotBlank(addDTO.getContractNo())) {
         Contract contract = contractService.getOne(Wrappers.<Contract>lambdaQuery().eq(Contract::getContractNo, addDTO.getContractNo()));
         BusinessCustomer customer = businessCustomerService.getOne(Wrappers.<BusinessCustomer>lambdaQuery()
               .eq(StrUtil.isNotBlank(addDTO.getBusGuestName()), BusinessCustomer::getCompanyName, addDTO.getBusGuestName())
               .eq(StrUtil.isNotBlank(addDTO.getBusGuestName()), BusinessCustomer::getRegisterName, addDTO.getBusGuestName())
               .eq(StrUtil.isNotBlank(addDTO.getBusGuestId()), BusinessCustomer::getId, addDTO.getBusGuestId()));
         if (ObjUtil.isNull(customer)) {
            return R.failed("客商查询失败，请检查客商");
@@ -98,7 +99,7 @@
               entity.setScheduleName(lastConfirm.getScheduleName());
            }
            entity.setBusGuestId(customer.getId());
            entity.setBusGuestName(customer.getCompanyName());
            entity.setBusGuestName(customer.getRegisterName());
            entity.setBusinessType("客户付款");
            if (newtotal.compareTo(new BigDecimal("0")) > 0) {
               entity.setTransationAmount(addDTO.getTransationAmount());
@@ -192,7 +193,7 @@
            entity.setContractNo(addDTO.getContractNo());

            entity.setBusGuestId(customer.getId());
            entity.setBusGuestName(customer.getCompanyName());
            entity.setBusGuestName(customer.getRegisterName());
            entity.setBusinessType("");
            entity.setTransationAmount(addDTO.getTransationAmount());
            BigDecimal newtotal = addDTO.getTransationAmount().multiply(new BigDecimal("-1")).add(lastConfirm.getTotalAmount());
@@ -224,7 +225,7 @@
            return R.failed("为查询到未付款合同");
         }
         BusinessCustomer customer = businessCustomerService.getOne(Wrappers.<BusinessCustomer>lambdaQuery()
               .eq(StrUtil.isNotBlank(addDTO.getBusGuestName()), BusinessCustomer::getCompanyName, addDTO.getBusGuestName())
               .eq(StrUtil.isNotBlank(addDTO.getBusGuestName()), BusinessCustomer::getRegisterName, addDTO.getBusGuestName())
               .eq(ObjUtil.isNotNull(addDTO.getBusGuestId()), BusinessCustomer::getId, addDTO.getBusGuestId())
               .last("limit 1"));
         if (ObjUtil.isNull(customer)) {
@@ -233,7 +234,7 @@
         //新增付款单
         PaymentSlip slip = new PaymentSlip();
         slip.setBusGuestId(customer.getId());
         slip.setBusGuestName(customer.getCompanyName());
         slip.setBusGuestName(customer.getRegisterName());
         slip.setPayeeCompId(SecurityUtils.getUser().getCompId());
         slip.setPaymentTime(addDTO.getConfirmTime());
         slip.setPaymentAmount(addDTO.getTransationAmount());
@@ -284,7 +285,7 @@
               entity.setScheduleName(lastConfirm.getScheduleName());
            }
            entity.setBusGuestId(customer.getId());
            entity.setBusGuestName(customer.getCompanyName());
            entity.setBusGuestName(customer.getRegisterName());
            entity.setBusinessType("客户付款");
            if (transtionRemainAmount.compareTo(new BigDecimal("0")) > 0) {
               entity.setConfirmTime(payDate);
@@ -393,7 +394,21 @@
               if (contract.getAmount().compareTo(contract.getPaidAmount()) > 0) {
                  payNoCompleteContractList.add(contract);
               }
               contractService.updateById(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.toArray())){
                     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);
               }

            }
         });

@@ -450,7 +465,7 @@
            String result = HttpUtil.post(url + "/yonbip/EFI/collection/list?access_token=" + finalAccessToken, params.toJSONString());
            log.info("SK_CX Response:{}", result);
            //保存请求记录
            saveBipRequestRecord(params, result);
            saveBipRequestRecord(params,"<XSJZ_SK_CX_001>-收款单查询接口", result);
            JSONObject resultJson = JSONObject.parseObject(result);
            if (resultJson.containsKey("code") && resultJson.getString("code").equals("200")) {
               handleAndSave(bipCode, resultJson);
@@ -478,7 +493,8 @@
      return params;
   }

   private void getAccessToken(String accessToken) {
   @Override
   public String getAccessToken(String accessToken) {
      long timestamp = System.currentTimeMillis();
      Map<String, Object> paramMap = new HashMap<>();
      paramMap.put("appKey", appKey);
@@ -499,20 +515,22 @@
      JSONObject tokenJson = JSONObject.parseObject(getTokenResult);
      if (!tokenJson.containsKey("code") || !tokenJson.getString("code").equals("200")) {
         log.error("Get access_token ERROR");
         return;
         return "";
      }
      if (ObjUtil.isNull(tokenJson.get("data")) || ObjUtil.isNull(JSONObject.parseObject(tokenJson.getString("data")))) {
         log.error("access_token value exception");
         return;
         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);
      return accessToken;
   }

   private void saveBipRequestRecord(JSONObject params, String result) {
   @Override
   public void saveBipRequestRecord(JSONObject params, String methodName, String result) {
      BipRequestRecord record = new BipRequestRecord();
      record.setInterfaceName("<XSJZ_SK_CX_001>-收款单查询接口");
      record.setInterfaceName(methodName);
      record.setRequestParams(params.toJSONString());
      record.setResponseParams(result);
      record.setResponseCode(JSONObject.parseObject(result).getString("code"));
@@ -553,7 +571,7 @@
         return;
      }
      BusinessCustomer customer = businessCustomerService.getOne(Wrappers.<BusinessCustomer>lambdaQuery()
            .eq(StrUtil.isNotBlank(record.getString("bodyItemCustomerName")), BusinessCustomer::getCompanyName, record.getString("bodyItemCustomerName"))
            .eq(StrUtil.isNotBlank(record.getString("bodyItemCustomerName")), BusinessCustomer::getRegisterName, record.getString("bodyItemCustomerName"))
      );
      if (ObjUtil.isNull(customer)) {
         log.error("付款单id：{},客商查询失败，请检查客商", record.getString("id"));
@@ -609,7 +627,7 @@
            entity.setScheduleName(lastConfirm.getScheduleName());
         }
         entity.setBusGuestId(customer.getId());
         entity.setBusGuestName(customer.getCompanyName());
         entity.setBusGuestName(customer.getRegisterName());
         entity.setBusinessType("客户付款");
         entity.setIsBip(1);
         entity.setPaymentCode(record.getString("code"));
@@ -721,7 +739,20 @@
            if (contract.getAmount().compareTo(contract.getPaidAmount()) > 0) {
               payNoCompleteContractList.add(contract);
            }
            contractService.updateById(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);
            }
         }
      });

@@ -753,7 +784,7 @@
   private Boolean savePaymentSlip(BusinessCustomer customer, JSONObject record,SysDept dept) {
      PaymentSlip slip = new PaymentSlip();
      slip.setBusGuestId(customer.getId());
      slip.setBusGuestName(customer.getCompanyName());
      slip.setBusGuestName(customer.getRegisterName());
      slip.setPayee(dept.getName());
      slip.setPayeeCompId(dept.getDeptId());
      slip.setPaymentTime(ObjUtil.isNotNull(record.get("billDate"))?
@@ -790,7 +821,7 @@
      }

      entity.setBusGuestId(customer.getId());
      entity.setBusGuestName(customer.getCompanyName());
      entity.setBusGuestName(customer.getRegisterName());
      entity.setBusinessType("客户付款");
      if (ObjUtil.isNotNull(record)){
         entity.setIsBip(1);