From 147a7ce2b1cc45cb58c69c82c3b0e0b2d3910b05 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期五, 03 九月 2021 18:13:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into txb
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/EldersAuthApi.java | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/EldersAuthApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/EldersAuthApi.java
index 17cca0d..b5e1a74 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/EldersAuthApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/EldersAuthApi.java
@@ -4,6 +4,9 @@
import javax.annotation.Resource;
+import cn.hutool.core.util.IdcardUtil;
+import com.panzhihua.service_community.model.dos.ComEldersAuthElderlyDO;
+import com.panzhihua.service_community.service.ComEldersAuthElderlyService;
import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.*;
@@ -43,6 +46,8 @@
private ComEldersAuthUserService comEldersAuthUserService;
@Resource
private EldersAuthService eldersAuthService;
+ @Resource
+ private ComEldersAuthElderlyService comEldersAuthElderlyService;
@PostMapping("/getAuth")
public R getAuth(@RequestParam("authUserId") Long authUserId) {
@@ -51,12 +56,28 @@
if (authUserDO == null) {
return R.fail("未查询到老人信息");
}
+
+ //判断当前提交用户是否符合认证条件
+ ComEldersAuthElderlyDO authElderlyDO = comEldersAuthElderlyService.getOne(new QueryWrapper<ComEldersAuthElderlyDO>()
+ .lambda().eq(ComEldersAuthElderlyDO::getId,authUserDO.getBigAgeId()));
+ if(authElderlyDO == null){
+ return R.fail("未查询到老人信息");
+ }
+
+ int age = IdcardUtil.getAgeByIdCard(authElderlyDO.getIdCard());
+ if(age < 80 || authElderlyDO.getIsBigAge().equals(ComEldersAuthElderlyDO.isBigAge.no)
+ || authElderlyDO.getIsExist().equals(ComEldersAuthElderlyDO.isExist.no)){
+ return R.fail("未满足认证条件");
+ }
+
if (authUserDO.getIsAuth().equals(ComEldersAuthUserDO.isAuth.yes)) {
List<EldersAuthDO> eldersAuthDOList = eldersAuthService.list(new QueryWrapper<EldersAuthDO>().lambda()
- .eq(EldersAuthDO::getType, 2).ge(EldersAuthDO::getCreateAt, DateUtils.getFirstDayOfMonth()));
+ .eq(EldersAuthDO::getType, 2).eq(EldersAuthDO::getFamilyUserId,authUserId)
+ .ge(EldersAuthDO::getCreateAt, DateUtils.getFirstDayOfMonth()));
if (!eldersAuthDOList.isEmpty()) {
return R.fail("该老人已认证");
}
+
}
ComElderAuthUserDetailVO authUserDetailVO = new ComElderAuthUserDetailVO();
BeanUtils.copyProperties(authUserDO, authUserDetailVO);
--
Gitblit v1.7.1