From 7eaa1e1eac1b314afcd09d69ac10b969c62e56ef Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 20 五月 2021 10:51:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
index c03845f..cfe0ea8 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
@@ -1560,7 +1560,8 @@
if(theFamily==null){
return R.fail("家庭成员信息错误");
}
- if(theFamily.getAge()>=80){
+ Integer age = IdCard.IdNOToAge(theFamily.getIdCard());
+ if(age>=80){
Long loginUserId = eldersAuthAddByFamilyDTO.getUserId();
EldersAuthDO eldersAuthDO = new EldersAuthDO();
eldersAuthDO.setSumitUserId(eldersAuthAddByFamilyDTO.getSumitUserId());
@@ -1571,7 +1572,9 @@
eldersAuthDO.setVideoUrl(eldersAuthAddByFamilyDTO.getVideoUrl());
eldersAuthDO.setFamilyUserId(eldersAuthAddByFamilyDTO.getFamilyUserId());
//根据身份证查询出籍贯 出生日期
- String domicile = "";
+ //String domicile = IdCard.domicile(eldersAuthDO.getIdCard());
+ String domicile = eldersAuthService.queryDomicile(eldersAuthDO.getIdCard());
+
Date birthDay = IdCard.birthDay(eldersAuthDO.getIdCard());
eldersAuthDO.setDomicile(domicile);
eldersAuthDO.setBirthDay(birthDay);
--
Gitblit v1.7.1