wgh/coreshoppro
1
0
Fork 0
mirror of http://git.coreshop.cn/jianweie/coreshoppro.git synced 2025-12-06 18:43:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

2022-01-11

Browse Source 
## 1.2.9 开源社区版：
【修复】修复全局定义微信配置引用的配置文件命名错误问题。
【修复】修复自动生成sku模式价格出现货号重复情况，#I4Q4WU

## 0.0.6 会员先行版：
【新增】新增微信自定义交易组件，实现微信视频号直播带货功能。
This commit is contained in:
JianWeie
2022-01-11 01:36:28 +08:00
parent 5c0e5877c6
commit 4164e59919
97 changed files with 11484 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CoreCms.Net.RedisMQ/Subscribe/LogingSubscribe.cs → CoreCms.Net.RedisMQ/Subscribe/DemoSubscribe.cs
View File

@@ -7,7 +7,7 @@ using NLog;
namespace CoreCms.Net.RedisMQ.Subscribe
{
public class LogingSubscribe : IRedisSubscribe
public class DemoSubscribe : IRedisSubscribe
{
[Subscribe(RedisMessageQueueKey.LogingQueue)]

129
CoreCms.Net.RedisMQ/Subscribe/TCOrderAfterSaleCreateSyncSubscribe.cs Normal file
View File

@@ -0,0 +1,129 @@
/***********************************************************************
* Project: CoreCms
* ProjectName: 核心内容管理系统
* Web: https://www.corecms.net
* Author: 大灰灰
* Email: jianweie@163.com
* CreateTime: 2021/7/10 22:41:46
* Description: 暂无
***********************************************************************/
using System;
using System.Threading.Tasks;
using CoreCms.Net.Configuration;
using CoreCms.Net.IServices;
using CoreCms.Net.Loging;
using CoreCms.Net.Model.Entities;
using InitQ.Abstractions;
using InitQ.Attributes;
using Newtonsoft.Json;
namespace CoreCms.Net.RedisMQ.Subscribe
{
/// <summary>
/// 自定义交易组件-同步创建售后单
/// </summary>
public class TCOrderAfterSaleCreateSyncSubscribe : IRedisSubscribe
{
private readonly string _wxOpenAppId = AppSettingsConstVars.WxOpenAppId;
private readonly string _wxOpenAppSecret = AppSettingsConstVars.WxOpenAppSecret;
private readonly ICoreCmsUserWeChatInfoServices _userWeChatInfoServices;
private readonly ICoreCmsBillDeliveryServices _billDeliveryServices;
private readonly ICoreCmsOrderServices _orderServices;
private readonly ICoreCmsOrderItemServices _orderItemServices;
private readonly ICoreCmsUserWeChatInfoServices _weChatInfoServices;
private readonly IWeChatTransactionComponentOrderServices _tcOrderServices;
public TCOrderAfterSaleCreateSyncSubscribe(ICoreCmsUserWeChatInfoServices userWeChatInfoServices, ICoreCmsBillDeliveryServices billDeliveryServices, ICoreCmsOrderServices orderServices, ICoreCmsUserWeChatInfoServices weChatInfoServices, IWeChatTransactionComponentOrderServices tcOrderServices, ICoreCmsOrderItemServices orderItemServices)
{
_userWeChatInfoServices = userWeChatInfoServices;
_billDeliveryServices = billDeliveryServices;
_orderServices = orderServices;
_weChatInfoServices = weChatInfoServices;
_tcOrderServices = tcOrderServices;
_orderItemServices = orderItemServices;
}
/// <summary>
/// 自定义交易组件-同步创建售后单
/// </summary>
/// <param name="msg"></param>
/// <returns></returns>
[Subscribe(RedisMessageQueueKey.TransactionComponentAfterSaleCreateSync)]
private async Task TransactionComponentAfterSaleCreateSync(string msg)
{
try
{
var orderModel = JsonConvert.DeserializeObject<CoreCmsOrder>(msg);
if (orderModel is { scene: > 0 })
{
var tcOrderModel = await _tcOrderServices.QueryByClauseAsync(p => p.outOrderId == orderModel.orderId, true);
if (tcOrderModel == null)
{
NLogUtil.WriteAll(NLog.LogLevel.Error, LogType.RedisMessageQueue, "自定义交易组件-同步创建售后单", "未查询到远程订单推送记录");
return;
}
var orderInfo = await _orderServices.QueryByClauseAsync(p => p.orderId == orderModel.orderId, true);
if (orderInfo == null)
{
NLogUtil.WriteAll(NLog.LogLevel.Error, LogType.RedisMessageQueue, "自定义交易组件-同步创建售后单", "订单信息获取失败");
return;
}
////获取小程序认证
//var accessToken = await new WeChatHelper().GetWxOpenAccessToken();
////检查场景值是否在支付校验范围内
////接口调用请求地址
//var sceneUrl = WeChat.TransactionComponent.Api.Delivery.recieve(accessToken);
////组合请求
//var sceneClient = new RestClient(sceneUrl);
//var request = new RestRequest(RestSharp.Method.POST);
//request.AddHeader("Content-Type", "application/json");
//request.AddJsonBody(new
//{
// out_order_id = orderModel.orderId,
// openid = tcOrderModel.openid,
//});
//var response = await sceneClient.ExecuteAsync(request);
//var result = JsonConvert.DeserializeObject<CheckSceneResult>(response.Content);
//if (result != null && result.errcode == 0)
//{
// NLogUtil.WriteAll(NLog.LogLevel.Info, LogType.RedisMessageQueue, "自定义交易组件-同步创建售后单", JsonConvert.SerializeObject(result));
//}
//else
//{
// NLogUtil.WriteAll(NLog.LogLevel.Error, LogType.RedisMessageQueue, "自定义交易组件-同步创建售后单", JsonConvert.SerializeObject(result));
//}
}
else
{
NLogUtil.WriteAll(NLog.LogLevel.Error, LogType.RedisMessageQueue, "自定义交易组件-同步创建售后单", "订单获取失败");
}
}
catch (Exception ex)
{
var obj = new
{
wxOpenAppId = _wxOpenAppId,
wxOpenAppSecret = _wxOpenAppSecret,
msg
};
NLogUtil.WriteAll(NLog.LogLevel.Error, LogType.RedisMessageQueue, "自定义交易组件-同步创建售后单", JsonConvert.SerializeObject(obj), ex);
throw;
}
await Task.CompletedTask;
}
}
}

114
CoreCms.Net.RedisMQ/Subscribe/TCOrderDeliveryRecieveSyncSubscribe.cs Normal file
View File

@@ -0,0 +1,114 @@
/***********************************************************************
* Project: CoreCms
* ProjectName: 核心内容管理系统
* Web: https://www.corecms.net
* Author: 大灰灰
* Email: jianweie@163.com
* CreateTime: 2021/7/10 22:41:46
* Description: 暂无
***********************************************************************/
using System;
using System.Threading.Tasks;
using CoreCms.Net.Caching.AccressToken;
using CoreCms.Net.Configuration;
using CoreCms.Net.IServices;
using CoreCms.Net.Loging;
using CoreCms.Net.Model.Entities;
using CoreCms.Net.WeChat.Service.HttpClients;
using InitQ.Abstractions;
using InitQ.Attributes;
using Newtonsoft.Json;
using NLog;
using SKIT.FlurlHttpClient.Wechat.Api;
using SKIT.FlurlHttpClient.Wechat.Api.Models;
namespace CoreCms.Net.RedisMQ.Subscribe
{
/// <summary>
/// 自定义交易组件-同步订单确认收货
/// </summary>
public class TCOrderDeliveryRecieveSyncSubscribe : IRedisSubscribe
{
private readonly ICoreCmsBillDeliveryServices _billDeliveryServices;
private readonly ICoreCmsOrderItemServices _orderItemServices;
private readonly ICoreCmsOrderServices _orderServices;
private readonly IWeChatTransactionComponentOrderServices _tcOrderServices;
private readonly ICoreCmsUserWeChatInfoServices _userWeChatInfoServices;
private readonly IWeChatApiHttpClientFactory _weChatApiHttpClientFactory;
private readonly ICoreCmsUserWeChatInfoServices _weChatInfoServices;
public TCOrderDeliveryRecieveSyncSubscribe(ICoreCmsUserWeChatInfoServices userWeChatInfoServices,
ICoreCmsBillDeliveryServices billDeliveryServices, ICoreCmsOrderServices orderServices,
ICoreCmsUserWeChatInfoServices weChatInfoServices, IWeChatTransactionComponentOrderServices tcOrderServices,
ICoreCmsOrderItemServices orderItemServices, IWeChatApiHttpClientFactory weChatApiHttpClientFactory)
{
_userWeChatInfoServices = userWeChatInfoServices;
_billDeliveryServices = billDeliveryServices;
_orderServices = orderServices;
_weChatInfoServices = weChatInfoServices;
_tcOrderServices = tcOrderServices;
_orderItemServices = orderItemServices;
_weChatApiHttpClientFactory = weChatApiHttpClientFactory;
}
/// <summary>
/// 自定义交易组件-同步订单状态
/// </summary>
/// <param name="msg"></param>
/// <returns></returns>
[Subscribe(RedisMessageQueueKey.TransactionComponentOrderDeliveryRecieveSync)]
private async Task TransactionComponentOrderDeliveryRecieveSync(string msg)
{
try
{
var orderModel = JsonConvert.DeserializeObject<CoreCmsOrder>(msg);
if (orderModel is {scene: > 0})
{
var tcOrderModel =
await _tcOrderServices.QueryByClauseAsync(p => p.outOrderId == orderModel.orderId, true);
if (tcOrderModel == null)
{
NLogUtil.WriteAll(LogLevel.Error, LogType.RedisMessageQueue, "自定义交易组件-同步订单确认收货",
"未查询到远程订单推送记录");
return;
}
var orderInfo = await _orderServices.QueryByClauseAsync(p => p.orderId == orderModel.orderId, true);
if (orderInfo == null)
{
NLogUtil.WriteAll(LogLevel.Error, LogType.RedisMessageQueue, "自定义交易组件-同步订单确认收货", "订单信息获取失败");
return;
}
//获取小程序认证
var accessToken = WeChatCacheAccessTokenHelper.GetWxOpenAccessToken();
var client = _weChatApiHttpClientFactory.CreateWxOpenClient();
var request = new ShopDeliveryReceiveRequest();
request.AccessToken = accessToken;
request.OpenId = tcOrderModel.openid;
request.OutOrderId = orderModel.orderId;
var response = await client.ExecuteShopDeliveryReceiveAsync(request);
NLogUtil.WriteAll(response.IsSuccessful() ? LogLevel.Info : LogLevel.Error,
LogType.RedisMessageQueue, "自定义交易组件-同步订单确认收货", JsonConvert.SerializeObject(request));
}
else
{
NLogUtil.WriteAll(LogLevel.Error, LogType.RedisMessageQueue, "自定义交易组件-同步订单确认收货", "订单获取失败");
}
}
catch (Exception ex)
{
NLogUtil.WriteAll(LogLevel.Error, LogType.RedisMessageQueue, "自定义交易组件-同步订单确认收货", msg, ex);
throw;
}
await Task.CompletedTask;
}
}
}

158
CoreCms.Net.RedisMQ/Subscribe/TCOrderShipSyncSubscribe.cs Normal file
View File

@@ -0,0 +1,158 @@
/***********************************************************************
* Project: CoreCms
* ProjectName: 核心内容管理系统
* Web: https://www.corecms.net
* Author: 大灰灰
* Email: jianweie@163.com
* CreateTime: 2021/7/10 22:41:46
* Description: 暂无
***********************************************************************/
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using CoreCms.Net.Caching.AccressToken;
using CoreCms.Net.Configuration;
using CoreCms.Net.IServices;
using CoreCms.Net.Loging;
using CoreCms.Net.WeChat.Service.HttpClients;
using InitQ.Abstractions;
using InitQ.Attributes;
using Newtonsoft.Json;
using SKIT.FlurlHttpClient.Wechat.Api;
using SKIT.FlurlHttpClient.Wechat.Api.Models;
namespace CoreCms.Net.RedisMQ.Subscribe
{
/// <summary>
/// 自定义交易组件-同步发货信息
/// </summary>
public class TCOrderShipSyncSubscribe : IRedisSubscribe
{
private readonly string _wxOpenAppId = AppSettingsConstVars.WxOpenAppId;
private readonly string _wxOpenAppSecret = AppSettingsConstVars.WxOpenAppSecret;
private readonly ICoreCmsUserWeChatInfoServices _userWeChatInfoServices;
private readonly ICoreCmsBillDeliveryServices _billDeliveryServices;
private readonly ICoreCmsOrderServices _orderServices;
private readonly ICoreCmsOrderItemServices _orderItemServices;
private readonly ICoreCmsUserWeChatInfoServices _weChatInfoServices;
private readonly IWeChatTransactionComponentOrderServices _tcOrderServices;
private readonly WeChat.Service.HttpClients.IWeChatApiHttpClientFactory _weChatApiHttpClientFactory;
public TCOrderShipSyncSubscribe(ICoreCmsUserWeChatInfoServices userWeChatInfoServices, ICoreCmsBillDeliveryServices billDeliveryServices, ICoreCmsOrderServices orderServices, ICoreCmsUserWeChatInfoServices weChatInfoServices, IWeChatTransactionComponentOrderServices tcOrderServices, ICoreCmsOrderItemServices orderItemServices, IWeChatApiHttpClientFactory weChatApiHttpClientFactory)
{
_userWeChatInfoServices = userWeChatInfoServices;
_billDeliveryServices = billDeliveryServices;
_orderServices = orderServices;
_weChatInfoServices = weChatInfoServices;
_tcOrderServices = tcOrderServices;
_orderItemServices = orderItemServices;
_weChatApiHttpClientFactory = weChatApiHttpClientFactory;
}
/// <summary>
/// 自定义交易组件-同步发货信息
/// </summary>
/// <param name="msg"></param>
/// <returns></returns>
[Subscribe(RedisMessageQueueKey.TransactionComponentOrderShipSync)]
private async Task TransactionComponentOrderShipSync(string msg)
{
try
{
var deliveryId = msg;
if (!string.IsNullOrEmpty(deliveryId))
{
var billDelivery = await _billDeliveryServices.QueryByClauseAsync(p => p.deliveryId == deliveryId, true);
if (billDelivery == null)
{
NLogUtil.WriteAll(NLog.LogLevel.Error, LogType.RedisMessageQueue, "自定义交易组件-同步发货信息", "同步发货信息");
return;
}
var tcOrderModel = await _tcOrderServices.QueryByClauseAsync(p => p.outOrderId == billDelivery.orderId, true);
if (tcOrderModel == null)
{
NLogUtil.WriteAll(NLog.LogLevel.Error, LogType.RedisMessageQueue, "自定义交易组件-同步发货信息", "未查询到远程订单推送记录");
return;
}
var orderInfo = await _orderServices.QueryByClauseAsync(p => p.orderId == billDelivery.orderId, true);
if (orderInfo == null)
{
NLogUtil.WriteAll(NLog.LogLevel.Error, LogType.RedisMessageQueue, "自定义交易组件-同步发货信息", "订单信息获取失败");
return;
}
//判断是否发货发完
var finishAllDelivery = false;
//总发货数量
var allNeedSendNum = await _orderItemServices.GetSumAsync(p => p.orderId == orderInfo.orderId, p => p.nums, true);
//已经发货数量
var isSendNum = await _orderItemServices.GetSumAsync(p => p.orderId == orderInfo.orderId, p => p.sendNums, true);
finishAllDelivery = allNeedSendNum == isSendNum ? true : false;
//获取小程序认证
var accessToken = WeChatCacheAccessTokenHelper.GetWxOpenAccessToken();
var client = _weChatApiHttpClientFactory.CreateWxOpenClient();
var request = new ShopDeliverySendRequest();
request.AccessToken = accessToken;
if (orderInfo.receiptType == (int)GlobalEnumVars.OrderReceiptType.Logistics)
{
request.OutOrderId = orderInfo.orderId;
request.OpenId = tcOrderModel.openid;
request.IsFinishAll = finishAllDelivery;
request.DeliveryList = new List<ShopDeliverySendRequest.Types.Delivery>
{
new ShopDeliverySendRequest.Types.Delivery()
{
DeliveryId = billDelivery.thirdPartylogiCode, WaybillId = billDelivery.logiNo
}
};
}
else
{
request.OutOrderId = orderInfo.orderId;
request.OpenId = tcOrderModel.openid;
request.IsFinishAll = true;
}
var response = await client.ExecuteShopDeliverySendAsync(request);
if (response.IsSuccessful())
{
NLogUtil.WriteAll(NLog.LogLevel.Info, LogType.RedisMessageQueue, "自定义交易组件-同步发货信息", JsonConvert.SerializeObject(response));
}
else
{
NLogUtil.WriteAll(NLog.LogLevel.Error, LogType.RedisMessageQueue, "自定义交易组件-同步发货信息", JsonConvert.SerializeObject(response));
}
}
else
{
NLogUtil.WriteAll(NLog.LogLevel.Error, LogType.RedisMessageQueue, "自定义交易组件-同步发货信息", "发货单编号获取失败");
}
}
catch (Exception ex)
{
var obj = new
{
wxOpenAppId = _wxOpenAppId,
wxOpenAppSecret = _wxOpenAppSecret,
msg
};
NLogUtil.WriteAll(NLog.LogLevel.Error, LogType.RedisMessageQueue, "自定义交易组件-同步发货信息", JsonConvert.SerializeObject(obj), ex);
throw;
}
await Task.CompletedTask;
}
}
}

108
CoreCms.Net.RedisMQ/Subscribe/TCPayOrderSyncSubscribe.cs Normal file
View File

@@ -0,0 +1,108 @@
/***********************************************************************
* Project: CoreCms
* ProjectName: 核心内容管理系统
* Web: https://www.corecms.net
* Author: 大灰灰
* Email: jianweie@163.com
* CreateTime: 2021/7/10 22:41:46
* Description: 暂无
***********************************************************************/
using System;
using System.Threading.Tasks;
using CoreCms.Net.Caching.AccressToken;
using CoreCms.Net.Configuration;
using CoreCms.Net.IServices;
using CoreCms.Net.Loging;
using CoreCms.Net.Model.Entities;
using CoreCms.Net.WeChat.Service.HttpClients;
using InitQ.Abstractions;
using InitQ.Attributes;
using Newtonsoft.Json;
using SKIT.FlurlHttpClient.Wechat.Api;
using SKIT.FlurlHttpClient.Wechat.Api.Models;
namespace CoreCms.Net.RedisMQ.Subscribe
{
/// <summary>
/// 自定义交易组件-同步订单状态
/// </summary>
public class TCPayOrderSyncSubscribe : IRedisSubscribe
{
private readonly ICoreCmsUserWeChatInfoServices _userWeChatInfoServices;
private readonly WeChat.Service.HttpClients.IWeChatApiHttpClientFactory _weChatApiHttpClientFactory;
public TCPayOrderSyncSubscribe(ICoreCmsUserWeChatInfoServices userWeChatInfoServices, IWeChatApiHttpClientFactory weChatApiHttpClientFactory)
{
_userWeChatInfoServices = userWeChatInfoServices;
_weChatApiHttpClientFactory = weChatApiHttpClientFactory;
}
/// <summary>
/// 自定义交易组件-同步订单状态
/// </summary>
/// <param name="msg"></param>
/// <returns></returns>
[Subscribe(RedisMessageQueueKey.TransactionComponentPayOrderSync)]
private async Task TransactionComponentPayOrderSync(string msg)
{
try
{
var orderModel = JsonConvert.DeserializeObject<CoreCmsOrder>(msg);
if (orderModel is { 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);
if (sceneResponse.IsSuccessful() && sceneResponse.IsMatched == true)
{
var userInfo = await _userWeChatInfoServices.QueryByClauseAsync(p => p.userId == orderModel.userId);
if (userInfo != null)
{
var payment = orderModel.paymentItem[0];
//获取同步地址接口地址
var request = new ShopOrderPayRequest();
request.OutOrderId = orderModel.orderId;
request.OpenId = userInfo.openid;
request.ActionType = 1;
request.TransactionId = payment.tradeNo;
request.PayTime = payment.createTime;
var response = await client.ExecuteShopOrderPayAsync(request);
}
else
{
NLogUtil.WriteAll(NLog.LogLevel.Error, LogType.RedisMessageQueue, "自定义交易组件-同步订单状态", "微信用户数据获取失败");
}
}
}
else
{
NLogUtil.WriteAll(NLog.LogLevel.Info, LogType.RedisMessageQueue, "自定义交易组件-同步订单状态", "商品获取失败");
}
}
catch (Exception ex)
{
NLogUtil.WriteAll(NLog.LogLevel.Error, LogType.RedisMessageQueue, "自定义交易组件-同步订单状态", msg, ex);
throw;
}
await Task.CompletedTask;
}
}
}