Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

java110

2021-08-07 b536b4e005a3aee7908a60c31eddff90bf4b98dc

 service-fee/src/main/java/com/java110/fee/bmo/payFeeDetail/impl/ImportPayFeeDetailBMOImpl.java

@@ -90,7 +90,7 @@

        importRoomFees = roomInnerServiceSMOImpl.freshRoomIds(importRoomFees);
        for (ImportRoomFee importRoomFee : importRoomFees) {
            if(StringUtil.isEmpty(importRoomFee.getRoomId())){
            if (StringUtil.isEmpty(importRoomFee.getRoomId())) {
                continue;
            }
            importFeeDetail(importRoomFee, storeId, userId);
@@ -102,6 +102,9 @@

        importCarFees = ownerCarInnerServiceSMOImpl.freshCarIds(importCarFees);
        for (ImportRoomFee importCarFee : importCarFees) {
            if (StringUtil.isEmpty(importCarFee.getCarId())) {
                continue;
            }
            importCarFeeDetail(importCarFee, storeId, userId);
        }
    }
@@ -114,7 +117,7 @@
    private void importCarFeeDetail(ImportRoomFee importRoomFee, String storeId, String userId) {

        FeeConfigDto feeConfigDto = new FeeConfigDto();
        feeConfigDto.setFeeName(importRoomFee.getFeeName());
        feeConfigDto.setFeeNameEq(importRoomFee.getFeeName());
        feeConfigDto.setCommunityId(importRoomFee.getCommunityId());
        List<FeeConfigDto> feeConfigDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(feeConfigDto);

@@ -142,7 +145,11 @@
                payFeePo.setFeeFlag(tmpFeeConfigDto.getFeeFlag());
                payFeePo.setFeeTypeCd(tmpFeeConfigDto.getFeeTypeCd());
                payFeePo.setIncomeObjId(storeId);
                payFeePo.setState(FeeDto.STATE_DOING);
                if (FeeDto.FEE_FLAG_ONCE.equals(tmpFeeConfigDto.getFeeFlag())) {
                    payFeePo.setState(FeeDto.STATE_FINISH);
                } else {
                    payFeePo.setState(FeeDto.STATE_DOING);
                }
                payFeePo.setFeeId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_feeId));
                payFeePo.setPayerObjId(importRoomFee.getCarId());
                payFeePo.setUserId(userId);
@@ -202,7 +209,11 @@
                payFeePo.setFeeFlag(tmpFeeConfigDto.getFeeFlag());
                payFeePo.setFeeTypeCd(tmpFeeConfigDto.getFeeTypeCd());
                payFeePo.setIncomeObjId(storeId);
                payFeePo.setState(FeeDto.STATE_DOING);
                if (FeeDto.FEE_FLAG_ONCE.equals(tmpFeeConfigDto.getFeeFlag())) {
                    payFeePo.setState(FeeDto.STATE_FINISH);
                } else {
                    payFeePo.setState(FeeDto.STATE_DOING);
                }
                payFeePo.setFeeId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_feeId));
                payFeePo.setPayerObjId(importRoomFee.getRoomId());
                payFeePo.setUserId(userId);
@@ -219,7 +230,7 @@
        for (FeeDto tmpFeeDto : feeDtos) {
            try {
                doImportFeeDetail(tmpFeeDto, importRoomFee);
            } catch (ParseException e) {
            } catch (Exception e) {
                e.printStackTrace();
            }
        }
@@ -254,6 +265,7 @@
        payFeeDetailPo.setDetailId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_detailId));
        payFeeDetailPo.setRemark(importRoomFee.getRemark());
        payFeeDetailPo.setCreateTime(importRoomFee.getCreateTime());
        payFeeDetailPo.setState("1400");
        int saved = feeDetailInnerServiceSMOImpl.saveFeeDetail(payFeeDetailPo);

        if (saved < 1) {
@@ -270,6 +282,10 @@
        payFeePo.setStatusCd(StatusConstant.STATUS_CD_VALID);
        payFeePo.setFeeId(tmpFeeDto.getFeeId());
        payFeePo.setEndTime(importRoomFee.getEndTime());
        if (FeeDto.FEE_FLAG_ONCE.equals(tmpFeeDto.getFeeFlag())) {
            payFeePo.setState(FeeDto.STATE_FINISH);
        }

        feeInnerServiceSMOImpl.updateFee(payFeePo);
    }