From 646b9d1c6cc4a22c18cdfbd96851828bca06b67e Mon Sep 17 00:00:00 2001
From: yashen <yashen@gmail.com>
Date: Tue, 29 Aug 2017 15:51:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2=E5=BE=AE?=
 =?UTF-8?q?=E4=BF=A1=E7=99=BB=E5=BD=95=E7=94=A8=E6=88=B7=E5=90=8D=E7=9A=84?=
 =?UTF-8?q?Rpc=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 B3WeChat/Rpcs/WeChatUserRpc.cs | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/B3WeChat/Rpcs/WeChatUserRpc.cs b/B3WeChat/Rpcs/WeChatUserRpc.cs
index 9167329..1df885d 100644
--- a/B3WeChat/Rpcs/WeChatUserRpc.cs
+++ b/B3WeChat/Rpcs/WeChatUserRpc.cs
@@ -99,9 +99,8 @@ namespace BWP.B3WeChat.Rpcs
       return InOutMessageUtil.GetJsApiSignature(noncestr, timestamp, url);
     }
 
-
     [Rpc]
-    public static void ScanLoginConfirm(long requestID)
+    public static string QueryScanLoginInfo(long requestID)
     {
       var request = WebBLUtil.GetSingleDmo<ScanLoginRequest>(new Tuple<string, object>("ID", requestID));
       if (request == null)
@@ -109,7 +108,8 @@ namespace BWP.B3WeChat.Rpcs
         throw new Exception("不存在的扫码登录号");
       }
 
-      if(request.Confirmed){
+      if (request.Confirmed)
+      {
         throw new Exception("已经确认过了");
       }
 
@@ -124,6 +124,25 @@ namespace BWP.B3WeChat.Rpcs
         throw new Exception("未能发现关联的用户");
       }
 
+      return username;
+    }
+
+
+    [Rpc]
+    public static void ScanLoginConfirm(long requestID)
+    {
+      var request = WebBLUtil.GetSingleDmo<ScanLoginRequest>(new Tuple<string, object>("ID", requestID));
+      if (request == null)
+      {
+        throw new Exception("不存在的扫码登录号");
+      }
+
+      if(request.Confirmed){
+        throw new Exception("已经确认过了");
+      }
+
+      var username = QueryScanLoginInfo(requestID);
+
       request.Confirmed = true;
       request.CustomerUsername = username;