feat:合同审核、出库及履约阶段代码优化

shiyunteng

2026-08-27 b1b3da5393c75ced1afa1467be69d60af5403878

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

@@ -209,18 +209,15 @@
            }
            paid = paid.add(addDTO.getTransationAmount());
            contract.setPaidAmount(paid);
            if (paid.compareTo(contract.getAmount()) == 0) {
            if (paid.compareTo(contract.getAmount().subtract(contract.getDropAmount())) >= 0&&contract.getBillingAmout().compareTo(contract.getAmount())==0) {
               contract.setContractStatus(3);
               contract.setPaidAmount(contract.getAmount());
               contract.setPaidAmount(contract.getAmount().subtract(contract.getDropAmount()));
            }
            contractService.updateById(contract);
         }else {
            List<ContractExecDate> execDateList = contractExecDateMapper.selectList(Wrappers.<ContractExecDate>lambdaQuery().eq(ContractExecDate::getContractId,contract.getId())
                  .eq(ContractExecDate::getGenFlag,"0"));
            List<MeterReadRecord> recordList = meterReadRecordMapper.selectList(Wrappers.<MeterReadRecord>lambdaQuery()
                  .eq(MeterReadRecord::getContractId,contract.getId())
                  .isNull(MeterReadRecord::getMeterReadNum));
            if (CollUtil.isEmpty(execDateList)&&CollUtil.isEmpty(recordList)){
            if (CollUtil.isEmpty(execDateList)){
               //更新合同已付款
               BigDecimal paid = new BigDecimal("0");
               if (ObjUtil.isNotNull(contract.getPaidAmount())) {
@@ -228,7 +225,7 @@
               }
               paid = paid.add(addDTO.getTransationAmount());
               contract.setPaidAmount(paid);
               if (contract.getAmount().compareTo(new BigDecimal("0"))==0&&paid.compareTo(contract.getAmount()) >= 0) {
               if (contract.getBillingAmout().compareTo(contract.getAmount())==0&&paid.compareTo(contract.getAmount().subtract(contract.getDropAmount())) >= 0) {
                  contract.setContractStatus(3);
                  contract.setPaidAmount(contract.getAmount());
               }
@@ -528,7 +525,7 @@
               throw new RuntimeException(e);
            }
            log.info("银行流水查询 Request:{}", params.toJSONString());
            String result = HttpUtil.post(url + "/iuap-api-auth/yonbip/ctm/cmp/bankReconciliationQuery?access_token=" + finalAccessToken, params.toJSONString());
            String result = HttpUtil.post(url + "/yonbip/ctm/cmp/bankReconciliationQuery?access_token=" + finalAccessToken, params.toJSONString());
            log.info("银行流水查询 Response:{}", result);
            //保存请求记录
            saveBipRequestRecord(params, "银行流水查询接口", result);
@@ -558,7 +555,7 @@
      } catch (InvalidKeyException e) {
         throw new RuntimeException(e);
      }
      String getTokenResult = HttpUtil.get(url + "/iuap-api-auth/open-auth/selfAppAuth/getAccessToken?appKey=" + appKey + "&timestamp=" + timestamp
      String getTokenResult = HttpUtil.get(url + "/open-auth/selfAppAuth/getAccessToken?appKey=" + appKey + "&timestamp=" + timestamp
            + "&signature=" + signature);
      log.info("Get access_token Response:{}", getTokenResult);
      JSONObject tokenJson = JSONObject.parseObject(getTokenResult);