diff --git a/dp2SIPClient/MainForm.Designer.cs b/dp2SIPClient/MainForm.Designer.cs
index 4aaf90a3..2ac338db 100644
--- a/dp2SIPClient/MainForm.Designer.cs
+++ b/dp2SIPClient/MainForm.Designer.cs
@@ -997,7 +997,7 @@ private void InitializeComponent()
this.button_send98.Name = "button_send98";
this.button_send98.Size = new System.Drawing.Size(81, 34);
this.button_send98.TabIndex = 7;
- this.button_send98.Text = "发送98";
+ this.button_send98.Text = "发送99";
this.button_send98.UseVisualStyleBackColor = true;
this.button_send98.Click += new System.EventHandler(this.button_send98_Click);
//
diff --git a/dp2SIPClient/dp2SIPClient.csproj b/dp2SIPClient/dp2SIPClient.csproj
index 1a28a1b2..3881965b 100644
--- a/dp2SIPClient/dp2SIPClient.csproj
+++ b/dp2SIPClient/dp2SIPClient.csproj
@@ -27,9 +27,10 @@
http://dp2003.com/dp2SIPClient/v1/
dp2SIPClient
DigitalPlatform
+ true
publish.htm
false
- 30
+ 33
1.0.0.%2a
false
true
diff --git a/dp2weixin.service/dp2WeiXinService.cs b/dp2weixin.service/dp2WeiXinService.cs
index 51112d52..61ece2ca 100644
--- a/dp2weixin.service/dp2WeiXinService.cs
+++ b/dp2weixin.service/dp2WeiXinService.cs
@@ -1218,6 +1218,19 @@ public int InternalDoMessage(MessageRecord record,
workerList,
send2PatronIsMask,
out strError);
+ }
+ else if (strType == "召回通知") //召回通知 20220622加
+ {
+ nRet = this.SendCallMsg(bodyDom,
+ libName,
+ bindPatronList,
+ patronBarcode,
+ patronName,
+ libraryCode,
+ workerList,
+ maskDef,
+ send2PatronIsMask,
+ out strError);
}
else if (strType == "借书成功")
{
@@ -2052,6 +2065,115 @@ private int SendYtdjMsg(XmlDocument bodyDom,
return 0;
}
+ // 20220622 召回通知
+ /*
+
+
+ 召回通知
+
+
+
+
+ 因 毕业手续需要,图书馆提醒您尽快归还下列书刊:
+彼得兔的故事 [专著] / (英)比阿特丽斯·波特著 ; (美)查尔斯·桑托利绘 ; 司南译. -- ISBN 978-7-5346-5588-3 : CNY16.80
+兔子布莱尔 [专著] / (美)约耳·钱德勒·哈里斯原著 ; (美)唐·戴利绘 ; 司南译. -- ISBN 978-7-5346-5595-1 : CNY16.80
+
+
+ P001
+ 本科生
+ 张三
+ 13862157150
+ 30704c50-21a5-43ba-b7a9-ab99826a1fb9
+
+
+
+
+
+
+
+
+ 测试注释
+
+
+
+
+
+ */
+ private int SendCallMsg(XmlDocument bodyDom,
+ string libName,
+ List bindPatronList,
+ string patronBarcode,
+ string patronName,
+ string patronLibraryCode,
+ List workers,
+ string maskDef, //2021/8/3 mask定义
+ bool send2PatronIsMask,
+ out string strError)
+ {
+ strError = "";
+ XmlNode root = bodyDom.DocumentElement;
+
+ // 直接获取text
+ string text = DomUtil.GetElementText(root, "text");
+ /*
+因 毕业手续需要,图书馆提醒您尽快归还下列书刊:
+彼得兔的故事 [专著] / (英)比阿特丽斯·波特著 ; (美)查尔斯·桑托利绘 ; 司南译. -- ISBN 978-7-5346-5588-3 : CNY16.80
+兔子布莱尔 [专著] / (美)约耳·钱德勒·哈里斯原著 ; (美)唐·戴利绘 ; 司南译. -- ISBN 978-7-5346-5595-1 : CNY16.80
+
+ */
+
+
+ // todo 等模板消息申请下来,改为一册一条消息,枚举下面item
+ /*
+
+
+
+
+ */
+
+
+ // 备注
+ string remark = this._msgRemark;
+ string operTime = DateTime.Now.ToString("yyyy/MM/dd");
+
+ string first_text = "☀☀☀☀☀☀☀☀☀☀";
+ string first_color = "#9400D3";
+ string title = "图书召回通知";
+ //{{first.DATA}}
+ //标题:{{keyword1.DATA}}
+ //时间:{{keyword2.DATA}}
+ //内容:{{keyword3.DATA}}
+ //{{remark.DATA}}
+ MessageTemplateData msgData = new MessageTemplateData(first_text,
+ first_color,
+ title,
+ operTime,
+ text,
+ remark);
+
+ // mask
+ //strText = strText.Replace(fullPatronName, maskFullPatronName);
+ MessageTemplateData maskMsgData = new MessageTemplateData(first_text,
+ first_color,
+ title,
+ operTime,
+ remark,
+ remark);
+
+ int nRet = this.SendTemplateMsg(GzhCfg.C_Template_Message,
+ bindPatronList,//bindWeixinIds,
+ workers,
+ msgData,
+ maskMsgData,
+ "",//linkurl
+ "",//theOperator,
+ send2PatronIsMask, // 2021/8/3 不mask
+ out strError);
+ if (nRet == -1)
+ return -1;
+
+ return 0;
+ }
/// 借书成功
///