--no commit message

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

@@ -224,21 +224,22 @@ public class FgPermissionsController {
 			throw new BaseException(6,cb.getMsg());
 		}
 		Member m = mService.loginWechat(cb.getData().getOpenid());
-		Member info = new Member();
+		
 		if(m == null){
+			m = new Member();
 			//还未与平台用户绑定的微信用户
-			info.setWechatKey(cb.getData().getOpenid());
-			throw new BaseException(7,cb.getMsg(),info);
+			m.setWechatKey(cb.getData().getOpenid());
+			throw new BaseException(7,cb.getMsg(),m);
 		}else if (m.getStatus() == 0) {
 			throw new BaseException(5,"该账户已禁用");
 		}
 		LoginMemberInfo	info1 = new LoginMemberInfo();
-		BeanUtils.copyProperties(info, info1);
+		BeanUtils.copyProperties(m, info1);
 		String token = MD5Util.getEncoderByMd5(m.getAccount());
 		info1.setToken(token);
 		m.setToken(token);
 		redis.set(token,  JsonUtil.bean2Json(info1),60*60*24*7,TimeUnit.SECONDS);
-		return CallBack.success(info);
+		return CallBack.success(m);
 	}
 	@ApiOperation(value = "QQ用户登录", notes = "0：登录成功；5：该账户已禁用；6：第三方登录错误；7：未绑定平台账号；")
 	@GetMapping(value =MemberRequestPath.QQ + MemberRequestPath.LOGIN)