exchange.git - Gitblit

			@@ -122,17 +122,21 @@
			member.setPassword(SecureUtil.md5(registerDto.getPassword()));

			// 判断账号类型
			if (MemberEntity.ACCOUNT_TYPE_PHONE == registerDto.getType()) {
			if (MemberEntity.ACCOUNT_TYPE_PHONE.equals(registerDto.getType())) {
			member.setPhone(registerDto.getAccount());
			} else if (MemberEntity.ACCOUNT_TYPE_EMAIL == registerDto.getType()) {
			} else if (MemberEntity.ACCOUNT_TYPE_EMAIL.equals(registerDto.getType())) {
			member.setEmail(registerDto.getAccount());
			} else {
			return Result.fail("账号类型错误");
			}

			// 判断是否拥有推荐人，若为空则默认系统
			if (StrUtil.isBlank(registerDto.getRefererId())) {
			registerDto.setRefererId(AppContants.SYSTEM_REFERER);
			// if (StrUtil.isBlank(registerDto.getRefererId())) {
			// registerDto.setRefererId(AppContants.SYSTEM_REFERER);
			// }
			MemberEntity isExist = memberDao.selectMemberInfoByInviteId(registerDto.getRefererId());
			if (isExist == null) {
			return Result.fail("推荐人不存在");
			}

			member.setRefererId(registerDto.getRefererId());
			@@ -340,16 +344,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 +706,7 @@
			memberAuthnticationInfoVo.setSecondName(memberAuthenticationEntity.getSecondName());
			memberAuthnticationInfoVo.setNation(memberAuthenticationEntity.getNation());
			memberAuthnticationInfoVo.setIdCardNo(memberAuthenticationEntity.getIdcardNo());
			memberAuthnticationInfoVo.setType(memberAuthenticationEntity.getType());
			}
			}
			return Result.ok(memberAuthnticationInfoVo);
			@@ -871,7 +879,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 {

	src/main/java/com/xcong/excoin/modules/contract/parameter/vo/HoldOrderListVo.java	4 ●●●●● patch \| view \| raw \| blame \| history
	src/main/java/com/xcong/excoin/modules/member/entity/MemberAuthenticationEntity.java	6 ●●●●● patch \| view \| raw \| blame \| history
	src/main/java/com/xcong/excoin/modules/member/parameter/dto/MemberAuthenticationDto.java	6 ●●●●● patch \| view \| raw \| blame \| history
	src/main/java/com/xcong/excoin/modules/member/parameter/vo/MemberAuthenticationInfoVo.java	3 ●●●●● patch \| view \| raw \| blame \| history
	src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java	24 ●●●●● patch \| view \| raw \| blame \| history

			@@ -6,6 +6,7 @@
			import lombok.Data;

			import java.math.BigDecimal;
			import java.util.Date;

			/**
			* @author wzy
			@@ -57,6 +58,9 @@
			@ApiModelProperty(value = "可减少最大保证金")
			private BigDecimal canReduceMaxBond;

			@ApiModelProperty(value = "开仓时间")
			private Date createTime;

			public BigDecimal getOpeningPrice() {
			return openingPrice.setScale(4, BigDecimal.ROUND_DOWN);
			}

			@@ -43,10 +43,16 @@
			* 国家
			*/
			private String nation;

			/**
			* 身份证号
			*/
			private String idcardNo;

			/**
			* 证件类型
			*/
			private String type;

			/**
			* 身份证正面

			@@ -41,5 +41,9 @@
			@NotNull(message = "国家不能为空")
			@ApiModelProperty(value = "国家", example = "国家")
			private String nation;


			@NotNull(message = "类型不能为空")
			@ApiModelProperty(value = "类型1:身份证2：护照编号", example = "1")
			private String type;

			}

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

			@ApiModelProperty(value = "身份证卡号")
			private String idCardNo;

			@ApiModelProperty(value = "证件类型")
			private String type;

			@ApiModelProperty(value = "国家")
			private String nation;