Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxingli...

MrShi

昨天 7ee466ebc953bb5640bcf42f2b8e2a87aa471c21

 server/services/src/main/java/com/doumee/service/business/impl/IdentityInfoServiceImpl.java

@@ -104,11 +104,6 @@
            identityInfo.setAuditStatus(Constants.ONE);
            identityInfoMapper.insert(identityInfo);

            memberMapper.update(new UpdateWrapper<Member>().lambda()
                    .set(Constants.equalsInteger(identityInfo.getType(),Constants.ZERO),Member::getWorkerIdentity,Constants.ONE)
                    .set(Constants.equalsInteger(identityInfo.getType(),Constants.ONE),Member::getDriverIdentity,Constants.ONE)
                    .set(Constants.equalsInteger(identityInfo.getType(),Constants.TWO),Member::getChefIdentity,Constants.ONE)
                    .eq(Member::getId,identityInfo.getMemberId()));
        return identityInfo.getId();
    }

@@ -166,11 +161,6 @@
        identityInfo.setUpdateTime(new Date());
        identityInfo.setAuditStatus(Constants.ONE);
        identityInfoMapper.updateById(identityInfo);
        memberMapper.update(new UpdateWrapper<Member>().lambda()
                .set(Constants.equalsInteger(identityInfo.getType(),Constants.ZERO),Member::getWorkerIdentity,Constants.ONE)
                .set(Constants.equalsInteger(identityInfo.getType(),Constants.ONE),Member::getDriverIdentity,Constants.ONE)
                .set(Constants.equalsInteger(identityInfo.getType(),Constants.TWO),Member::getChefIdentity,Constants.ONE)
                .eq(Member::getId,identityInfo.getMemberId()));
    }


@@ -289,15 +279,9 @@
        String path  = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.RESOURCE_PATH).getCode()
                +systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.INENTITY_FILES).getCode();
        //类型:0=用工身份；1=货运身份；2=供餐身份；
        if(!Constants.equalsInteger(member.getWorkerIdentity(),Constants.ZERO)){//用工身份
            addMemberModelByType(member.getId(),Constants.ZERO,list,path);
        }
        if(!Constants.equalsInteger(member.getDriverIdentity(),Constants.ZERO)){//货运身份
            addMemberModelByType(member.getId(),Constants.ONE,list,path);
        }
        if(!Constants.equalsInteger(member.getChefIdentity(),Constants.ZERO)){//供餐很粉
            addMemberModelByType(member.getId(),Constants.TWO,list,path);
        }
        addMemberModelByType(member.getId(),Constants.ZERO,list,path);
        addMemberModelByType(member.getId(),Constants.ONE,list,path);
        addMemberModelByType(member.getId(),Constants.TWO,list,path);

        return list;
    }
@@ -474,10 +458,6 @@
        memberMapper.update(new UpdateWrapper<Member>().lambda()
                .set(Member::getUpdateUser,user.getId())
                .set(Member::getUpdateTime,date)
                .set(Constants.equalsInteger(auditDTO.getAuditStatus(),Constants.ZERO),Member::getAutoReceiveStatus,Constants.ONE)
                .set(Constants.equalsInteger(identityInfo.getType(),Constants.ZERO),Member::getWorkerIdentity, auditDTO.getAuditStatus() )
                .set(Constants.equalsInteger(identityInfo.getType(),Constants.ONE),Member::getDriverIdentity , auditDTO.getAuditStatus() )
                .set(Constants.equalsInteger(identityInfo.getType(),Constants.TWO),Member::getChefIdentity , auditDTO.getAuditStatus() )
                .eq(Member::getId,identityInfo.getMemberId())
        );