Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop

xiaoyong931011

2021-06-28 0741dc7f25811ea2acb4127fc43d1dc9a802221c

 gc-user/src/main/java/com/xzx/gc/user/service/JhyInfoService.java

@@ -54,13 +54,21 @@
        return jhyInfo.getStatus();
    }

    public boolean isJhy(String userId) {
    public int isJhy(String userId) {
        JhyInfo jhyInfo = jhyInfoMapper.selectJhyInfoByUserId(userId);
        if (jhyInfo == null) {
            return false;
            return 0;
        }

        return JhyInfo.CHECK_PASS.equals(jhyInfo.getStatus());
        if (JhyInfo.CHECK_REFUSE.equals(jhyInfo.getStatus())) {
            return 0;
        }

        if (JhyInfo.CHECK_PASS.equals(jhyInfo.getStatus())) {
            return 1;
        } else {
            return 2;
        }
    }

    public Map<String, Object> queryList(JhyInfoListDto jhyInfoListDto) {