From 9d891e9d6dcbd12212a58342afbc0682f2b7959f Mon Sep 17 00:00:00 2001
From: CeDo <cedoo@qq.com>
Date: 星期四, 06 五月 2021 22:25:49 +0800
Subject: [PATCH] 党员认证bug修改

---
 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java |   16 ++++++++++------
 1 files changed, 10 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 a3b6b1e..f90f2c3 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
@@ -328,7 +328,7 @@
     @ApiOperation(value = "党员认证")
     @PostMapping("partybuildingembercertification")
     public R partybuildingembercertification(@RequestBody @Validated(AddGroup.class) ComPbMemberCertificationDTO comPbMemberCertificationDTO) {
-        //totest 党员认证
+        //党员认证
         LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
         Long userId = loginUserInfo.getUserId();
         Long communityId = loginUserInfo.getCommunityId();
@@ -342,17 +342,21 @@
         Object certUserInfo = certUser.getData();
         boolean userCertified = false;
         if (certUserInfo != null) {
-            PartyBuildingMemberVO certUserVo = (PartyBuildingMemberVO) certUserInfo;
-            //已认证党员身份,直接返回
-            userCertified = certUserVo.getAuditResult() == 1;
+            try {
+                PartyBuildingMemberVO certUserVo = JSONObject.parseObject(JSONObject.toJSONString(certUser.getData()), PartyBuildingMemberVO.class);
+                //已认证党员身份,直接返回
+                userCertified = certUserVo.getAuditResult() == 1;
+            }catch (Exception e){}
         }
         //匹配手机,验证是否进行自动确认
         if (userCertified) {
-            return R.fail("用户已完成党员认证");
+            return R.fail("您已审核通过,无需重复提交");
         }
 
         PartyBuildingMemberVO partyBuildingMemberVO = new PartyBuildingMemberVO();
         BeanUtils.copyProperties(comPbMemberCertificationDTO, partyBuildingMemberVO);
+        partyBuildingMemberVO.setAuditResult(0);
+        partyBuildingMemberVO.setCommunityId(communityId);
 
         //用户实名认证信息判断
         String idCard = loginUserInfo.getIdCard();
@@ -371,7 +375,7 @@
     @ApiOperation(value = "党员认证查询")
     @GetMapping("partybuildingembercertification")
     public R partybuildingembercertification() {
-        //totest 党员认证查询
+        //党员认证查询
         LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
         Long userId = loginUserInfo.getUserId();
         return partyBuildingService.userCertification(userId);

--
Gitblit v1.7.1