20200701 代码提交

xiaoyong931011

2020-07-01 1cbdc671b70c979d9e9944ff4d859fac91c9518d

20200701   代码提交

 src/main/java/com/xcong/excoin/modules/member/entity/MemberAuthenticationEntity.java

@@ -43,10 +43,16 @@
     * 国家

     */

    private String nation;

    
    /**

     * 身份证号

     */

    private String idcardNo;

    
    /**

     * 证件类型

     */

    private String type;



    /**

     * 身份证正面


 src/main/java/com/xcong/excoin/modules/member/parameter/dto/MemberAuthenticationDto.java

@@ -41,5 +41,9 @@
    @NotNull(message = "国家不能为空")

    @ApiModelProperty(value = "国家", example = "国家")

    private String nation;



	
    @NotNull(message = "类型不能为空")

    @ApiModelProperty(value = "类型1:身份证2：护照编号", example = "1")

    private String type;

	
}


 src/main/java/com/xcong/excoin/modules/member/parameter/vo/MemberAuthenticationInfoVo.java

@@ -19,6 +19,9 @@
    

    @ApiModelProperty(value = "身份证卡号")

    private String idCardNo;

    
    @ApiModelProperty(value = "证件类型")

    private String type;

    

    @ApiModelProperty(value = "国家")

    private String nation;


 src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java

@@ -340,16 +340,19 @@
                return Result.fail(MessageSourceUtils.getString("member_service_0059"));
            }
            memberAuthenticationEntity.setSecondName(memberAuthenticationDto.getSecondName());

            
            String type = memberAuthenticationDto.getType();
            memberAuthenticationEntity.setType(type);
            
            String idCardNo = memberAuthenticationDto.getIdCardNo();
            if (StrUtil.isBlank(idCardNo)) {
                return Result.fail(MessageSourceUtils.getString("member_service_0060"));
                return Result.fail(MessageSourceUtils.getString("member_service_0060"));
            }
            memberAuthenticationEntity.setIdcardNo(idCardNo);
            //同一个身份证号码不能重复实名认证
            int count = memberAuthenticationDao.findMemberbyIdCardNoCount(idCardNo);
            if (count > 0) {
                return Result.fail(MessageSourceUtils.getString("member_service_0060"));
                return Result.fail(MessageSourceUtils.getString("member_service_0060"));
            }
            if (StrUtil.isBlank(memberAuthenticationDto.getIdCardFront())
                    || StrUtil.isBlank(memberAuthenticationDto.getIdCardReverse())
@@ -699,6 +702,7 @@
                memberAuthnticationInfoVo.setSecondName(memberAuthenticationEntity.getSecondName());
                memberAuthnticationInfoVo.setNation(memberAuthenticationEntity.getNation());
                memberAuthnticationInfoVo.setIdCardNo(memberAuthenticationEntity.getIdcardNo());
                memberAuthnticationInfoVo.setType(memberAuthenticationEntity.getType());
            }
        }
        return Result.ok(memberAuthnticationInfoVo);
@@ -871,7 +875,7 @@
                 */
                return Result.ok(MessageSourceUtils.getString("member_service_0086"));
            } else {
                return Result.fail(MessageSourceUtils.getString("order_service_0040"));
                return Result.fail(MessageSourceUtils.getString("member_service_0038"));
            }

        } else {