初始化逻辑修改2025/09/17

cgf

2025-09-17 a5c3f87987ba341dc4637890a3f5fcbd774c72f8

初始化逻辑修改2025/09/17

 service-fee/src/main/java/com/java110/fee/cmd/fee/QueryFeeDetailCmd.java

@@ -66,7 +66,7 @@
        FeeDetailDto feeDetailDto = BeanConvertUtil.covertBean(reqJson, FeeDetailDto.class);
        feeDetailDto.setContractFee(reqJson.getString("contractId"));
        if(reqJson.containsKey("contractId")){
            reqJson.put("contractFee",reqJson.getString("contractFee"));
            reqJson.put("contractFee",reqJson.getString("contractId"));
        }
        int total = feeDetailInnerServiceSMOImpl.queryFeeDetailsCount(feeDetailDto);
        apiFeeDetailVo.setTotal(total);

 service-job/src/main/java/com/java110/job/importData/adapt/ImportHistoryFeeDetailQueueDataAdapt.java

@@ -229,6 +229,7 @@
                importRoomFee.setAmount(data.getString("chargeAmount"));
                importRoomFee.setStaffName(data.getString("charger"));
                importRoomFee.setIsContractFee("O");
                importRoomFee.setContractId(data.getString("licensePlate"));
                importRoomFee.setInvoiceNo(data.containsKey("invoiceReceiptNo") && data.getString("invoiceReceiptNo") != null ? "Y" : "N");
                importRoomFee.setObjType("7777");
                LocalDateTime startDate = LocalDateTime.parse(importRoomFee.getStartTime(), formatter);
@@ -448,6 +449,7 @@
                List<ContractDto> contractDtos = contractInnerServiceSMOImpl.queryContracts(contractDto);
                if (contractDtos.size() == 1) {
                    importRoomFee.setContractId(contractDtos.get(0).getContractId());
                    feeDto2.setContractFee(contractDtos.get(0).getContractId());
                }
                feeDto2.setPayerObjId(contractPartyaDtos.get(0).getPartyaId());
                importRoomFee.setRoomId(contractPartyaDtos.get(0).getPartyaId());
@@ -588,7 +590,11 @@

        if (new BigDecimal(payFeeDetailPo.getPayableAmount()).doubleValue() < 0) {
            payFeeDetailPo.setDetailId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_detailId));
            payFeeDetailPo.setReceivableAmount("-" + computeFeeByCycle(tmpFeeDto,importRoomFee)+"");
            double v = computeFeeByCycle(tmpFeeDto, importRoomFee);
            if (v > 0) {
                v = v - 2 * v;
            }
            payFeeDetailPo.setReceivableAmount(v+"");
            payFeeDetailPo.setDiscountAmount("0");
            payFeeDetailPo.setState("1300");
            int saved = feeDetailInnerServiceSMOImpl.saveFeeDetail(payFeeDetailPo);
@@ -768,6 +774,9 @@
                DateUtil.getDateFromStringA(importRoomFee.getEndTime().split(" ")[0] + " 23:59:59")
        ));
        Map feePriceAll = computeFeeSMOImpl.getFeePrice(feeDto);
        if(feeDto.getFeeFlag().equals(FeeDto.FEE_FLAG_ONCE)){
            return Double.parseDouble(feePriceAll.get("feePrice").toString());
        }
        //todo 计算应收
        BigDecimal receivableAmount = new BigDecimal(feePriceAll.get("feePrice").toString());
        BigDecimal cycles = new BigDecimal(month);

 springboot/src/main/resources/application-debug.yml

@@ -33,6 +33,7 @@
      max-idle: 50
      min-idle: 20
      timeout: 0
    password: redis2020
  activiti:
    database-schema-update: false
  datasource: