--no commit message

com.zrqx.fg.member/src/main/java/com/zrqx/fg/member/controller/permissions/FgPermissionsController.java

@@ -28,6 +28,7 @@ import com.zrqx.core.form.member.fg.permissions.LoginForm;
 import com.zrqx.core.form.member.fg.permissions.LoginMemberInfo;
 import com.zrqx.core.form.member.fg.permissions.MemberSecretSecurityForm;
 import com.zrqx.core.util.response.CallBack;
+import com.zrqx.core.vo.member.fg.permissions.AccountCheckVo;
 import com.zrqx.core.vo.member.permissions.QuestionVo;
 import com.zrqx.fg.member.service.permissions.FgPermissionsService;
 
@@ -124,7 +125,7 @@ public class FgPermissionsController {
 	
 	@ApiOperation("新增/修改绑定邮箱")
 	@PostMapping(value = MemberRequestPath.CHECK + MemberRequestPath.ACCOUNT)
-	public CallBack<String> checkAccount(@RequestBody AccountForm form) throws Exception{ 
+	public CallBack<AccountCheckVo> checkAccount(@RequestBody AccountForm form) throws Exception{ 
         return  CallBack.success(fgPermissionsService.checkAccount(form));
 	} 
 }

com.zrqx.fg.member/src/main/java/com/zrqx/fg/member/service/permissions/FgPermissionsService.java

@@ -5,13 +5,13 @@ import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 
-import com.zrqx.core.form.member.bg.member.member.UpdatePasswordForm;
 import com.zrqx.core.form.member.fg.permissions.AccountForm;
 import com.zrqx.core.form.member.fg.permissions.EmailForm;
 import com.zrqx.core.form.member.fg.permissions.FgUpdatePasswordForm;
 import com.zrqx.core.form.member.fg.permissions.LoginForm;
 import com.zrqx.core.form.member.fg.permissions.LoginMemberInfo;
 import com.zrqx.core.form.member.fg.permissions.MemberSecretSecurityForm;
+import com.zrqx.core.vo.member.fg.permissions.AccountCheckVo;
 import com.zrqx.core.vo.member.permissions.QuestionVo;
 
 public interface FgPermissionsService {
@@ -131,6 +131,6 @@ public interface FgPermissionsService {
 	 * @author lw
 	 * @date: 2019年5月11日 下午12:07:48
 	 */
-	String checkAccount(AccountForm form);
+	AccountCheckVo checkAccount(AccountForm form);
 
 }

com.zrqx.fg.member/src/main/java/com/zrqx/fg/member/service/permissions/FgPermissionsServiceImpl.java

 package com.zrqx.fg.member.service.permissions;
 
+import io.swagger.annotations.ApiModelProperty;
+
 import java.awt.image.BufferedImage;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -40,6 +42,7 @@ import com.zrqx.core.util.datatype.VerifyUtil;
 import com.zrqx.core.util.encry.MD5Util;
 import com.zrqx.core.util.ip.CusAccessObjectUtil;
 import com.zrqx.core.vo.member.fg.member.FgMemberVo;
+import com.zrqx.core.vo.member.fg.permissions.AccountCheckVo;
 import com.zrqx.core.vo.member.permissions.QuestionVo;
 import com.zrqx.fg.member.manage.member.FgMemberManage;
 import com.zrqx.fg.member.manage.permissions.FgMemberLoginLogManage;
@@ -358,24 +361,33 @@ public class FgPermissionsServiceImpl  implements FgPermissionsService {
     }
 
 	@Override
-	public String checkAccount(AccountForm form) {
+	public AccountCheckVo checkAccount(AccountForm form) {
 		String code = redis.get(form.getUuid());
 		if(form.getCode() == null || !form.getCode().equals(code)){
 			throw new BusinessValidateException("验证码错误");
 		}
 		Member record = new Member();
 		record.setPhone(form.getAccount());
-		if(fgMemberMapper.selectCount(record) == 1){
+		Boolean isExist = false;
+		Boolean isEmail = false;
+		Boolean isSecretSecurity = false;
+		String token = null;
+		List<Member> members = fgMemberMapper.select(record);
+		if(members != null && members.size() == 1){
+			isExist = true;
 			try {
-				String token = MD5Util.getEncoderByMd5(form.getAccount());
-				if(token != null){
-					return token;
-				}
+				token = MD5Util.getEncoderByMd5(form.getAccount());
 			} catch (Exception e) {
 				throw new BusinessValidateException("账号异常，请联系管理员");
 			}
+			Member member = members.get(0);
+			MemberSecretSecurity secretSecurityRecord = new MemberSecretSecurity();
+			secretSecurityRecord.setMemberId(member.getId());
+			isSecretSecurity = fgMemberSecretSecurityMapper.selectCount(secretSecurityRecord) > 0;
+			isEmail = member.getEmail() != null;
 		}
-		throw new BusinessValidateException("不存在此账号");
+		AccountCheckVo accountCheckVo = new AccountCheckVo(isExist, token, isEmail, isSecretSecurity);
+		return accountCheckVo;
 	}
 	
 }