From f0bf887e538163e65101a4b9e2a165eb7694a90e Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期五, 21 十一月 2025 16:08:49 +0800
Subject: [PATCH] feat:开发
---
ApiTools.Core/Services/ChannelPingAnPayWalletService.cs | 2 +-
ApiTools.Core/Utils/WxmpUtils/WxmpUtils.cs | 10 +++++-----
ApiTools.Core/Models/WxmpUtils/Commands/SendWxmpSubscribMessageCommand.cs | 2 +-
ApiTools.Core/ApiTools.Core.xml | 7 ++++++-
ApiTools.Application/WxUtils/Commands/WxmpSubscribMessageCommandHandler.cs | 2 +-
5 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/ApiTools.Application/WxUtils/Commands/WxmpSubscribMessageCommandHandler.cs b/ApiTools.Application/WxUtils/Commands/WxmpSubscribMessageCommandHandler.cs
index 45ea2c6..3e600b2 100644
--- a/ApiTools.Application/WxUtils/Commands/WxmpSubscribMessageCommandHandler.cs
+++ b/ApiTools.Application/WxUtils/Commands/WxmpSubscribMessageCommandHandler.cs
@@ -35,7 +35,7 @@
await utils.WxmpSendSubscribMessage(new WxmpSendSubscribMessageRequest
{
Data = request.Data,
- TemplateId = request.Template.ToString(),
+ TemplateId = request.TemplateId,
Page = request.Page,
WxmpCode = request.WxmpCode,
Touser = request.Touser,
diff --git a/ApiTools.Core/ApiTools.Core.xml b/ApiTools.Core/ApiTools.Core.xml
index f1928fe..04bee02 100644
--- a/ApiTools.Core/ApiTools.Core.xml
+++ b/ApiTools.Core/ApiTools.Core.xml
@@ -1962,6 +1962,11 @@
鎺掔彮鎴愬姛閫氱煡 鎺掔彮鍚庡悜C绔汉鍛橀�氱煡
</summary>
</member>
+ <member name="F:ApiTools.Core.EnumWxmpSubscribMessageTemplate.Test">
+ <summary>
+ 娴嬭瘯
+ </summary>
+ </member>
<member name="T:ApiTools.Core.IIsDisabled">
<summary>
鏄惁宸茬鐢�
@@ -3293,7 +3298,7 @@
灏忕▼搴忕紪鍙�
</summary>
</member>
- <member name="P:ApiTools.Core.SendWxmpSubscribMessageCommand.Template">
+ <member name="P:ApiTools.Core.SendWxmpSubscribMessageCommand.TemplateId">
<summary>
鎵�闇�涓嬪彂鐨勮闃呮ā鏉縤d
</summary>
diff --git a/ApiTools.Core/Models/WxmpUtils/Commands/SendWxmpSubscribMessageCommand.cs b/ApiTools.Core/Models/WxmpUtils/Commands/SendWxmpSubscribMessageCommand.cs
index cbc2ac9..e12d07f 100644
--- a/ApiTools.Core/Models/WxmpUtils/Commands/SendWxmpSubscribMessageCommand.cs
+++ b/ApiTools.Core/Models/WxmpUtils/Commands/SendWxmpSubscribMessageCommand.cs
@@ -25,7 +25,7 @@
/// 鎵�闇�涓嬪彂鐨勮闃呮ā鏉縤d
/// </summary>
[Required]
- public EnumWxmpSubscribMessageTemplate Template { get; set; }
+ public string TemplateId { get; set; }
/// <summary>
/// 鐐瑰嚮妯℃澘鍗＄墖鍚庣殑璺宠浆椤甸潰锛屼粎闄愭湰灏忕▼搴忓唴鐨勯〉闈€�傛敮鎸佸甫鍙傛暟,锛堢ず渚媔ndex?foo=bar锛夈�傝瀛楁涓嶅～鍒欐ā鏉挎棤璺宠浆
diff --git a/ApiTools.Core/Services/ChannelPingAnPayWalletService.cs b/ApiTools.Core/Services/ChannelPingAnPayWalletService.cs
index a8262b4..d430a18 100644
--- a/ApiTools.Core/Services/ChannelPingAnPayWalletService.cs
+++ b/ApiTools.Core/Services/ChannelPingAnPayWalletService.cs
@@ -70,7 +70,7 @@
public async Task Transfer(ChannelWallet wallet, ChannelWalletTransaction transaction)
{
transaction.PingAnPay = transaction.PingAnPay ?? new ChannelWalletTransactionPingAnPay();
- if (transaction.ReceiveBank == "123閾惰")
+ if (transaction.ReceiveAccount == "1234123412341234")
{
transaction.ErrorCode = "500";
transaction.FailReason = "鍗″彿閿欒";
diff --git a/ApiTools.Core/Utils/WxmpUtils/WxmpUtils.cs b/ApiTools.Core/Utils/WxmpUtils/WxmpUtils.cs
index 33c360c..864a1d8 100644
--- a/ApiTools.Core/Utils/WxmpUtils/WxmpUtils.cs
+++ b/ApiTools.Core/Utils/WxmpUtils/WxmpUtils.cs
@@ -161,11 +161,11 @@
if (option == null || option.AppId.IsNull() || option.AppSecret.IsNull())
throw Oops.Oh(EnumErrorCodeType.s400, "鍙戦�佽闃呮秷鎭け璐ワ紝缂哄け閰嶇疆锛歐xmpOptions");
command.EnvVersion = option.EnvVersion;
- if (!options.Value.SubscribMessageTemplates.ContainsKey(command.TemplateId))
- throw Oops.Oh(EnumErrorCodeType.s400, "鍙戦�佽闃呮秷鎭け璐ワ紝妯℃澘涓嶅瓨鍦�");
- var template = options.Value.SubscribMessageTemplates[command.TemplateId];
- command.TemplateId = template.TemplateId;
- if (command.Page.IsNull()) command.Page = template.Page;
+ //if (!options.Value.SubscribMessageTemplates.ContainsKey(command.TemplateId))
+ // throw Oops.Oh(EnumErrorCodeType.s400, "鍙戦�佽闃呮秷鎭け璐ワ紝妯℃澘涓嶅瓨鍦�");
+ //var template = options.Value.SubscribMessageTemplates[command.TemplateId];
+ //command.TemplateId = template.TemplateId;
+ //if (command.Page.IsNull()) command.Page = template.Page;
var accessToken = await GetAccessToken(command.WxmpCode);
var jsonContent = JsonConvert.SerializeObject(command, new JsonSerializerSettings
{
--
Gitblit v1.9.1