From 43f1f4d81173f5bd71417ad60d41b26acec2468b Mon Sep 17 00:00:00 2001
From: JianWeie <jianweie@live.com>
Date: Mon, 11 Apr 2022 13:34:12 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E5=AE=89=E5=8D=93App=E3=80=81=E8=8B=B9=E6=9E=9CApp?=
 =?UTF-8?q?=E6=8B=89=E8=B5=B7=E5=BE=AE=E4=BF=A1=E6=94=AF=E4=BB=98=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99=E7=9A=84=E5=BC=82=E5=B8=B8=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CoreCms.Net.Services/Pay/WeChatPayServices.cs | 22 ++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/CoreCms.Net.Services/Pay/WeChatPayServices.cs b/CoreCms.Net.Services/Pay/WeChatPayServices.cs
index dae8cd63..e805d046 100644
--- a/CoreCms.Net.Services/Pay/WeChatPayServices.cs
+++ b/CoreCms.Net.Services/Pay/WeChatPayServices.cs
@@ -130,9 +130,14 @@ namespace CoreCms.Net.Services
                 SpBillCreateIp = entity.ip,
                 NotifyUrl = weChatPayUrl,
                 TradeType = tradeType,
-                OpenId = openId
+                //OpenId = openId
             };
 
+            if (tradeType == GlobalEnumVars.WeiChatPayTradeType.JSAPI.ToString())
+            {
+                orderRequest.OpenId = openId;
+            }
+
             var response = await _client.ExecuteAsync(orderRequest, _optionsAccessor.Value);
             if (response.ReturnCode == WeChatPayCode.Success && response.ResultCode == WeChatPayCode.Success)
             {
@@ -140,8 +145,19 @@ namespace CoreCms.Net.Services
                 {
                     Package = "prepay_id=" + response.PrepayId
                 };
-
-                var parameter = await _client.ExecuteAsync(req, _optionsAccessor.Value);
+                WeChatPayDictionary parameter;
+                if (tradeType == GlobalEnumVars.WeiChatPayTradeType.APP.ToString())
+                {
+                    var reqApp = new WeChatPayAppSdkRequest()
+                    {
+                        PrepayId = response.PrepayId
+                    };
+                    parameter = await _client.ExecuteAsync(reqApp, _optionsAccessor.Value);
+                }
+                else
+                {
+                    parameter = await _client.ExecuteAsync(req, _optionsAccessor.Value);
+                }
                 // 将参数(parameter)给 公众号前端 让他在微信内H5调起支付(https://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=7_7&index=6)
                 parameter.Add("paymentId", entity.paymentId);