From 91172f3ee2cee07951cd8e8dde06bce60654f8b2 Mon Sep 17 00:00:00 2001 From: jianweie code Date: Tue, 2 May 2023 18:30:39 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E5=BE=AE=E4=BF=A1=E6=94=AF=E4=BB=98=E5=92=8C=E9=9D=9E?= =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=94=AF=E4=BB=98=E8=B0=83=E7=94=A8=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CoreCms.Net.Services/Pay/WeChatPayServices.cs | 4 ++-- CoreCms.Net.Utility/Helper/PayHelper.cs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CoreCms.Net.Services/Pay/WeChatPayServices.cs b/CoreCms.Net.Services/Pay/WeChatPayServices.cs index 10a07acc..507e6f1f 100644 --- a/CoreCms.Net.Services/Pay/WeChatPayServices.cs +++ b/CoreCms.Net.Services/Pay/WeChatPayServices.cs @@ -191,11 +191,11 @@ namespace CoreCms.Net.Services TotalFee = Convert.ToInt32(entity.money * 100), SpBillCreateIp = entity.ip, NotifyUrl = notifyUrl, - TradeType = tradeType, + TradeType = tradeType == GlobalEnumVars.WeiChatPayTradeType.JSAPI_OFFICIAL.ToString() ? GlobalEnumVars.WeiChatPayTradeType.JSAPI.ToString() : tradeType, //OpenId = openId }; - if (tradeType == GlobalEnumVars.WeiChatPayTradeType.JSAPI.ToString()) + if (tradeType == GlobalEnumVars.WeiChatPayTradeType.JSAPI.ToString() || tradeType == GlobalEnumVars.WeiChatPayTradeType.JSAPI_OFFICIAL.ToString()) { if (!string.IsNullOrEmpty(payOptions.SubMchId)) { diff --git a/CoreCms.Net.Utility/Helper/PayHelper.cs b/CoreCms.Net.Utility/Helper/PayHelper.cs index 076f644b..8d249ad9 100644 --- a/CoreCms.Net.Utility/Helper/PayHelper.cs +++ b/CoreCms.Net.Utility/Helper/PayHelper.cs @@ -24,8 +24,8 @@ namespace CoreCms.Net.Utility.Helper tradeType != GlobalEnumVars.WeiChatPayTradeType.MWEB.ToString() ) return GlobalEnumVars.WeiChatPayTradeType.JSAPI.ToString(); - if (tradeType == GlobalEnumVars.WeiChatPayTradeType.JSAPI_OFFICIAL.ToString()) - return GlobalEnumVars.WeiChatPayTradeType.JSAPI.ToString(); + //if (tradeType == GlobalEnumVars.WeiChatPayTradeType.JSAPI_OFFICIAL.ToString()) + // return GlobalEnumVars.WeiChatPayTradeType.JSAPI.ToString(); return tradeType; }