Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-05-07 59d3d6ad85bad326c35aa196fdb0550b2de1731d

 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,9 +342,11 @@
        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) {
@@ -373,7 +375,7 @@
    @ApiOperation(value = "党员认证查询")
    @GetMapping("partybuildingembercertification")
    public R partybuildingembercertification() {
        //totest 党员认证查询
        //党员认证查询
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        Long userId = loginUserInfo.getUserId();
        return partyBuildingService.userCertification(userId);