From 6a2b90a995e26d659fd1f3f3fbe9712fc8fc2e51 Mon Sep 17 00:00:00 2001
From: yashen <yashen@gmail.com>
Date: Tue, 27 Sep 2016 11:16:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E9=93=BE=E6=8E=A5=E7=9B=B4?=
 =?UTF-8?q?=E6=8E=A5=E6=8C=87=E5=90=91=E6=B6=88=E6=81=AF=EF=BC=8C=E4=BB=A5?=
 =?UTF-8?q?=E5=89=8D=E6=98=AF=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 B3WeChat/BO/NamedValueTemplate.cs        |  6 +++---
 B3WeChat/Rpcs/ApproveMessageRpc.cs       | 10 ++++++++--
 WebFolder/config/NamedValue/B3WeChat.xml |  6 +++---
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/B3WeChat/BO/NamedValueTemplate.cs b/B3WeChat/BO/NamedValueTemplate.cs
index 144992c..27e0f31 100644
--- a/B3WeChat/BO/NamedValueTemplate.cs
+++ b/B3WeChat/BO/NamedValueTemplate.cs
@@ -9,11 +9,11 @@ namespace BWP.B3WeChat.BO.NamedValueTemplate
   public sealed class 审批状态
   {
     public static NamedValue<审批状态> 待审批 = new NamedValue<审批状态>(0);
-    public static NamedValue<审批状态> 已审批 = new NamedValue<审批状态>(10);
-    public static NamedValue<审批状态> 已退回 = new NamedValue<审批状态>(20);
+    public static NamedValue<审批状态> 已审批 = new NamedValue<审批状态>(1);
+    public static NamedValue<审批状态> 已退回 = new NamedValue<审批状态>(2);
     /// <summary>
     /// 审批消息本身没有已删除状态，只用来查询消息状态用
     /// </summary>
-    public static NamedValue<审批状态> 已删除 = new NamedValue<审批状态>(30);
+    public static NamedValue<审批状态> 已删除 = new NamedValue<审批状态>(3);
   }
 }
diff --git a/B3WeChat/Rpcs/ApproveMessageRpc.cs b/B3WeChat/Rpcs/ApproveMessageRpc.cs
index 4ece55e..957b7c1 100644
--- a/B3WeChat/Rpcs/ApproveMessageRpc.cs
+++ b/B3WeChat/Rpcs/ApproveMessageRpc.cs
@@ -11,6 +11,7 @@ using Forks.EnterpriseServices.SqlDoms;
 using Forks.Utils;
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Text;
 using System.Web;
@@ -53,13 +54,18 @@ namespace BWP.B3WeChat.Rpcs
       var mainSystemConfig = new MainSystemConfig();
       var internetAccessAddress = mainSystemConfig.InternetAccessAddress.Value;
 
-      var originUrl = internetAccessAddress + "app/index.html";
+      var originUrl = internetAccessAddress + "app/index.html?messageid=" + message.ID;
 
       var authUrl = internetAccessAddress + "WeChatLogin.aspx?url=" + HttpUtility.UrlEncode(originUrl);
 
       var wechatUrl = WeChatPageUtil.GetWeChatUrl(authUrl);
 
-      SendMessageUtil.SendInformInfo(message.OpenID, message.Title, DateTime.Now.ToShortTimeString(), message.Content, message.Username, BLContext.ClientIP, DateTime.Now.ToShortTimeString(), "", wechatUrl);
+
+      var wechatmessage = string.Format("ERP系统给你的用户{0}发送了一个消息待您审批", message.Username);
+
+      var timeStr = DateTime.Now.ToLongTimeString();
+
+      SendMessageUtil.SendInformInfo(message.OpenID, wechatmessage, timeStr, message.Title, message.Username, BLContext.ClientIP, timeStr, "", wechatUrl);
 
     }
 
diff --git a/WebFolder/config/NamedValue/B3WeChat.xml b/WebFolder/config/NamedValue/B3WeChat.xml
index 464cc4b..05e28a9 100644
--- a/WebFolder/config/NamedValue/B3WeChat.xml
+++ b/WebFolder/config/NamedValue/B3WeChat.xml
@@ -2,9 +2,9 @@
 <NamedValueSettings>
   <NamedValue type="BWP.B3WeChat.BO.NamedValueTemplate.审批状态, B3WeChat">
     <Word name="待审批" value="0"/>
-    <Word name="已审批" value="10"/>
-    <Word name="已退回" value="20"/>
-    <Word name="已删除" value="30"/>
+    <Word name="已审批" value="1"/>
+    <Word name="已退回" value="2"/>
+    <Word name="已删除" value="3"/>
   </NamedValue>
 </NamedValueSettings>