From a9fac3d1e2fdba55d61196cc14377c48c66e6daf Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期二, 27 四月 2021 10:54:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java | 44 ++++++++++++++++++++++++++++++++++++++------
1 files changed, 38 insertions(+), 6 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
index 8d613da..f425801 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
@@ -8,9 +8,7 @@
import com.panzhihua.common.model.dtos.user.SysUserFeedbackDTO;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.partybuilding.PartyBuildingMemberVO;
-import com.panzhihua.common.model.vos.user.ComMngFamilyInfoVO;
-import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
-import com.panzhihua.common.model.vos.user.UserPhoneVO;
+import com.panzhihua.common.model.vos.user.*;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.partybuilding.PartyBuildingService;
import com.panzhihua.common.service.user.UserService;
@@ -107,22 +105,35 @@
loginUserInfoVO.setUserId(userId);
R r = userService.putUserAuthentication(loginUserInfoVO);
if (R.isOk(r)) {
- //通过不发通知
+ //通过发通知
+ SysUserNoticeVO sysUserNoticeVO=new SysUserNoticeVO();
+ sysUserNoticeVO.setUserId(userId);
+ sysUserNoticeVO.setType(3);
+ sysUserNoticeVO.setTitle("实名制审核通过");
+ sysUserNoticeVO.setBusinessType(6);
+ sysUserNoticeVO.setBusinessContent("恭喜你，你已经通过了实名制认证");
+ sysUserNoticeVO.setStatus(0);
+ sysUserNoticeVO.setBusinessStatus(2);
+ R r1 = userService.addNotice(sysUserNoticeVO);
+ if (R.isOk(r1)) {
+ log.info("新增实名认证未通过通知成功【{}】", JSONObject.toJSONString(sysUserNoticeVO));
+ }
} else {
+ //未通过发通知
+ /**
SysUserNoticeVO sysUserNoticeVO=new SysUserNoticeVO();
sysUserNoticeVO.setUserId(userId);
sysUserNoticeVO.setType(3);
sysUserNoticeVO.setTitle("实名制审核未通过");
sysUserNoticeVO.setBusinessType(6);
-// sysUserNoticeVO.setBusinessTitle(comActActivityVO.getActivityName());
sysUserNoticeVO.setBusinessContent(String.format("驳回原因：%s",r.getMsg()));
-// sysUserNoticeVO.setBusinessId(activityId);R
sysUserNoticeVO.setStatus(0);
sysUserNoticeVO.setBusinessStatus(1);
R r1 = userService.addNotice(sysUserNoticeVO);
if (R.isOk(r1)) {
log.info("新增实名认证未通过通知成功【{}】", JSONObject.toJSONString(sysUserNoticeVO));
}
+ */
}
return r;
}
@@ -366,4 +377,25 @@
return partyBuildingService.userCertification(userId);
}
+
+ @ApiOperation(value = "获取用户电子档案",response = UserArchivesVO.class)
+ @PostMapping("getUserArchives")
+ public R getUserArchives() {
+ Long userId = this.getUserId();
+ if(userId == null){
+ return R.fail("请重新登录");
+ }
+ return userService.getUserArchives(userId);
+ }
+
+ @ApiOperation(value = "编辑用户电子档案")
+ @PostMapping("updateUserArchives")
+ public R updateUserArchives(@RequestBody UpdateUserArchivesVO userArchivesVO) {
+ Long userId = this.getUserId();
+ if(userId == null){
+ return R.fail("请重新登录");
+ }
+ userArchivesVO.setUserId(userId);
+ return userService.updateUserArchives(userArchivesVO);
+ }
}
--
Gitblit v1.7.1