Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

weimingfei

4 天以前 9958c9393c8c3a5e2350fa9023e14cbbf74b0d9a

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkIccardServiceImpl.java

@@ -4,6 +4,7 @@
import com.doumee.core.exception.BusinessException;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
import com.doumee.dao.business.dto.QueryUserByCodeDTO;
import com.doumee.dao.business.model.*;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.third.model.LoginUserInfo;
@@ -151,6 +152,7 @@
                .leftJoin(Member.class,Member::getId,JkIccard::getMemberId)
                .eq(JkIccard::getIsdeleted,Constants.ZERO)
                .eq(Objects.nonNull(model.getStatus()),JkIccard::getStatus,model.getStatus())
                .eq(Objects.nonNull(model.getUserType()),JkIccard::getUserType,model.getUserType())
                .like(StringUtils.isNotBlank(model.getCode()),JkIccard::getCode,model.getCode())
                .like(StringUtils.isNotBlank(model.getMemberName()),Member::getName,model.getMemberName())
                .orderByDesc(JkIccard::getCreateDate)
@@ -180,16 +182,24 @@


    @Override
    public Integer getMemberIdByCode(String code){
    public Integer getMemberIdByCode(QueryUserByCodeDTO dto){
        if(Objects.isNull(dto)
        || Objects.isNull(dto.getUserType())
        || StringUtils.isBlank(dto.getCode())){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        JkIccard jkIccard = jkIccardMapper.selectOne(new QueryWrapper<JkIccard>().lambda()
                .eq(JkIccard::getIsdeleted,Constants.ZERO)
                .eq(JkIccard::getStatus,Constants.ONE)
                .eq(JkIccard::getCode,code)
                .eq(JkIccard::getUserType,dto.getUserType())
                .eq(JkIccard::getCode,dto.getCode())
                .last(" limit 1 ")
        );
        if(Objects.isNull(jkIccard)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY);
        }
        if(!Constants.equalsInteger(jkIccard.getStatus(),Constants.ONE)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，当前IC卡已被禁用！");
        }
        return jkIccard.getMemberId();

    }