diff --git a/src/Senparc.Weixin.MP/Senparc.Weixin.MP/Enums.cs b/src/Senparc.Weixin.MP/Senparc.Weixin.MP/Enums.cs
index 174e619027..33e0c39199 100644
--- a/src/Senparc.Weixin.MP/Senparc.Weixin.MP/Enums.cs
+++ b/src/Senparc.Weixin.MP/Senparc.Weixin.MP/Enums.cs
@@ -428,23 +428,6 @@ public enum Event
///
subscribe_msg_sent_event,
#endregion
-
- #region 小程序虚拟支付
- ///
- /// 道具发货推送
- ///
- xpay_goods_deliver_notify,
-
- ///
- /// 代币支付推送
- ///
- xpay_coin_pay_notify,
-
- ///
- /// 退款推送
- ///
- xpay_refund_notify,
- #endregion
}
diff --git a/src/Senparc.Weixin.MP/Senparc.Weixin.MP/MessageHandlers/Async/MessageHandlerAsync.Event.cs b/src/Senparc.Weixin.MP/Senparc.Weixin.MP/MessageHandlers/Async/MessageHandlerAsync.Event.cs
index f7bfe0223b..79fbb95db4 100644
--- a/src/Senparc.Weixin.MP/Senparc.Weixin.MP/MessageHandlers/Async/MessageHandlerAsync.Event.cs
+++ b/src/Senparc.Weixin.MP/Senparc.Weixin.MP/MessageHandlers/Async/MessageHandlerAsync.Event.cs
@@ -244,18 +244,6 @@ public virtual async Task OnEventRequestAsync(IRequestMess
break;
#endregion
- #region 小程序虚拟支付
- case Event.xpay_goods_deliver_notify:
- responseMessage = await OnEvent_XPay_Goods_Deliver_NotifyAsync(RequestMessage as RequestMessageEvent_XPay_Goods_Deliver_Notify);
- break;
- case Event.xpay_coin_pay_notify:
- responseMessage = await OnEvent_XPay_Coin_Pay_NotifyAsync(RequestMessage as RequestMessageEvent_XPay_Coin_Pay_Notify);
- break;
- case Event.xpay_refund_notify:
- responseMessage = await OnEvent_XPay_Refund_NotifyAsync(RequestMessage as RequestMessageEvent_XPay_Refund_Notify);
- break;
- #endregion
-
default:
throw new Exceptions.UnknownRequestMsgTypeException("未知的Event下属请求信息", null);
}
@@ -781,39 +769,6 @@ public virtual async Task OnEvent_Subscribe_Msg_SentReques
}
#endregion
- #region 小程序虚拟支付
-
- ///
- /// 小程序虚拟支付 - 道具发货推送
- ///
- ///
- ///
- public virtual async Task OnEvent_XPay_Goods_Deliver_NotifyAsync(RequestMessageEvent_XPay_Goods_Deliver_Notify requestMessage)
- {
- return await DefaultAsyncMethod(requestMessage, () => OnEvent_XPay_Goods_Deliver_Notify(requestMessage)).ConfigureAwait(false);
- }
-
- ///
- /// 小程序虚拟支付 - 代币支付推送
- ///
- ///
- ///
- public virtual async Task OnEvent_XPay_Coin_Pay_NotifyAsync(RequestMessageEvent_XPay_Coin_Pay_Notify requestMessage)
- {
- return await DefaultAsyncMethod(requestMessage, () => OnEvent_XPay_Coin_Pay_Notify(requestMessage)).ConfigureAwait(false);
- }
-
- ///
- /// 小程序虚拟支付 - 退款推送
- ///
- ///
- ///
- public virtual async Task OnEvent_XPay_Refund_NotifyAsync(RequestMessageEvent_XPay_Refund_Notify requestMessage)
- {
- return await DefaultAsyncMethod(requestMessage, () => OnEvent_XPay_Refund_Notify(requestMessage)).ConfigureAwait(false);
- }
- #endregion
-
#endregion
}
}
\ No newline at end of file
diff --git a/src/Senparc.Weixin.MP/Senparc.Weixin.MP/MessageHandlers/MessageHandler.Event.cs b/src/Senparc.Weixin.MP/Senparc.Weixin.MP/MessageHandlers/MessageHandler.Event.cs
index 2a1f0855d3..7635baa2b6 100644
--- a/src/Senparc.Weixin.MP/Senparc.Weixin.MP/MessageHandlers/MessageHandler.Event.cs
+++ b/src/Senparc.Weixin.MP/Senparc.Weixin.MP/MessageHandlers/MessageHandler.Event.cs
@@ -249,18 +249,6 @@ public virtual IResponseMessageBase OnEventRequest(IRequestMessageEventBase requ
break;
#endregion
- #region 小程序虚拟支付
- case Event.xpay_goods_deliver_notify:
- responseMessage = OnEvent_XPay_Goods_Deliver_Notify(RequestMessage as RequestMessageEvent_XPay_Goods_Deliver_Notify);
- break;
- case Event.xpay_coin_pay_notify:
- responseMessage = OnEvent_XPay_Coin_Pay_Notify(RequestMessage as RequestMessageEvent_XPay_Coin_Pay_Notify);
- break;
- case Event.xpay_refund_notify:
- responseMessage = OnEvent_XPay_Refund_Notify(RequestMessage as RequestMessageEvent_XPay_Refund_Notify);
- break;
- #endregion
-
default:
throw new Exceptions.UnknownRequestMsgTypeException("未知的Event下属请求信息", null);
}
@@ -786,21 +774,6 @@ public virtual IResponseMessageBase OnEvent_Subscribe_Msg_SentRequest(RequestMes
return DefaultResponseMessage(requestMessage);
}
#endregion
-
- #region 小程序虚拟支付
- public virtual IResponseMessageBase OnEvent_XPay_Goods_Deliver_Notify(RequestMessageEvent_XPay_Goods_Deliver_Notify requestMessage)
- {
- return DefaultResponseMessage(requestMessage);
- }
- public virtual IResponseMessageBase OnEvent_XPay_Coin_Pay_Notify(RequestMessageEvent_XPay_Coin_Pay_Notify requestMessage)
- {
- return DefaultResponseMessage(requestMessage);
- }
- public virtual IResponseMessageBase OnEvent_XPay_Refund_Notify(RequestMessageEvent_XPay_Refund_Notify requestMessage)
- {
- return DefaultResponseMessage(requestMessage);
- }
- #endregion
#endregion
}
}
diff --git a/src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayApi.cs b/src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayApi.cs
similarity index 99%
rename from src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayApi.cs
rename to src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayApi.cs
index 6f85d2223f..f9e11144ed 100644
--- a/src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayApi.cs
+++ b/src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayApi.cs
@@ -32,16 +32,15 @@ and limitations under the License.
using Senparc.NeuChar;
using Senparc.Weixin.CommonAPIs;
using Senparc.Weixin.Entities;
-using Senparc.Weixin.Open.XPayAPIs.XPayJson;
using System.Threading.Tasks;
-namespace Senparc.Weixin.Open.XPayAPIs
+namespace Senparc.Weixin.WxOpen.AdvancedAPIs.XPay
{
///
/// 小程序虚拟支付
/// https://developers.weixin.qq.com/miniprogram/dev/platform-capabilities/industry/virtual-payment.html#_2-3-%E6%9C%8D%E5%8A%A1%E5%99%A8API
///
- [NcApiBind(NeuChar.PlatformType.WeChat_Open, true)]
+ [NcApiBind(NeuChar.PlatformType.WeChat_MiniProgram, true)]
public class XPayApi
{
#region 同步方法
diff --git a/src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/BindTransferAccoutRequestData.cs b/src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/BindTransferAccoutRequestData.cs
similarity index 91%
rename from src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/BindTransferAccoutRequestData.cs
rename to src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/BindTransferAccoutRequestData.cs
index f2637cbedc..c0468bd491 100644
--- a/src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/BindTransferAccoutRequestData.cs
+++ b/src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/BindTransferAccoutRequestData.cs
@@ -1,6 +1,6 @@
using System.Collections.Generic;
-namespace Senparc.Weixin.Open.XPayAPIs.XPayJson
+namespace Senparc.Weixin.WxOpen.AdvancedAPIs.XPay
{
///
/// 绑定广告金充值账户
diff --git a/src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/CancelCurrencyPayJsonResult.cs b/src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/CancelCurrencyPayJsonResult.cs
similarity index 89%
rename from src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/CancelCurrencyPayJsonResult.cs
rename to src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/CancelCurrencyPayJsonResult.cs
index 76173fee29..59a8bcfb46 100644
--- a/src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/CancelCurrencyPayJsonResult.cs
+++ b/src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/CancelCurrencyPayJsonResult.cs
@@ -5,7 +5,7 @@
using System.Text;
using System.Threading.Tasks;
-namespace Senparc.Weixin.Open.XPayAPIs.XPayJson
+namespace Senparc.Weixin.WxOpen.AdvancedAPIs.XPay
{
///
/// 代币支付退款(currency_pay接口的逆操作)
diff --git a/src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/CancelCurrencyPayRequestData.cs b/src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/CancelCurrencyPayRequestData.cs
similarity index 95%
rename from src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/CancelCurrencyPayRequestData.cs
rename to src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/CancelCurrencyPayRequestData.cs
index 83c0bccde9..f40cadaa80 100644
--- a/src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/CancelCurrencyPayRequestData.cs
+++ b/src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/CancelCurrencyPayRequestData.cs
@@ -4,7 +4,7 @@
using System.Text;
using System.Threading.Tasks;
-namespace Senparc.Weixin.Open.XPayAPIs.XPayJson
+namespace Senparc.Weixin.WxOpen.AdvancedAPIs.XPay
{
///
/// 代币支付退款(currency_pay接口的逆操作)
diff --git a/src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/CreateFundsBillJsonResult.cs b/src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/CreateFundsBillJsonResult.cs
similarity index 88%
rename from src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/CreateFundsBillJsonResult.cs
rename to src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/CreateFundsBillJsonResult.cs
index fc384d7fc7..743a913380 100644
--- a/src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/CreateFundsBillJsonResult.cs
+++ b/src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/CreateFundsBillJsonResult.cs
@@ -5,7 +5,7 @@
using System.Text;
using System.Threading.Tasks;
-namespace Senparc.Weixin.Open.XPayAPIs.XPayJson
+namespace Senparc.Weixin.WxOpen.AdvancedAPIs.XPay
{
///
///
diff --git a/src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/CreateFundsBillRequestData.cs b/src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/CreateFundsBillRequestData.cs
similarity index 97%
rename from src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/CreateFundsBillRequestData.cs
rename to src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/CreateFundsBillRequestData.cs
index 4c90953bcf..f230a9a7d0 100644
--- a/src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/CreateFundsBillRequestData.cs
+++ b/src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/CreateFundsBillRequestData.cs
@@ -1,6 +1,6 @@
using System.Collections.Generic;
-namespace Senparc.Weixin.Open.XPayAPIs.XPayJson
+namespace Senparc.Weixin.WxOpen.AdvancedAPIs.XPay
{
///
/// 充值广告金
diff --git a/src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/CreateWithdrawOrderJsonResult.cs b/src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/CreateWithdrawOrderJsonResult.cs
similarity index 91%
rename from src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/CreateWithdrawOrderJsonResult.cs
rename to src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/CreateWithdrawOrderJsonResult.cs
index 27c0951537..ef93102e07 100644
--- a/src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/CreateWithdrawOrderJsonResult.cs
+++ b/src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/CreateWithdrawOrderJsonResult.cs
@@ -5,7 +5,7 @@
using System.Text;
using System.Threading.Tasks;
-namespace Senparc.Weixin.Open.XPayAPIs.XPayJson
+namespace Senparc.Weixin.WxOpen.AdvancedAPIs.XPay
{
///
///
diff --git a/src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/CreateWithdrawOrderRequestData.cs b/src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/CreateWithdrawOrderRequestData.cs
similarity index 94%
rename from src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/CreateWithdrawOrderRequestData.cs
rename to src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/CreateWithdrawOrderRequestData.cs
index 36fc8c0573..06aa0a25d7 100644
--- a/src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/CreateWithdrawOrderRequestData.cs
+++ b/src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/CreateWithdrawOrderRequestData.cs
@@ -4,7 +4,7 @@
using System.Text;
using System.Threading.Tasks;
-namespace Senparc.Weixin.Open.XPayAPIs.XPayJson
+namespace Senparc.Weixin.WxOpen.AdvancedAPIs.XPay
{
///
/// 创建提现单
diff --git a/src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/CurrencyPayJsonResult.cs b/src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/CurrencyPayJsonResult.cs
similarity index 93%
rename from src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/CurrencyPayJsonResult.cs
rename to src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/CurrencyPayJsonResult.cs
index 68fee1448a..d1a9aeafcd 100644
--- a/src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/CurrencyPayJsonResult.cs
+++ b/src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/CurrencyPayJsonResult.cs
@@ -5,7 +5,7 @@
using System.Text;
using System.Threading.Tasks;
-namespace Senparc.Weixin.Open.XPayAPIs.XPayJson
+namespace Senparc.Weixin.WxOpen.AdvancedAPIs.XPay
{
///
/// 扣减代币(一般用于代币支付)
diff --git a/src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/CurrencyPayRequestData.cs b/src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/CurrencyPayRequestData.cs
similarity index 96%
rename from src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/CurrencyPayRequestData.cs
rename to src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/CurrencyPayRequestData.cs
index df19d890a0..95b575149f 100644
--- a/src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/CurrencyPayRequestData.cs
+++ b/src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/CurrencyPayRequestData.cs
@@ -4,7 +4,7 @@
using System.Text;
using System.Threading.Tasks;
-namespace Senparc.Weixin.Open.XPayAPIs.XPayJson
+namespace Senparc.Weixin.WxOpen.AdvancedAPIs.XPay
{
///
/// 扣减代币(一般用于代币支付)
diff --git a/src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/DownloadBillJsonResult.cs b/src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/DownloadBillJsonResult.cs
similarity index 88%
rename from src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/DownloadBillJsonResult.cs
rename to src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/DownloadBillJsonResult.cs
index 379a2ff496..ae24384aee 100644
--- a/src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/DownloadBillJsonResult.cs
+++ b/src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/DownloadBillJsonResult.cs
@@ -5,7 +5,7 @@
using System.Text;
using System.Threading.Tasks;
-namespace Senparc.Weixin.Open.XPayAPIs.XPayJson
+namespace Senparc.Weixin.WxOpen.AdvancedAPIs.XPay
{
///
///
diff --git a/src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/NotifyProvideGoodsRequestData.cs b/src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/NotifyProvideGoodsRequestData.cs
similarity index 94%
rename from src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/NotifyProvideGoodsRequestData.cs
rename to src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/NotifyProvideGoodsRequestData.cs
index b869638b96..84b92b8449 100644
--- a/src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/NotifyProvideGoodsRequestData.cs
+++ b/src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/NotifyProvideGoodsRequestData.cs
@@ -4,7 +4,7 @@
using System.Text;
using System.Threading.Tasks;
-namespace Senparc.Weixin.Open.XPayAPIs.XPayJson
+namespace Senparc.Weixin.WxOpen.AdvancedAPIs.XPay
{
///
/// 通知已经发货完成(只能通知现金单),正常通过xpay_goods_deliver_notify消息推送返回成功就不需要调用这个api接口。这个接口用于异常情况推送不成功时手动将单改成已发货状态
diff --git a/src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/QueryAdverFundsJsonResult.cs b/src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/QueryAdverFundsJsonResult.cs
similarity index 96%
rename from src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/QueryAdverFundsJsonResult.cs
rename to src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/QueryAdverFundsJsonResult.cs
index dba65d71e9..e888ba6cd6 100644
--- a/src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/QueryAdverFundsJsonResult.cs
+++ b/src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/QueryAdverFundsJsonResult.cs
@@ -5,7 +5,7 @@
using System.Text;
using System.Threading.Tasks;
-namespace Senparc.Weixin.Open.XPayAPIs.XPayJson
+namespace Senparc.Weixin.WxOpen.AdvancedAPIs.XPay
{
///
///
diff --git a/src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/QueryAdverFundsRequestData.cs b/src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/QueryAdverFundsRequestData.cs
similarity index 96%
rename from src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/QueryAdverFundsRequestData.cs
rename to src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/QueryAdverFundsRequestData.cs
index 72353eb67f..dde37d81ec 100644
--- a/src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/QueryAdverFundsRequestData.cs
+++ b/src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/QueryAdverFundsRequestData.cs
@@ -1,6 +1,6 @@
using System.Collections.Generic;
-namespace Senparc.Weixin.Open.XPayAPIs.XPayJson
+namespace Senparc.Weixin.WxOpen.AdvancedAPIs.XPay
{
///
/// 查询广告金发放记录
diff --git a/src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/QueryBizBalanceJsonResult.cs b/src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/QueryBizBalanceJsonResult.cs
similarity index 94%
rename from src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/QueryBizBalanceJsonResult.cs
rename to src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/QueryBizBalanceJsonResult.cs
index a7bcc0b304..ed69973640 100644
--- a/src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/QueryBizBalanceJsonResult.cs
+++ b/src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/QueryBizBalanceJsonResult.cs
@@ -5,7 +5,7 @@
using System.Text;
using System.Threading.Tasks;
-namespace Senparc.Weixin.Open.XPayAPIs.XPayJson
+namespace Senparc.Weixin.WxOpen.AdvancedAPIs.XPay
{
///
///
diff --git a/src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/QueryOrderJsonResult.cs b/src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/QueryOrderJsonResult.cs
similarity index 98%
rename from src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/QueryOrderJsonResult.cs
rename to src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/QueryOrderJsonResult.cs
index 344283b4e2..04b172202d 100644
--- a/src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/QueryOrderJsonResult.cs
+++ b/src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/QueryOrderJsonResult.cs
@@ -1,6 +1,6 @@
using Senparc.Weixin.Entities;
-namespace Senparc.Weixin.Open.XPayAPIs.XPayJson
+namespace Senparc.Weixin.WxOpen.AdvancedAPIs.XPay
{
///
///
diff --git a/src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/QueryOrderRequestData.cs b/src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/QueryOrderRequestData.cs
similarity index 93%
rename from src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/QueryOrderRequestData.cs
rename to src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/QueryOrderRequestData.cs
index f98de1c342..7ac28ce76d 100644
--- a/src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/QueryOrderRequestData.cs
+++ b/src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/QueryOrderRequestData.cs
@@ -4,7 +4,7 @@
using System.Text;
using System.Threading.Tasks;
-namespace Senparc.Weixin.Open.XPayAPIs.XPayJson
+namespace Senparc.Weixin.WxOpen.AdvancedAPIs.XPay
{
///
/// 查询创建的订单(现金单,非代币单)
diff --git a/src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/QueryPublishGoodsJsonResult.cs b/src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/QueryPublishGoodsJsonResult.cs
similarity index 95%
rename from src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/QueryPublishGoodsJsonResult.cs
rename to src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/QueryPublishGoodsJsonResult.cs
index 656b3fb98f..f980600e97 100644
--- a/src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/QueryPublishGoodsJsonResult.cs
+++ b/src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/QueryPublishGoodsJsonResult.cs
@@ -5,7 +5,7 @@
using System.Text;
using System.Threading.Tasks;
-namespace Senparc.Weixin.Open.XPayAPIs.XPayJson
+namespace Senparc.Weixin.WxOpen.AdvancedAPIs.XPay
{
///
///
diff --git a/src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/QueryPublishGoodsRequestData.cs b/src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/QueryPublishGoodsRequestData.cs
similarity index 88%
rename from src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/QueryPublishGoodsRequestData.cs
rename to src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/QueryPublishGoodsRequestData.cs
index 5997e24431..621498324e 100644
--- a/src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/QueryPublishGoodsRequestData.cs
+++ b/src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/QueryPublishGoodsRequestData.cs
@@ -4,7 +4,7 @@
using System.Text;
using System.Threading.Tasks;
-namespace Senparc.Weixin.Open.XPayAPIs.XPayJson
+namespace Senparc.Weixin.WxOpen.AdvancedAPIs.XPay
{
///
/// 查询批量发布道具任务
diff --git a/src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/QueryTransferAccountJsonResult.cs b/src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/QueryTransferAccountJsonResult.cs
similarity index 95%
rename from src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/QueryTransferAccountJsonResult.cs
rename to src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/QueryTransferAccountJsonResult.cs
index a35b9a1d9e..09cbe70c82 100644
--- a/src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/QueryTransferAccountJsonResult.cs
+++ b/src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/QueryTransferAccountJsonResult.cs
@@ -5,7 +5,7 @@
using System.Text;
using System.Threading.Tasks;
-namespace Senparc.Weixin.Open.XPayAPIs.XPayJson
+namespace Senparc.Weixin.WxOpen.AdvancedAPIs.XPay
{
///
///
diff --git a/src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/QueryUploadGoodsJsonResult.cs b/src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/QueryUploadGoodsJsonResult.cs
similarity index 97%
rename from src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/QueryUploadGoodsJsonResult.cs
rename to src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/QueryUploadGoodsJsonResult.cs
index 1798783e28..d8dd27ebed 100644
--- a/src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/QueryUploadGoodsJsonResult.cs
+++ b/src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/QueryUploadGoodsJsonResult.cs
@@ -5,7 +5,7 @@
using System.Text;
using System.Threading.Tasks;
-namespace Senparc.Weixin.Open.XPayAPIs.XPayJson
+namespace Senparc.Weixin.WxOpen.AdvancedAPIs.XPay
{
///
///
diff --git a/src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/QueryUploadGoodsRequestData.cs b/src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/QueryUploadGoodsRequestData.cs
similarity index 88%
rename from src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/QueryUploadGoodsRequestData.cs
rename to src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/QueryUploadGoodsRequestData.cs
index beeffc9726..7dc37790af 100644
--- a/src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/QueryUploadGoodsRequestData.cs
+++ b/src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/QueryUploadGoodsRequestData.cs
@@ -4,7 +4,7 @@
using System.Text;
using System.Threading.Tasks;
-namespace Senparc.Weixin.Open.XPayAPIs.XPayJson
+namespace Senparc.Weixin.WxOpen.AdvancedAPIs.XPay
{
///
/// 查询批量上传道具任务
diff --git a/src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/QueryUserBalanceJsonResult.cs b/src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/QueryUserBalanceJsonResult.cs
similarity index 96%
rename from src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/QueryUserBalanceJsonResult.cs
rename to src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/QueryUserBalanceJsonResult.cs
index 0f78c07178..7c389e4a2f 100644
--- a/src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/QueryUserBalanceJsonResult.cs
+++ b/src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/QueryUserBalanceJsonResult.cs
@@ -5,7 +5,7 @@
using System.Text;
using System.Threading.Tasks;
-namespace Senparc.Weixin.Open.XPayAPIs.XPayJson
+namespace Senparc.Weixin.WxOpen.AdvancedAPIs.XPay
{
///
///
diff --git a/src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/QueryUserBalanceRequestData.cs b/src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/QueryUserBalanceRequestData.cs
similarity index 92%
rename from src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/QueryUserBalanceRequestData.cs
rename to src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/QueryUserBalanceRequestData.cs
index 6938489bd4..db72c5d492 100644
--- a/src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/QueryUserBalanceRequestData.cs
+++ b/src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/QueryUserBalanceRequestData.cs
@@ -4,7 +4,7 @@
using System.Text;
using System.Threading.Tasks;
-namespace Senparc.Weixin.Open.XPayAPIs.XPayJson
+namespace Senparc.Weixin.WxOpen.AdvancedAPIs.XPay
{
///
/// 查询用户代币余额
diff --git a/src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/QueryWithdrawOrderJsonResult.cs b/src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/QueryWithdrawOrderJsonResult.cs
similarity index 96%
rename from src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/QueryWithdrawOrderJsonResult.cs
rename to src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/QueryWithdrawOrderJsonResult.cs
index 137accac88..5b03e0eedf 100644
--- a/src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/QueryWithdrawOrderJsonResult.cs
+++ b/src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/QueryWithdrawOrderJsonResult.cs
@@ -5,7 +5,7 @@
using System.Text;
using System.Threading.Tasks;
-namespace Senparc.Weixin.Open.XPayAPIs.XPayJson
+namespace Senparc.Weixin.WxOpen.AdvancedAPIs.XPay
{
///
///
diff --git a/src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/QueryWithdrawOrderRequestData.cs b/src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/QueryWithdrawOrderRequestData.cs
similarity index 91%
rename from src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/QueryWithdrawOrderRequestData.cs
rename to src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/QueryWithdrawOrderRequestData.cs
index 1f97f41fb9..6f72257ee5 100644
--- a/src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/QueryWithdrawOrderRequestData.cs
+++ b/src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/QueryWithdrawOrderRequestData.cs
@@ -4,7 +4,7 @@
using System.Text;
using System.Threading.Tasks;
-namespace Senparc.Weixin.Open.XPayAPIs.XPayJson
+namespace Senparc.Weixin.WxOpen.AdvancedAPIs.XPay
{
///
/// 查询提现单
diff --git a/src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/RefundOrderJsonResult.cs b/src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/RefundOrderJsonResult.cs
similarity index 94%
rename from src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/RefundOrderJsonResult.cs
rename to src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/RefundOrderJsonResult.cs
index 5fb7b9e34d..97d78a903f 100644
--- a/src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/RefundOrderJsonResult.cs
+++ b/src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/RefundOrderJsonResult.cs
@@ -5,7 +5,7 @@
using System.Text;
using System.Threading.Tasks;
-namespace Senparc.Weixin.Open.XPayAPIs.XPayJson
+namespace Senparc.Weixin.WxOpen.AdvancedAPIs.XPay
{
///
///
diff --git a/src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/RefundOrderRequestData.cs b/src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/RefundOrderRequestData.cs
similarity index 97%
rename from src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/RefundOrderRequestData.cs
rename to src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/RefundOrderRequestData.cs
index e2da38a2b1..dd8a92b12f 100644
--- a/src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/RefundOrderRequestData.cs
+++ b/src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/RefundOrderRequestData.cs
@@ -4,7 +4,7 @@
using System.Text;
using System.Threading.Tasks;
-namespace Senparc.Weixin.Open.XPayAPIs.XPayJson
+namespace Senparc.Weixin.WxOpen.AdvancedAPIs.XPay
{
///
/// 对使用jsapi接口下的单进行退款,此接口只是启动退款任务成功,启动后需要调用query_order接口来查询退款单状态,等状态变成退款完成后即为最终成功
diff --git a/src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/StartPublishGoodsRequestData.cs b/src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/StartPublishGoodsRequestData.cs
similarity index 93%
rename from src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/StartPublishGoodsRequestData.cs
rename to src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/StartPublishGoodsRequestData.cs
index aeec5a6bcd..b10c0cddd7 100644
--- a/src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/StartPublishGoodsRequestData.cs
+++ b/src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/StartPublishGoodsRequestData.cs
@@ -1,6 +1,6 @@
using System.Collections.Generic;
-namespace Senparc.Weixin.Open.XPayAPIs.XPayJson
+namespace Senparc.Weixin.WxOpen.AdvancedAPIs.XPay
{
///
/// 启动批量发布道具任务
diff --git a/src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/StartUploadGoodsRequestData.cs b/src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/StartUploadGoodsRequestData.cs
similarity index 96%
rename from src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/StartUploadGoodsRequestData.cs
rename to src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/StartUploadGoodsRequestData.cs
index 26d07e2466..771c2ab096 100644
--- a/src/Senparc.Weixin.Open/Senparc.Weixin.Open/XPayAPIs/XPayJson/StartUploadGoodsRequestData.cs
+++ b/src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/XPay/XPayJson/StartUploadGoodsRequestData.cs
@@ -1,6 +1,6 @@
using System.Collections.Generic;
-namespace Senparc.Weixin.Open.XPayAPIs.XPayJson
+namespace Senparc.Weixin.WxOpen.AdvancedAPIs.XPay
{
///
/// 启动批量上传道具任务
diff --git a/src/Senparc.Weixin.MP/Senparc.Weixin.MP/Entities/Request/Event/XPay/RequestMessageEvent_XPay_Coin_Pay_Notify.cs b/src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/Entities/Request/Event/XPay/RequestMessageEvent_XPayCoinPayNotify.cs
similarity index 92%
rename from src/Senparc.Weixin.MP/Senparc.Weixin.MP/Entities/Request/Event/XPay/RequestMessageEvent_XPay_Coin_Pay_Notify.cs
rename to src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/Entities/Request/Event/XPay/RequestMessageEvent_XPayCoinPayNotify.cs
index ed8be80ee9..22a6756639 100644
--- a/src/Senparc.Weixin.MP/Senparc.Weixin.MP/Entities/Request/Event/XPay/RequestMessageEvent_XPay_Coin_Pay_Notify.cs
+++ b/src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/Entities/Request/Event/XPay/RequestMessageEvent_XPayCoinPayNotify.cs
@@ -9,12 +9,12 @@
----------------------------------------------------------------*/
-namespace Senparc.Weixin.MP.Entities
+namespace Senparc.Weixin.WxOpen.Entities
{
///
/// 代币支付推送
///
- public class RequestMessageEvent_XPay_Coin_Pay_Notify : RequestMessageEventBase, IRequestMessageEventBase
+ public class RequestMessageEvent_XPayCoinPayNotify : RequestMessageEventBase, IRequestMessageEventBase
{
public override Event Event
{
diff --git a/src/Senparc.Weixin.MP/Senparc.Weixin.MP/Entities/Request/Event/XPay/RequestMessageEvent_XPay_Goods_Deliver_Notify.cs b/src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/Entities/Request/Event/XPay/RequestMessageEvent_XPayGoodsDeliverNotify.cs
similarity index 94%
rename from src/Senparc.Weixin.MP/Senparc.Weixin.MP/Entities/Request/Event/XPay/RequestMessageEvent_XPay_Goods_Deliver_Notify.cs
rename to src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/Entities/Request/Event/XPay/RequestMessageEvent_XPayGoodsDeliverNotify.cs
index 4a02823cec..1b8826d1c3 100644
--- a/src/Senparc.Weixin.MP/Senparc.Weixin.MP/Entities/Request/Event/XPay/RequestMessageEvent_XPay_Goods_Deliver_Notify.cs
+++ b/src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/Entities/Request/Event/XPay/RequestMessageEvent_XPayGoodsDeliverNotify.cs
@@ -9,9 +9,9 @@
----------------------------------------------------------------*/
-namespace Senparc.Weixin.MP.Entities
+namespace Senparc.Weixin.WxOpen.Entities
{
- public class RequestMessageEvent_XPay_Goods_Deliver_Notify : RequestMessageEventBase, IRequestMessageEventBase
+ public class RequestMessageEvent_XPayGoodsDeliverNotify : RequestMessageEventBase, IRequestMessageEventBase
{
public override Event Event
{
diff --git a/src/Senparc.Weixin.MP/Senparc.Weixin.MP/Entities/Request/Event/XPay/RequestMessageEvent_XPay_Refund_Notify.cs b/src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/Entities/Request/Event/XPay/RequestMessageEvent_XPayRefundNotify.cs
similarity index 93%
rename from src/Senparc.Weixin.MP/Senparc.Weixin.MP/Entities/Request/Event/XPay/RequestMessageEvent_XPay_Refund_Notify.cs
rename to src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/Entities/Request/Event/XPay/RequestMessageEvent_XPayRefundNotify.cs
index 9aef12db8c..d564a1ae3a 100644
--- a/src/Senparc.Weixin.MP/Senparc.Weixin.MP/Entities/Request/Event/XPay/RequestMessageEvent_XPay_Refund_Notify.cs
+++ b/src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/Entities/Request/Event/XPay/RequestMessageEvent_XPayRefundNotify.cs
@@ -9,9 +9,9 @@
----------------------------------------------------------------*/
-namespace Senparc.Weixin.MP.Entities
+namespace Senparc.Weixin.WxOpen.Entities
{
- public class RequestMessageEvent_XPay_Refund_Notify : RequestMessageEventBase, IRequestMessageEventBase
+ public class RequestMessageEvent_XPayRefundNotify : RequestMessageEventBase, IRequestMessageEventBase
{
public override Event Event
{
diff --git a/src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/Enums.cs b/src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/Enums.cs
index af20bcefed..d2ffb534c0 100644
--- a/src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/Enums.cs
+++ b/src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/Enums.cs
@@ -94,7 +94,25 @@ public enum Event
///
/// 订单将要结算或已经结算事件
///
- trade_manage_order_settlement
+ trade_manage_order_settlement,
+
+
+ #region 小程序虚拟支付
+ ///
+ /// 道具发货推送
+ ///
+ xpay_goods_deliver_notify,
+
+ ///
+ /// 代币支付推送
+ ///
+ xpay_coin_pay_notify,
+
+ ///
+ /// 退款推送
+ ///
+ xpay_refund_notify,
+ #endregion
}
/////
diff --git a/src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/MessageHandlers/WxOpenMessageHandler.Event.cs b/src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/MessageHandlers/WxOpenMessageHandler.Event.cs
index ee2f974cd1..aa725d7352 100644
--- a/src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/MessageHandlers/WxOpenMessageHandler.Event.cs
+++ b/src/Senparc.Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/MessageHandlers/WxOpenMessageHandler.Event.cs
@@ -127,6 +127,19 @@ public virtual IResponseMessageBase OnEventRequest(IRequestMessageEventBase requ
case Event.trade_manage_remind_shipping:
responseMessage = OnEvent_TradeManageRemindShipping(RequestMessage as RequestMessageEvent_TradeManageRemindShipping);
break;
+
+ #region 小程序虚拟支付
+ case Event.xpay_goods_deliver_notify:
+ responseMessage = OnEvent_XPayGoodsDeliverNotify(RequestMessage as RequestMessageEvent_XPayGoodsDeliverNotify);
+ break;
+ case Event.xpay_coin_pay_notify:
+ responseMessage = OnEvent_XPayCoinPayNotify(RequestMessage as RequestMessageEvent_XPayCoinPayNotify);
+ break;
+ case Event.xpay_refund_notify:
+ responseMessage = OnEvent_XPayRefundNotify(RequestMessage as RequestMessageEvent_XPayRefundNotify);
+ break;
+ #endregion
+
default:
throw new UnknownRequestMsgTypeException("未知的Event下属请求信息", null);
}
@@ -297,6 +310,21 @@ public virtual IResponseMessageBase OnEvent_MediaCheckRequest(RequestMessageEven
return DefaultResponseMessage(requestMessage);
}
+ #region 小程序虚拟支付
+ public virtual IResponseMessageBase OnEvent_XPayGoodsDeliverNotify(RequestMessageEvent_XPayGoodsDeliverNotify requestMessage)
+ {
+ return DefaultResponseMessage(requestMessage);
+ }
+ public virtual IResponseMessageBase OnEvent_XPayCoinPayNotify(RequestMessageEvent_XPayCoinPayNotify requestMessage)
+ {
+ return DefaultResponseMessage(requestMessage);
+ }
+ public virtual IResponseMessageBase OnEvent_XPayRefundNotify(RequestMessageEvent_XPayRefundNotify requestMessage)
+ {
+ return DefaultResponseMessage(requestMessage);
+ }
+ #endregion
+
#endregion
#endregion
@@ -361,6 +389,19 @@ public virtual async Task OnEventRequestAsync(IRequestMess
case Event.trade_manage_remind_shipping:
responseMessage = await OnEvent_TradeManageRemindShippingAsync(RequestMessage as RequestMessageEvent_TradeManageRemindShipping);
break;
+
+ #region 小程序虚拟支付
+ case Event.xpay_goods_deliver_notify:
+ responseMessage = await OnEvent_XPayGoodsDeliverNotifyAsync(RequestMessage as RequestMessageEvent_XPayGoodsDeliverNotify);
+ break;
+ case Event.xpay_coin_pay_notify:
+ responseMessage = await OnEvent_XPayCoinPayNotifyAsync(RequestMessage as RequestMessageEvent_XPayCoinPayNotify);
+ break;
+ case Event.xpay_refund_notify:
+ responseMessage = await OnEvent_XPayRefundNotifyAsync(RequestMessage as RequestMessageEvent_XPayRefundNotify);
+ break;
+ #endregion
+
default:
throw new UnknownRequestMsgTypeException("未知的Event下属请求信息", null);
}
@@ -531,6 +572,39 @@ public virtual async Task OnEvent_MediaCheckRequestAsync(R
return await DefaultAsyncMethod(requestMessage, () => OnEvent_MediaCheckRequest(requestMessage)).ConfigureAwait(false);
}
+ #region 小程序虚拟支付
+
+ ///
+ /// 小程序虚拟支付 - 道具发货推送
+ ///
+ ///
+ ///
+ public virtual async Task OnEvent_XPayGoodsDeliverNotifyAsync(RequestMessageEvent_XPayGoodsDeliverNotify requestMessage)
+ {
+ return await DefaultAsyncMethod(requestMessage, () => OnEvent_XPayGoodsDeliverNotify(requestMessage)).ConfigureAwait(false);
+ }
+
+ ///
+ /// 小程序虚拟支付 - 代币支付推送
+ ///
+ ///
+ ///
+ public virtual async Task OnEvent_XPayCoinPayNotifyAsync(RequestMessageEvent_XPayCoinPayNotify requestMessage)
+ {
+ return await DefaultAsyncMethod(requestMessage, () => OnEvent_XPayCoinPayNotify(requestMessage)).ConfigureAwait(false);
+ }
+
+ ///
+ /// 小程序虚拟支付 - 退款推送
+ ///
+ ///
+ ///
+ public virtual async Task OnEvent_XPayRefundNotifyAsync(RequestMessageEvent_XPayRefundNotify requestMessage)
+ {
+ return await DefaultAsyncMethod(requestMessage, () => OnEvent_XPayRefundNotify(requestMessage)).ConfigureAwait(false);
+ }
+ #endregion
+
#endregion
#endregion