mirror of
http://git.coreshop.cn/jianweie/coreshoppro.git
synced 2025-12-06 18:03:27 +08:00
2022-01-11
## 1.2.9 开源社区版: 【修复】修复全局定义微信配置引用的配置文件命名错误问题。 【修复】修复自动生成sku模式价格出现货号重复情况,#I4Q4WU ## 0.0.6 会员先行版: 【新增】新增微信自定义交易组件,实现微信视频号直播带货功能。
This commit is contained in:
@@ -9,21 +9,27 @@
|
||||
***********************************************************************/
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Threading.Tasks;
|
||||
using CoreCms.Net.Auth.HttpContextUser;
|
||||
using CoreCms.Net.Caching.AccressToken;
|
||||
using CoreCms.Net.Configuration;
|
||||
using CoreCms.Net.IRepository;
|
||||
using CoreCms.Net.IRepository.UnitOfWork;
|
||||
using CoreCms.Net.IServices;
|
||||
using CoreCms.Net.Model.Entities;
|
||||
using CoreCms.Net.Model.ViewModels.UI;
|
||||
using CoreCms.Net.Utility.Extensions;
|
||||
using CoreCms.Net.WeChat.Service.HttpClients;
|
||||
using CoreCms.Net.WeChat.Service.TransactionComponent.Enum;
|
||||
using CoreCms.Net.WeChat.Service.TransactionComponent.Models;
|
||||
using Essensoft.Paylink.WeChatPay;
|
||||
using Essensoft.Paylink.WeChatPay.V2;
|
||||
using Essensoft.Paylink.WeChatPay.V2.Request;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using Microsoft.Extensions.Options;
|
||||
using Newtonsoft.Json;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using SKIT.FlurlHttpClient.Wechat.Api;
|
||||
using SKIT.FlurlHttpClient.Wechat.Api.Models;
|
||||
|
||||
namespace CoreCms.Net.Services
|
||||
{
|
||||
@@ -35,15 +41,20 @@ namespace CoreCms.Net.Services
|
||||
private readonly IWeChatPayClient _client;
|
||||
private readonly IOptions<WeChatPayOptions> _optionsAccessor;
|
||||
private readonly IHttpContextUser _user;
|
||||
private readonly IServiceProvider _serviceProvider;
|
||||
private readonly WeChat.Service.HttpClients.IWeChatApiHttpClientFactory _weChatApiHttpClientFactory;
|
||||
|
||||
|
||||
|
||||
private readonly ICoreCmsUserServices _userServices;
|
||||
private readonly ICoreCmsUserWeChatInfoServices _userWeChatInfoServices;
|
||||
|
||||
|
||||
public WeChatPayServices(IHttpContextUser user
|
||||
, IWeChatPayClient client
|
||||
, IOptions<WeChatPayOptions> optionsAccessor
|
||||
, ICoreCmsUserServices userServices
|
||||
, ICoreCmsUserWeChatInfoServices userWeChatInfoServices
|
||||
)
|
||||
, ICoreCmsUserWeChatInfoServices userWeChatInfoServices, IServiceProvider serviceProvider, IWeChatApiHttpClientFactory weChatApiHttpClientFactory)
|
||||
{
|
||||
|
||||
_client = client;
|
||||
@@ -51,6 +62,8 @@ namespace CoreCms.Net.Services
|
||||
_user = user;
|
||||
_userServices = userServices;
|
||||
_userWeChatInfoServices = userWeChatInfoServices;
|
||||
_serviceProvider = serviceProvider;
|
||||
_weChatApiHttpClientFactory = weChatApiHttpClientFactory;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -60,6 +73,12 @@ namespace CoreCms.Net.Services
|
||||
/// <returns></returns>
|
||||
public async Task<WebApiCallBack> PubPay(CoreCmsBillPayments entity)
|
||||
{
|
||||
using var container = _serviceProvider.CreateScope();
|
||||
var orderServices = container.ServiceProvider.GetService<ICoreCmsOrderServices>();
|
||||
var orderItemServices = container.ServiceProvider.GetService<ICoreCmsOrderItemServices>();
|
||||
var billPaymentsServices = container.ServiceProvider.GetService<ICoreCmsBillPaymentsServices>();
|
||||
var weChatTransactionComponentOrderServices = container.ServiceProvider.GetService<IWeChatTransactionComponentOrderServices>();
|
||||
|
||||
var jm = new WebApiCallBack();
|
||||
|
||||
var weChatPayUrl = AppSettingsConstVars.PayCallBackWeChatPayUrl;
|
||||
@@ -103,7 +122,7 @@ namespace CoreCms.Net.Services
|
||||
openId = user.openid;
|
||||
}
|
||||
|
||||
var request = new WeChatPayUnifiedOrderRequest
|
||||
var orderRequest = new WeChatPayUnifiedOrderRequest
|
||||
{
|
||||
Body = entity.payTitle,
|
||||
OutTradeNo = entity.paymentId,
|
||||
@@ -114,7 +133,7 @@ namespace CoreCms.Net.Services
|
||||
OpenId = openId
|
||||
};
|
||||
|
||||
var response = await _client.ExecuteAsync(request, _optionsAccessor.Value);
|
||||
var response = await _client.ExecuteAsync(orderRequest, _optionsAccessor.Value);
|
||||
if (response.ReturnCode == WeChatPayCode.Success && response.ResultCode == WeChatPayCode.Success)
|
||||
{
|
||||
var req = new WeChatPayJsApiSdkRequest
|
||||
@@ -126,10 +145,148 @@ namespace CoreCms.Net.Services
|
||||
// 将参数(parameter)给 公众号前端 让他在微信内H5调起支付(https://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=7_7&index=6)
|
||||
parameter.Add("paymentId", entity.paymentId);
|
||||
|
||||
if (entity.type == (int)GlobalEnumVars.BillPaymentsType.Order)
|
||||
{
|
||||
var payment = await billPaymentsServices.QueryByClauseAsync(p => p.paymentId == entity.paymentId);
|
||||
if (payment != null)
|
||||
{
|
||||
var is_matched = 0;
|
||||
#region 校验是否微信自定义交易组件
|
||||
var orderModel = await orderServices.QueryByClauseAsync(p => p.orderId == payment.sourceId);
|
||||
var orderInfo = new OrderInfo();
|
||||
//检查支付是否需要校验
|
||||
if (orderModel.source == 3 && orderModel.scene > 0)
|
||||
{
|
||||
//获取小程序认证
|
||||
var accessToken = WeChatCacheAccessTokenHelper.GetWxOpenAccessToken();
|
||||
var client = _weChatApiHttpClientFactory.CreateWxOpenClient();
|
||||
|
||||
var sceneRequest = new ShopSceneCheckRequest();
|
||||
sceneRequest.AccessToken = accessToken;
|
||||
sceneRequest.Scene = orderModel.scene;
|
||||
|
||||
var sceneResponse = await client.ExecuteShopSceneCheckAsync(sceneRequest);
|
||||
is_matched = sceneResponse.IsMatched ? 1 : 0;
|
||||
if (sceneResponse.IsSuccessful() && sceneResponse.IsMatched == true)
|
||||
{
|
||||
//基础
|
||||
orderInfo.create_time = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
|
||||
orderInfo.type = 0;
|
||||
orderInfo.out_order_id = orderModel.orderId;
|
||||
|
||||
var weChatUserInfo = await _userWeChatInfoServices.QueryByClauseAsync(p => p.userId == orderModel.userId, true);
|
||||
if (weChatUserInfo != null)
|
||||
{
|
||||
orderInfo.openid = weChatUserInfo.openid;
|
||||
}
|
||||
orderInfo.path = UniAppConst.OrderPath(orderModel.orderId);
|
||||
orderInfo.out_user_id = orderModel.userId.ToString();
|
||||
|
||||
//收货人信息
|
||||
orderInfo.address_info = new AddressInfo();
|
||||
orderInfo.address_info.receiver_name = orderModel.shipName;
|
||||
orderInfo.address_info.detailed_address = orderModel.shipAddress;
|
||||
orderInfo.address_info.tel_number = orderModel.shipMobile;
|
||||
|
||||
|
||||
//发货方式
|
||||
orderInfo.delivery_detail = new DeliveryDetail();
|
||||
|
||||
if (orderModel.receiptType == (int)GlobalEnumVars.OrderReceiptType.Logistics)
|
||||
{
|
||||
orderInfo.delivery_detail.delivery_type = (int)DeliveryTypeEnum.正常快递;
|
||||
}
|
||||
else if (orderModel.receiptType == (int)GlobalEnumVars.OrderReceiptType.IntraCityService)
|
||||
{
|
||||
orderInfo.delivery_detail.delivery_type = (int)DeliveryTypeEnum.线下配送;
|
||||
}
|
||||
else if (orderModel.receiptType == (int)GlobalEnumVars.OrderReceiptType.SelfDelivery)
|
||||
{
|
||||
orderInfo.delivery_detail.delivery_type = (int)DeliveryTypeEnum.用户自提;
|
||||
}
|
||||
|
||||
orderInfo.order_detail = new OrderDetail();
|
||||
//订单详情
|
||||
|
||||
//支付信息
|
||||
orderInfo.order_detail.pay_info = new PayInfo()
|
||||
{
|
||||
pay_method = "微信支付",
|
||||
prepay_id = entity.paymentId,
|
||||
prepay_time = entity.createTime.ToString("yyyy-MM-dd HH:mm:ss")
|
||||
|
||||
};
|
||||
|
||||
//价格体系
|
||||
orderInfo.order_detail.price_info = new PriceInfo()
|
||||
{
|
||||
order_price = Convert.ToInt32(orderModel.orderAmount * 100),
|
||||
freight = Convert.ToInt32(orderModel.costFreight * 100),
|
||||
discounted_price = Convert.ToInt32((orderModel.pointMoney + orderModel.orderDiscountAmount + orderModel.goodsDiscountAmount + orderModel.couponDiscountAmount) * 100),
|
||||
additional_price = 0,
|
||||
additional_remarks = "无",
|
||||
};
|
||||
|
||||
//商品信息
|
||||
orderInfo.order_detail.product_infos = new List<ProductInfoItem>();
|
||||
|
||||
var orderItems = await orderItemServices.QueryListByClauseAsync(p => p.orderId == orderModel.orderId);
|
||||
|
||||
foreach (var item in orderItems)
|
||||
{
|
||||
orderInfo.order_detail.product_infos.Add(new ProductInfoItem()
|
||||
{
|
||||
out_product_id = item.goodsId.ToString(),
|
||||
out_sku_id = item.productId.ToString(),
|
||||
head_img = item.imageUrl,
|
||||
product_cnt = item.nums,
|
||||
sale_price = Convert.ToInt32(item.amount * 100),
|
||||
path = UniAppConst.GoodDetail(item.goodsId.ToString()),
|
||||
title = item.name
|
||||
});
|
||||
}
|
||||
|
||||
var tcOrder = await weChatTransactionComponentOrderServices.QueryByClauseAsync(p => p.outOrderId == orderModel.orderId);
|
||||
if (tcOrder == null)
|
||||
{
|
||||
tcOrder = new WeChatTransactionComponentOrder
|
||||
{
|
||||
outOrderId = orderModel.orderId,
|
||||
createTime = DateTime.Now,
|
||||
openid = openId
|
||||
};
|
||||
await weChatTransactionComponentOrderServices.InsertAsync(tcOrder);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
jm.otherData = new
|
||||
{
|
||||
response,
|
||||
orderInfo,
|
||||
checkSceneResult = new
|
||||
{
|
||||
is_matched
|
||||
}
|
||||
};
|
||||
|
||||
#endregion
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
jm.otherData = response;
|
||||
}
|
||||
|
||||
jm.status = true;
|
||||
jm.msg = "支付成功";
|
||||
//jm.msg = "创建支付环境成功";
|
||||
jm.data = parameter;
|
||||
jm.otherData = response;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user