mirror of
http://git.coreshop.cn/jianweie/coreshoppro.git
synced 2026-02-04 22:59:49 +08:00
【优化】优化微信支付和小程序支付都使用JSAPI的enum导致混乱的问题,拆分为JSAPI和JSAPI_OFFICIAL
This commit is contained in:
@@ -1,12 +1,12 @@
|
|||||||
/***********************************************************************
|
/***********************************************************************
|
||||||
* Project: CoreCms
|
* Project: CoreCms
|
||||||
* ProjectName: 核心内容管理系统
|
* ProjectName: 核心内容管理系统
|
||||||
* Web: https://www.corecms.net
|
* Web: https://www.corecms.net
|
||||||
* Author: 大灰灰
|
* Author: 大灰灰
|
||||||
* Email: jianweie@163.com
|
* Email: jianweie@163.com
|
||||||
* CreateTime: 2021/1/31 21:45:10
|
* CreateTime: 2021/1/31 21:45:10
|
||||||
* Description: 暂无
|
* Description: 暂无
|
||||||
***********************************************************************/
|
***********************************************************************/
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
@@ -156,7 +156,7 @@ namespace CoreCms.Net.Services
|
|||||||
};
|
};
|
||||||
|
|
||||||
var openId = string.Empty;
|
var openId = string.Empty;
|
||||||
if (tradeType == GlobalEnumVars.WeiChatPayTradeType.JSAPI.ToString())
|
if (tradeType == GlobalEnumVars.WeiChatPayTradeType.JSAPI.ToString() || tradeType == GlobalEnumVars.WeiChatPayTradeType.JSAPI_OFFICIAL.ToString())
|
||||||
{
|
{
|
||||||
var userAccount = await _userServices.QueryByIdAsync(_user.ID);
|
var userAccount = await _userServices.QueryByIdAsync(_user.ID);
|
||||||
if (userAccount == null)
|
if (userAccount == null)
|
||||||
@@ -239,6 +239,21 @@ namespace CoreCms.Net.Services
|
|||||||
jm.data = parameter;
|
jm.data = parameter;
|
||||||
jm.otherData = response;
|
jm.otherData = response;
|
||||||
}
|
}
|
||||||
|
//JsApi通用微信支付(和上一样,但是为了区分,单独编写。)
|
||||||
|
else if (tradeType == GlobalEnumVars.WeiChatPayTradeType.JSAPI_OFFICIAL.ToString())
|
||||||
|
{
|
||||||
|
// 将参数(parameter)给 公众号前端 让他在微信内H5调起支付(https://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=7_7&index=6)
|
||||||
|
var req = new WeChatPayJsApiSdkRequest
|
||||||
|
{
|
||||||
|
Package = "prepay_id=" + response.PrepayId
|
||||||
|
};
|
||||||
|
var parameter = await _client.ExecuteAsync(req, payOptions);
|
||||||
|
parameter.Add("paymentId", entity.paymentId);
|
||||||
|
jm.status = true;
|
||||||
|
jm.msg = "创建微信公众号支付环境成功";
|
||||||
|
jm.data = parameter;
|
||||||
|
jm.otherData = response;
|
||||||
|
}
|
||||||
//扫码支付
|
//扫码支付
|
||||||
else if (tradeType == GlobalEnumVars.WeiChatPayTradeType.NATIVE.ToString())
|
else if (tradeType == GlobalEnumVars.WeiChatPayTradeType.NATIVE.ToString())
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user