feat:石煤机加工承揽合同模版以及统计数据测试调整

shiyunteng

2026-05-25 5d080021659f60d24671d82d11c2db62b66075cd

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

@@ -217,6 +217,7 @@
            ;
         }
      }else {

         List<Contract> customerContractList = contractService.list(Wrappers.<Contract>lambdaQuery().eq(Contract::getPartyAId, addDTO.getBusGuestId())
               .eq(Contract::getPartyBId,SecurityUtils.getUser().getCompId()).orderByAsc(Contract::getCreateTime).apply(" amount != paid_amount"));
         if (ArrayUtil.isEmpty(customerContractList.toArray())) {
@@ -229,6 +230,15 @@
         if (ObjUtil.isNull(customer)) {
            return  R.failed("客商查询失败");
         }
         //新增付款单
         PaymentSlip slip = new PaymentSlip();
         slip.setBusGuestId(customer.getId());
         slip.setBusGuestName(customer.getCompanyName());
         slip.setPayeeCompId(SecurityUtils.getUser().getCompId());
         slip.setPaymentTime(addDTO.getConfirmTime());
         slip.setPaymentAmount(addDTO.getTransationAmount());
         slip.setPayType(addDTO.getPayType());
         paymentSlipMapper.insert(slip);

         BigDecimal transtionAmount = addDTO.getTransationAmount();
         //剩余付款
@@ -537,7 +547,7 @@
         return;
      }
      //保存付款单
      Boolean codeFlag = savePaymentSlip(customer,record);
      Boolean codeFlag = savePaymentSlip(customer,record,dept);
      if (codeFlag){
         log.error("付款单id：{},付款单已存在");
         return;
@@ -708,10 +718,12 @@
      }
   }

   private Boolean savePaymentSlip(BusinessCustomer customer, JSONObject record) {
   private Boolean savePaymentSlip(BusinessCustomer customer, JSONObject record,SysDept dept) {
      PaymentSlip slip = new PaymentSlip();
      slip.setBusGuestId(customer.getId());
      slip.setBusGuestName(customer.getCompanyName());
      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"));