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

Your Name

2023-07-25 0fea532b07be89978343cb4aede3693af99f5656

 service-job/src/main/java/com/java110/job/adapt/fee/asyn/impl/UpdateFeeOwnerInfoImpl.java

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

import com.alibaba.fastjson.JSONObject;
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.dto.RoomDto;
import com.java110.dto.room.RoomDto;
import com.java110.dto.fee.FeeAttrDto;
import com.java110.dto.fee.FeeDto;
import com.java110.dto.owner.OwnerCarDto;
import com.java110.dto.owner.OwnerDto;
import com.java110.entity.order.Business;
import com.java110.dto.system.Business;
import com.java110.intf.community.IRoomInnerServiceSMO;
import com.java110.intf.fee.IFeeAttrInnerServiceSMO;
import com.java110.intf.fee.IFeeInnerServiceSMO;
@@ -16,7 +16,6 @@
import com.java110.job.adapt.fee.asyn.IUpdateFeeOwnerInfo;
import com.java110.po.fee.FeeAttrPo;
import com.java110.po.owner.OwnerPo;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Async;
@@ -51,18 +50,21 @@
        OwnerDto ownerDto = new OwnerDto();
        ownerDto.setMemberId(ownerPo.getMemberId());
        ownerDto.setCommunityId(ownerPo.getCommunityId());
        ownerDto.setOwnerTypeCd(OwnerDto.OWNER_TYPE_CD_OWNER);
        List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwnerMembers(ownerDto);
        Assert.listOnlyOne(ownerDtos, "业主不存在");
        if (ownerDtos == null || ownerDtos.size() <1) { // 不是业主 不管他
            return;
        }

        List<FeeDto> feeDtos = getRoomFee(ownerPo);
        if(feeDtos != null){
        if (feeDtos != null) {
            for (FeeDto tmpFeeDto : feeDtos) {
                doDealFeeDto(tmpFeeDto, ownerDtos.get(0));
            }
        }

        feeDtos = getOwnerCarFee(ownerPo);
        if(feeDtos != null){
        if (feeDtos != null) {
            for (FeeDto tmpFeeDto : feeDtos) {
                doDealFeeDto(tmpFeeDto, ownerDtos.get(0));
            }
@@ -101,7 +103,6 @@
    private void doDealFeeDto(FeeDto tmpFeeDto, OwnerDto ownerDto) {

        //判断是否存在 业主名称

        FeeAttrDto ownerNameAttr = getOwnerFeeAttr(tmpFeeDto, FeeAttrDto.SPEC_CD_OWNER_NAME);
        FeeAttrPo tmpFeeAttrPo = new FeeAttrPo();
        if (ownerNameAttr == null) {
@@ -133,6 +134,22 @@
            feeAttrInnerServiceSMOImpl.updateFeeAttr(tmpFeeAttrPo);
        }

        // todo 是否存在 业主ID
        ownerNameAttr = getOwnerFeeAttr(tmpFeeDto, FeeAttrDto.SPEC_CD_OWNER_ID);
        tmpFeeAttrPo = new FeeAttrPo();
        if (ownerNameAttr == null) {
            tmpFeeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
            tmpFeeAttrPo.setCommunityId(ownerDto.getCommunityId());
            tmpFeeAttrPo.setFeeId(tmpFeeDto.getFeeId());
            tmpFeeAttrPo.setSpecCd(FeeAttrDto.SPEC_CD_OWNER_ID);
            tmpFeeAttrPo.setValue(ownerDto.getOwnerId());
            feeAttrInnerServiceSMOImpl.saveFeeAttr(tmpFeeAttrPo);
        } else {
            tmpFeeAttrPo.setAttrId(ownerNameAttr.getAttrId());
            tmpFeeAttrPo.setValue(ownerDto.getOwnerId());
            feeAttrInnerServiceSMOImpl.updateFeeAttr(tmpFeeAttrPo);
        }

    }

    private FeeAttrDto getOwnerFeeAttr(FeeDto tmpFeeDto, String specCd) {