huanghongfa
2021-06-18 61ec2883ff54a1f9dd7ab7c4c0b9ec241e596099
修复老龄认证bug
2个文件已修改
12 ■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/EldersAuthApi.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/EldersAuthApi.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/EldersAuthApi.java
@@ -114,7 +114,7 @@
            return R.ok(result);
        }else{
            log.error("查询老人信息失败,错误信息:" + isOk.getMsg());
            return R.fail("查询老人信息失败");
            return isOk;
        }
    }
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/EldersAuthApi.java
@@ -1,5 +1,6 @@
package com.panzhihua.service_community.api;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.panzhihua.common.exceptions.ServiceException;
import com.panzhihua.common.model.dtos.community.*;
import com.panzhihua.common.model.dtos.elders.ComEldersAuthGetResultDTO;
@@ -8,6 +9,7 @@
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.elders.ComElderAuthUserDetailVO;
import com.panzhihua.common.model.vos.community.SysConfVO;
import com.panzhihua.common.utlis.DateUtils;
import com.panzhihua.service_community.model.dos.ComEldersAuthUserDO;
import com.panzhihua.service_community.model.dos.EldersAuthDO;
import com.panzhihua.common.model.vos.community.ComEldersAuthElderlyDetailsVO;
@@ -18,6 +20,7 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
/**
 * @ClasssName EldersAuthApi
@@ -39,11 +42,16 @@
    @PostMapping("/getAuth")
    public R getAuth(@RequestParam("authUserId") Long authUserId){
        ComEldersAuthUserDO authUserDO = comEldersAuthUserService.getById(authUserId);
        if(authUserDO == null){
            return R.fail("未查询到老人信息");
        }
        if(authUserDO.getIsAuth().equals(ComEldersAuthUserDO.isAuth.yes)){
            return R.fail("该老人已认证");
            List<EldersAuthDO> eldersAuthDOList = eldersAuthService.list(new QueryWrapper<EldersAuthDO>()
                    .lambda().eq(EldersAuthDO::getType,2).ge(EldersAuthDO::getCreateAt, DateUtils.getFirstDayOfMonth()));
            if(!eldersAuthDOList.isEmpty()){
                return R.fail("该老人已认证");
            }
        }
        ComElderAuthUserDetailVO authUserDetailVO = new ComElderAuthUserDetailVO();
        BeanUtils.copyProperties(authUserDO,authUserDetailVO);