优化代码

java110

2023-08-08 8954429263a75e3c7d19db20a60370fca005f2bd

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

@@ -2,14 +2,12 @@

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.dto.fee.FeeAttrDto;
import com.java110.dto.fee.FeeConfigDto;
import com.java110.dto.fee.FeeDto;
import com.java110.dto.owner.OwnerDto;
import com.java110.dto.owner.OwnerRoomRelDto;
import com.java110.entity.assetImport.ImportRoomFee;
import com.java110.dto.importData.ImportRoomFee;
import com.java110.fee.bmo.payFeeDetail.IImportPayFeeBMODetail;
import com.java110.intf.community.IRoomInnerServiceSMO;
import com.java110.intf.fee.*;
@@ -19,7 +17,6 @@
import com.java110.po.fee.PayFeeDetailPo;
import com.java110.po.fee.PayFeePo;
import com.java110.utils.constant.StatusConstant;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.DateUtil;
import com.java110.utils.util.StringUtil;
@@ -30,6 +27,7 @@

import java.text.ParseException;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;

@Service("importPayFeeDetailBMOImpl")
@@ -102,6 +100,10 @@
            if (StringUtil.isEmpty(importRoomFee.getRoomId())) {
                continue;
            }

            String endTime = importRoomFee.getEndTime();


            importFeeDetail(importRoomFee, storeId, userId, batchId);
        }
    }
@@ -130,7 +132,9 @@
        feeConfigDto.setCommunityId(importRoomFee.getCommunityId());
        List<FeeConfigDto> feeConfigDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(feeConfigDto);

        Assert.listOnlyOne(feeConfigDtos, "费用项不存在或存在多条");
        if (feeConfigDtos == null || feeConfigDtos.size() < 1) {
            return;
        }

        FeeConfigDto tmpFeeConfigDto = feeConfigDtos.get(0);

@@ -202,11 +206,13 @@
    private void importFeeDetail(ImportRoomFee importRoomFee, String storeId, String userId, String batchId) {

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

        Assert.listOnlyOne(feeConfigDtos, "费用项不存在或存在多条");
        if (feeConfigDtos == null || feeConfigDtos.size() < 1) {
            return;
        }

        FeeConfigDto tmpFeeConfigDto = feeConfigDtos.get(0);

@@ -314,6 +320,15 @@
        payFeeDetailPo.setPrimeRate("1.0");
        payFeeDetailPo.setFeeId(tmpFeeDto.getFeeId());
        payFeeDetailPo.setStartTime(importRoomFee.getStartTime());
        String endTime = importRoomFee.getEndTime();
        //todo 周期性费用时时间自动加一天，因为物业统计的Excel 一般少一天
        if (!FeeDto.FEE_FLAG_ONCE.equals(tmpFeeDto.getFeeFlag())) {
            Calendar calendar = Calendar.getInstance();
            calendar.setTime(DateUtil.getDateFromStringB(endTime));
            calendar.add(Calendar.DAY_OF_MONTH, 1);
            endTime = DateUtil.getFormatTimeStringB(calendar.getTime());
            importRoomFee.setEndTime(endTime);
        }
        payFeeDetailPo.setEndTime(importRoomFee.getEndTime());
        payFeeDetailPo.setDetailId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_detailId));
        payFeeDetailPo.setRemark(importRoomFee.getRemark());