From 83d9ef6543610b6a95a58e6c1249974d3508e50c Mon Sep 17 00:00:00 2001
From: yashen <yashen@gmail.com>
Date: Thu, 8 Dec 2016 14:37:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E6=B6=88=E6=81=AF=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E4=B8=9A=E5=8A=A1=E5=8F=B7,=20=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E6=97=B6=E5=90=8C=E6=97=B6=E5=88=A0=E9=99=A4=E4=B8=9A=E5=8A=A1?=
 =?UTF-8?q?=E5=8F=B7=E7=9B=B8=E5=90=8C=E7=9A=84=E5=AE=A1=E6=89=B9=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 B3WeChat/BO/ApproveMessage.cs      | 10 ++++++++++
 B3WeChat/Rpcs/ApproveMessageRpc.cs | 17 +++++++++++++++--
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/B3WeChat/BO/ApproveMessage.cs b/B3WeChat/BO/ApproveMessage.cs
index 79a22af..e153076 100644
--- a/B3WeChat/BO/ApproveMessage.cs
+++ b/B3WeChat/BO/ApproveMessage.cs
@@ -19,6 +19,9 @@ namespace BWP.B3WeChat.BO
 
   [DBIndex("IDX_B3WeChat_ApproveMessage_CustomerCode_Username","CustomerCode",false,0)]
   [DBIndex("IDX_B3WeChat_ApproveMessage_CustomerCode_Username", "Username", false, 1)]
+
+  [DBIndex("IDX_B3WeChat_ApproveMessage_CustomerCode_BusinessNo", "CustomerCode", false, 0)]
+  [DBIndex("IDX_B3WeChat_ApproveMessage_CustomerCode_BusinessNo", "BusinessNo", false, 1)]
   public class ApproveMessage
   {
     /// <summary>
@@ -27,6 +30,13 @@ namespace BWP.B3WeChat.BO
     [DbColumn(AllowNull=false)]
     public string ID { get; set; }
 
+    /// <summary>
+    /// 删除时，其他用户如果收到相同的业务号，同时被删除
+    /// </summary>
+    [LogicName("业务号")]
+    public string BusinessNo { get; set; }
+
+
     [DbColumn(DefaultValue="2016-9-21")]
     public DateTime CreateTime { get; set; }
 
diff --git a/B3WeChat/Rpcs/ApproveMessageRpc.cs b/B3WeChat/Rpcs/ApproveMessageRpc.cs
index d361d78..bd9510d 100644
--- a/B3WeChat/Rpcs/ApproveMessageRpc.cs
+++ b/B3WeChat/Rpcs/ApproveMessageRpc.cs
@@ -35,7 +35,6 @@ namespace BWP.B3WeChat.Rpcs
     [Rpc]
     public static void Insert(ApproveMessage message)
     {
-
       var context = CustomerUserContext.Current;
       message.CustomerCode = context.CustomerCode;
       var openID = context.GetOpenID(message.Username);
@@ -44,7 +43,7 @@ namespace BWP.B3WeChat.Rpcs
       {
         return;//没有关注时不抛出异常，因为此操作比较普遍，并且消息比较大，导致系统日志中出现大量的错误日志
       }
-        
+
       message.OpenID = openID;
 
       ApproveMessageBL.Instance.Insert(message);
@@ -60,6 +59,18 @@ namespace BWP.B3WeChat.Rpcs
 #endif
     }
 
+    private static void DelMessagesByBusiness(ApproveMessage message)
+    {
+      if (string.IsNullOrEmpty(message.BusinessNo))
+      {
+        return;
+      }
+      var del = new DQDeleteDom(typeof(ApproveMessage));
+      del.Where.Conditions.Add(DQCondition.EQ("CustomerCode", message.CustomerCode));
+      del.Where.Conditions.Add(DQCondition.EQ("BusinessNo", message.BusinessNo));
+      del.EExecute();
+    }
+
 
     [Rpc]
     public static Dictionary<string, short> QueryApproveResult(string[] messageIDList)
@@ -101,6 +112,7 @@ namespace BWP.B3WeChat.Rpcs
       var message = bl.Load(messageID);
       SendMessageUtil.SendFeedbackNotice(message.OpenID, "你好，你的审批结果ERP系统已收到并处理", "微信审批接收", "消息号" + message.ID, message.CreateTime, true);
       bl.Delete(messageID);
+      DelMessagesByBusiness(message);
     }
 
     [Rpc]
@@ -108,6 +120,7 @@ namespace BWP.B3WeChat.Rpcs
       var message = bl.Load(messageID);
       SendMessageUtil.SendFeedbackNotice(message.OpenID, "你好，你的审批结果ERP系统已收到并处理", "微信审批接收", "消息号" + message.ID, message.CreateTime, false, reason);
       bl.Delete(messageID);
+      DelMessagesByBusiness(message);
     }
   }
 }