--no commit message

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

@@ -445,6 +445,45 @@ public class FgPermissionsController {
 	@PostMapping(value = MemberRequestPath.REGISTER+MemberRequestPath.P_MEMBER)
 	public CallBack<Boolean> register(@RequestBody SavePMemberForm form) throws BaseException, Exception {
 		//FIXME: 20200513 抗议专题 注册无需获取验证码
+//		String redisCode = redis.get(form.getPhone());
+//		if (StringUtils.isBlank(redisCode)) {
+//			throw new BaseException(11,"验证码已过期，请从新发送");
+//		}
+//		if (!form.getCode().toLowerCase().equals(redisCode.toLowerCase())) {
+//			throw new BaseException(3,"验证码有误");
+//		}
+//		redis.delete(form.getPhone());
+//		if(mService.isExistByAccount(null,form.getAccount())) {
+//			throw new BaseException(99,"已被注册");
+//		}
+//		if(mService.isExistByPhone(null, form.getPhone())) {
+//			throw new BaseException(99,"已被使用");
+//		}
+		// 新增
+		synchronized (this) {
+			if(mService.isExistByAccount(null,form.getAccount())) {
+				throw new BaseException(99,"已被注册");
+			}
+			if(mService.isExistByPhone(null, form.getPhone())) {
+				throw new BaseException(99,"已被使用");
+			}
+			Member m = new Member();
+			BeanUtils.copyProperties(form, m);
+			//20191128-添加访问媒介默认值
+			m.setAccessMedium(AccessMediumEnum.WEB.getCode());
+			pmService.save(m);
+		}
+		/*Member m = mService.login(form.getAccount());
+		LoginMemberInfo	info = mService.isLevelLogin(m);
+		String token = MD5Util.getEncoderByMd5(m.getAccount());
+		info.setToken(token);
+		redis.set(token, info);*/
+		return CallBack.success(true);
+	}
+
+	@ApiOperation(value = "普通用户注册", notes = "0：成功；3：验证码有误；11：验证码已过期，请从新发送；99:已存在；")
+	@PostMapping(value = MemberRequestPath.REGISTER+MemberRequestPath.PC_MEMBER)
+	public CallBack<Boolean> registerPc(@RequestBody SavePMemberForm form) throws BaseException, Exception {
 		String redisCode = redis.get(form.getPhone());
 		if (StringUtils.isBlank(redisCode)) {
 			throw new BaseException(11,"验证码已过期，请从新发送");
@@ -480,6 +519,7 @@ public class FgPermissionsController {
 		redis.set(token, info);*/
 		return CallBack.success(true);
 	}
+
 	@ApiOperation(value = "机构用户注册", notes = "0：成功；12：机构号不存在；13：该机构已过期；14：该机构可使用次数不足，请从新发送；99:已存在；")
 	@PostMapping(value = MemberRequestPath.REGISTER+MemberRequestPath.O_MEMBER)
 	public CallBack<Boolean> register(@RequestBody SaveOMemberForm form) throws BaseException, Exception {