<develop>:(CoreShopr 端)<无> 去掉多余的功能。

parent a173fcf6
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using CoreCms.Net.Configuration;
using CoreCms.Net.RedisMQ.Subscribe;
using CoreCms.Net.Utility.Extensions;
using InitQ;
using Microsoft.Extensions.DependencyInjection;
namespace CoreCms.Net.Core.Config
{
/// <summary>
/// Redis 消息队列 启动服务
/// </summary>
public static class RedisMessageQueueSetup
{
public static void AddRedisMessageQueueSetup(this IServiceCollection services)
{
if (services == null) throw new ArgumentNullException(nameof(services));
services.AddInitQ(m =>
{
//时间间隔
m.SuspendTime = 1000;
//redis服务器地址
m.ConnectionString = AppSettingsConstVars.RedisConfigConnectionString;
//对应的订阅者类,需要new一个实例对象,当然你也可以传参,比如日志对象
m.ListSubscribe = new List<Type>() {
typeof(OrderAgentOrDistributionSubscribe),
typeof(OrderAutomaticDeliverySubscribe),
typeof(OrderFinishCommandSubscribe),
typeof(OrderPrintSubscribe),
typeof(LogingSubscribe),
typeof(UserSubscribe),
typeof(AfterSalesReviewSubscribe),
};
//显示日志
m.ShowLog = false;
});
}
}
}
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using CoreCms.Net.Configuration;
using CoreCms.Net.RedisMQ.Subscribe;
using CoreCms.Net.Utility.Extensions;
using InitQ;
using Microsoft.Extensions.DependencyInjection;
using Qc.YilianyunSdk;
namespace CoreCms.Net.Core.Config
{
/// <summary>
/// 易联云打印机 启动服务
/// </summary>
public static class YiLianYunSetup
{
public static void AddYiLianYunSetup(this IServiceCollection services)
{
if (services == null) throw new ArgumentNullException(nameof(services));
services.AddYilianyunSdk<DefaultYilianyunSdkHook>(opt =>
{
// 应用ID请自行前往 dev.10ss.net 获取
opt.ClientId = AppSettingsConstVars.YiLianYunConfigClientId;
opt.ClientSecret = AppSettingsConstVars.YiLianYunConfigClientSecret;
opt.YilianyunClientType = YilianyunClientType.自有应用;
opt.SaveTokenDirPath = "./App_Data/YiLianYunLogs";
});
}
}
}
......@@ -35,7 +35,6 @@
<ProjectReference Include="..\CoreCms.Net.Configuration\CoreCms.Net.Configuration.csproj" />
<ProjectReference Include="..\CoreCms.Net.IRepository\CoreCms.Net.IRepository.csproj" />
<ProjectReference Include="..\CoreCms.Net.Loging\CoreCms.Net.Loging.csproj" />
<ProjectReference Include="..\CoreCms.Net.RedisMQ\CoreCms.Net.RedisMQ.csproj" />
<ProjectReference Include="..\CoreCms.Net.Swagger\CoreCms.Net.Swagger.csproj" />
</ItemGroup>
......
......@@ -201,19 +201,15 @@ D:\Code\Shop.ERP\CoreCms.Net.Core\bin\Debug\net8.0\CoreCms.Net.Core.pdb
D:\Code\Shop.ERP\CoreCms.Net.Core\bin\Debug\net8.0\CoreCms.Net.Caching.dll
D:\Code\Shop.ERP\CoreCms.Net.Core\bin\Debug\net8.0\CoreCms.Net.Configuration.dll
D:\Code\Shop.ERP\CoreCms.Net.Core\bin\Debug\net8.0\CoreCms.Net.IRepository.dll
D:\Code\Shop.ERP\CoreCms.Net.Core\bin\Debug\net8.0\CoreCms.Net.IServices.dll
D:\Code\Shop.ERP\CoreCms.Net.Core\bin\Debug\net8.0\CoreCms.Net.Loging.dll
D:\Code\Shop.ERP\CoreCms.Net.Core\bin\Debug\net8.0\CoreCms.Net.Model.dll
D:\Code\Shop.ERP\CoreCms.Net.Core\bin\Debug\net8.0\CoreCms.Net.RedisMQ.dll
D:\Code\Shop.ERP\CoreCms.Net.Core\bin\Debug\net8.0\CoreCms.Net.Swagger.dll
D:\Code\Shop.ERP\CoreCms.Net.Core\bin\Debug\net8.0\CoreCms.Net.Utility.dll
D:\Code\Shop.ERP\CoreCms.Net.Core\bin\Debug\net8.0\CoreCms.Net.Caching.pdb
D:\Code\Shop.ERP\CoreCms.Net.Core\bin\Debug\net8.0\CoreCms.Net.Configuration.pdb
D:\Code\Shop.ERP\CoreCms.Net.Core\bin\Debug\net8.0\CoreCms.Net.IRepository.pdb
D:\Code\Shop.ERP\CoreCms.Net.Core\bin\Debug\net8.0\CoreCms.Net.Loging.pdb
D:\Code\Shop.ERP\CoreCms.Net.Core\bin\Debug\net8.0\CoreCms.Net.RedisMQ.pdb
D:\Code\Shop.ERP\CoreCms.Net.Core\bin\Debug\net8.0\CoreCms.Net.Swagger.pdb
D:\Code\Shop.ERP\CoreCms.Net.Core\bin\Debug\net8.0\CoreCms.Net.IServices.pdb
D:\Code\Shop.ERP\CoreCms.Net.Core\bin\Debug\net8.0\CoreCms.Net.Model.pdb
D:\Code\Shop.ERP\CoreCms.Net.Core\bin\Debug\net8.0\CoreCms.Net.Utility.pdb
D:\Code\Shop.ERP\CoreCms.Net.Core\obj\Debug\net8.0\CoreCms.Net.Core.csproj.AssemblyReference.cache
......
......@@ -230,7 +230,6 @@ D:\Code\Shop.ERP\CoreCms.Net.Middlewares\bin\Debug\net8.0\CoreCms.Net.IRepositor
D:\Code\Shop.ERP\CoreCms.Net.Middlewares\bin\Debug\net8.0\CoreCms.Net.IServices.dll
D:\Code\Shop.ERP\CoreCms.Net.Middlewares\bin\Debug\net8.0\CoreCms.Net.Loging.dll
D:\Code\Shop.ERP\CoreCms.Net.Middlewares\bin\Debug\net8.0\CoreCms.Net.Model.dll
D:\Code\Shop.ERP\CoreCms.Net.Middlewares\bin\Debug\net8.0\CoreCms.Net.RedisMQ.dll
D:\Code\Shop.ERP\CoreCms.Net.Middlewares\bin\Debug\net8.0\CoreCms.Net.Swagger.dll
D:\Code\Shop.ERP\CoreCms.Net.Middlewares\bin\Debug\net8.0\CoreCms.Net.Utility.dll
D:\Code\Shop.ERP\CoreCms.Net.Middlewares\bin\Debug\net8.0\CoreCms.Net.Auth.pdb
......@@ -242,7 +241,6 @@ D:\Code\Shop.ERP\CoreCms.Net.Middlewares\bin\Debug\net8.0\CoreCms.Net.Utility.pd
D:\Code\Shop.ERP\CoreCms.Net.Middlewares\bin\Debug\net8.0\CoreCms.Net.Caching.pdb
D:\Code\Shop.ERP\CoreCms.Net.Middlewares\bin\Debug\net8.0\CoreCms.Net.IRepository.pdb
D:\Code\Shop.ERP\CoreCms.Net.Middlewares\bin\Debug\net8.0\CoreCms.Net.Model.pdb
D:\Code\Shop.ERP\CoreCms.Net.Middlewares\bin\Debug\net8.0\CoreCms.Net.RedisMQ.pdb
D:\Code\Shop.ERP\CoreCms.Net.Middlewares\bin\Debug\net8.0\CoreCms.Net.Swagger.pdb
D:\Code\Shop.ERP\CoreCms.Net.Middlewares\obj\Debug\net8.0\CoreCms.Net.Middlewares.csproj.AssemblyReference.cache
D:\Code\Shop.ERP\CoreCms.Net.Middlewares\obj\Debug\net8.0\CoreCms.Net.Middlewares.GeneratedMSBuildEditorConfig.editorconfig
......
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Essensoft.Paylink.WeChatPay" Version="4.1.3" />
<PackageReference Include="InitQ" Version="1.0.0.18" />
<PackageReference Include="Qc.YilianyunSdk" Version="1.0.7" />
<PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="2.36.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\CoreCms.Net.Caching\CoreCms.Net.Caching.csproj" />
<ProjectReference Include="..\CoreCms.Net.Configuration\CoreCms.Net.Configuration.csproj" />
<ProjectReference Include="..\CoreCms.Net.IServices\CoreCms.Net.IServices.csproj" />
<ProjectReference Include="..\CoreCms.Net.Loging\CoreCms.Net.Loging.csproj" />
</ItemGroup>
</Project>
using System;
using System.Threading.Tasks;
using CoreCms.Net.Configuration;
using CoreCms.Net.IServices;
using CoreCms.Net.Loging;
using CoreCms.Net.Model.Entities;
using CoreCms.Net.Utility.Extensions;
using CoreCms.Net.Utility.Helper;
using Essensoft.Paylink.WeChatPay.V2;
using Essensoft.Paylink.WeChatPay.V2.Notify;
using InitQ.Abstractions;
using InitQ.Attributes;
using Microsoft.Extensions.Logging;
using Newtonsoft.Json;
namespace CoreCms.Net.RedisMQ.Subscribe
{
/// <summary>
/// 售后审核通过后处理
/// </summary>
public class AfterSalesReviewSubscribe : IRedisSubscribe
{
private readonly ICoreCmsBillAftersalesServices _aftersalesServices;
private readonly ICoreCmsDistributionOrderServices _distributionOrderServices;
private readonly ICoreCmsAgentOrderServices _agentOrderServices;
public AfterSalesReviewSubscribe(ICoreCmsBillAftersalesServices aftersalesServices, ICoreCmsDistributionOrderServices distributionOrderServices, ICoreCmsAgentOrderServices agentOrderServices)
{
_aftersalesServices = aftersalesServices;
_distributionOrderServices = distributionOrderServices;
_agentOrderServices = agentOrderServices;
}
/// <summary>
/// 售后审核通过后处理
/// </summary>
/// <param name="msg"></param>
/// <returns></returns>
[Subscribe(RedisMessageQueueKey.AfterSalesReview)]
private async Task AfterSalesReview(string msg)
{
try
{
if (string.IsNullOrEmpty(msg))
{
NLogUtil.WriteAll(NLog.LogLevel.Error, LogType.RedisMessageQueue, "售后审核通过后处理", "审核单编号获取失败");
return;
}
var info = await _aftersalesServices.QueryByClauseAsync(p => p.aftersalesId == msg);
if (info != null)
{
await _distributionOrderServices.CancleOrderByOrderId(info.orderId);
await _agentOrderServices.CancleOrderByOrderId(info.orderId);
NLogUtil.WriteAll(NLog.LogLevel.Info, LogType.RedisMessageQueue, "售后审核通过后处理", msg);
}
else
{
NLogUtil.WriteAll(NLog.LogLevel.Info, LogType.RedisMessageQueue, "售后审核通过后处理", "售后单查询失败");
}
}
catch (Exception ex)
{
NLogUtil.WriteAll(NLog.LogLevel.Error, LogType.RedisMessageQueue, "售后审核通过后处理", msg, ex);
throw;
}
await Task.CompletedTask;
}
}
}
using System.Threading.Tasks;
using CoreCms.Net.Configuration;
using CoreCms.Net.Loging;
using InitQ.Abstractions;
using InitQ.Attributes;
using NLog;
namespace CoreCms.Net.RedisMQ.Subscribe
{
public class LogingSubscribe : IRedisSubscribe
{
[Subscribe(RedisMessageQueueKey.LogingQueue)]
private async Task SubRedisOrder2(string msg)
{
NLogUtil.WriteDbLog(LogLevel.Debug, LogType.RedisMessageQueue, "消息队列", $"接口端订阅从队列{RedisMessageQueueKey.LogingQueue} 接受到 消息:{msg}");
await Task.CompletedTask;
}
[Subscribe(RedisMessageQueueKey.SmsQueue)]
private async Task SubSmsQueue1(string msg)
{
NLogUtil.WriteDbLog(LogLevel.Debug, LogType.RedisMessageQueue, "消息队列", $"接口端订阅从队列{RedisMessageQueueKey.SmsQueue} 接受到 消息:{msg}");
await Task.CompletedTask;
}
}
}
using System;
using System.Threading.Tasks;
using CoreCms.Net.Configuration;
using CoreCms.Net.IServices;
using CoreCms.Net.Loging;
using CoreCms.Net.Model.Entities;
using CoreCms.Net.Utility.Extensions;
using CoreCms.Net.Utility.Helper;
using Essensoft.Paylink.WeChatPay.V2;
using Essensoft.Paylink.WeChatPay.V2.Notify;
using InitQ.Abstractions;
using InitQ.Attributes;
using Microsoft.Extensions.Logging;
using Newtonsoft.Json;
namespace CoreCms.Net.RedisMQ.Subscribe
{
/// <summary>
/// 订单完结后走代理或分销商提成处理
/// </summary>
public class OrderAgentOrDistributionSubscribe : IRedisSubscribe
{
private readonly ICoreCmsBillPaymentsServices _billPaymentsServices;
private readonly ICoreCmsDistributionOrderServices _distributionOrderServices;
private readonly ICoreCmsDistributionServices _distributionServices;
private readonly ICoreCmsSettingServices _settingServices;
private readonly ICoreCmsUserServices _userServices;
private readonly ICoreCmsAgentOrderServices _agentOrderServices;
public OrderAgentOrDistributionSubscribe(ICoreCmsBillPaymentsServices billPaymentsServices, ICoreCmsDistributionOrderServices distributionOrderServices, ICoreCmsDistributionServices distributionServices, ICoreCmsSettingServices settingServices, ICoreCmsUserServices userServices, ICoreCmsAgentOrderServices agentOrderServices)
{
_billPaymentsServices = billPaymentsServices;
_distributionOrderServices = distributionOrderServices;
_distributionServices = distributionServices;
_settingServices = settingServices;
_userServices = userServices;
_agentOrderServices = agentOrderServices;
}
/// <summary>
/// 订单完结后走代理或分销商提成处理
/// </summary>
/// <param name="msg"></param>
/// <returns></returns>
[Subscribe(RedisMessageQueueKey.OrderAgentOrDistribution)]
private async Task OrderAgentOrDistribution(string msg)
{
try
{
var order = JsonConvert.DeserializeObject<CoreCmsOrder>(msg);
if (order != null)
{
var jm = await _agentOrderServices.AddData(order);
//判断是走代理还是走分销
if (jm.status == true)
{
NLogUtil.WriteAll(NLog.LogLevel.Info, LogType.RedisMessageQueue, "订单完结后走代理结佣", JsonConvert.SerializeObject(jm));
return;
}
else
{
await _distributionOrderServices.AddData(order); //添加分享关联订单日志
//判断是否可以成为分销商
//先判断是否已经是经销商了。
bool check = await _distributionServices.ExistsAsync(p => p.userId == order.userId);
var allConfigs = await _settingServices.GetConfigDictionaries();
var distributionType = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.DistributionType).ObjectToInt(0);
if (distributionType == 3) //无需审核,但是要满足提交
{
var info = new CoreCmsDistribution();
//判断是否分销商
if (check == false)
{
await _distributionServices.CheckCondition(allConfigs, info, order.userId);
if (info.ConditionStatus == true && info.ConditionProgress == 100)
{
//添加用户
var user = await _userServices.QueryByClauseAsync(p => p.id == order.userId);
var iData = new CoreCmsDistribution();
iData.userId = order.userId;
iData.mobile = user.mobile;
iData.name = !string.IsNullOrEmpty(user.nickName) ? user.nickName : user.mobile;
iData.verifyStatus = (int)GlobalEnumVars.DistributionVerifyStatus.VerifyYes;
iData.verifyTime = DateTime.Now;
await _distributionServices.AddData(iData, order.userId);
}
}
}
//已经是经销商的判断是否可以升级
if (check)
{
await _distributionServices.CheckUpdate(order.userId);
}
jm.status = true;
jm.msg = "分销成功";
NLogUtil.WriteAll(NLog.LogLevel.Info, LogType.RedisMessageQueue, "订单完结后走分销结佣", JsonConvert.SerializeObject(jm));
return;
}
}
else
{
NLogUtil.WriteAll(NLog.LogLevel.Info, LogType.RedisMessageQueue, "订单完结结佣", "订单获取失败");
}
}
catch (Exception ex)
{
NLogUtil.WriteAll(NLog.LogLevel.Error, LogType.RedisMessageQueue, "订单完结结佣", msg, ex);
throw;
}
await Task.CompletedTask;
}
}
}
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using CoreCms.Net.Configuration;
using CoreCms.Net.IServices;
using CoreCms.Net.Loging;
using CoreCms.Net.Model.Entities;
using CoreCms.Net.Model.ViewModels.UI;
using CoreCms.Net.Utility.Extensions;
using CoreCms.Net.Utility.Helper;
using Essensoft.Paylink.WeChatPay.V2;
using Essensoft.Paylink.WeChatPay.V2.Notify;
using InitQ.Abstractions;
using InitQ.Attributes;
using Microsoft.Extensions.Logging;
using Newtonsoft.Json;
namespace CoreCms.Net.RedisMQ.Subscribe
{
/// <summary>
/// 门店订单自动发货
/// </summary>
public class OrderAutomaticDeliverySubscribe : IRedisSubscribe
{
private readonly ICoreCmsOrderServices _orderServices;
private readonly ICoreCmsOrderItemServices _orderItemServices;
private readonly ICoreCmsSettingServices _settingServices;
public OrderAutomaticDeliverySubscribe(ICoreCmsSettingServices settingServices, ICoreCmsAgentOrderServices agentOrderServices, ICoreCmsOrderServices orderServices, ICoreCmsOrderItemServices orderItemServices)
{
_settingServices = settingServices;
_orderServices = orderServices;
_orderItemServices = orderItemServices;
}
/// <summary>
/// 订单完成时,门店订单自动发货
/// </summary>
/// <param name="msg"></param>
/// <returns></returns>
[Subscribe(RedisMessageQueueKey.OrderAutomaticDelivery)]
private async Task OrderAutomaticDelivery(string msg)
{
try
{
var order = JsonConvert.DeserializeObject<CoreCmsOrder>(msg);
if (order != null)
{
var goodItems = await _orderItemServices.QueryListByClauseAsync(p => p.orderId == order.orderId);
if (!goodItems.Any())
{
NLogUtil.WriteAll(NLog.LogLevel.Info, LogType.RedisMessageQueue, "订单自动发货", "明细获取失败");
return;
}
Dictionary<int, int> items = new Dictionary<int, int>();
goodItems.ForEach(p =>
{
items.Add(p.productId, p.nums);
});
var result = new WebApiCallBack();
if (order.receiptType == (int)GlobalEnumVars.OrderReceiptType.SelfDelivery)
{
result = await _orderServices.Ship(order.orderId, "shangmenziti", "无", items, order.shipName, order.shipMobile, order.shipAddress, order.memo, order.storeId, order.shipAreaId);
}
else if (order.receiptType == (int)GlobalEnumVars.OrderReceiptType.IntraCityService)
{
result = await _orderServices.Ship(order.orderId, "benditongcheng", "无", items, order.shipName, order.shipMobile, order.shipAddress, order.memo, order.storeId, order.shipAreaId);
}
NLogUtil.WriteAll(result.status ? NLog.LogLevel.Info : NLog.LogLevel.Error,
LogType.RedisMessageQueue, "订单自动发货", JsonConvert.SerializeObject(result));
}
else
{
NLogUtil.WriteAll(NLog.LogLevel.Error, LogType.RedisMessageQueue, "订单自动发货", "订单获取失败");
}
}
catch (Exception ex)
{
NLogUtil.WriteAll(NLog.LogLevel.Error, LogType.RedisMessageQueue, "订单自动发货", msg, ex);
throw;
}
await Task.CompletedTask;
}
}
}
using System;
using System.Threading.Tasks;
using CoreCms.Net.Configuration;
using CoreCms.Net.IServices;
using CoreCms.Net.Loging;
using CoreCms.Net.Model.Entities;
using CoreCms.Net.Utility.Extensions;
using CoreCms.Net.Utility.Helper;
using Essensoft.Paylink.WeChatPay.V2;
using Essensoft.Paylink.WeChatPay.V2.Notify;
using InitQ.Abstractions;
using InitQ.Attributes;
using Microsoft.Extensions.Logging;
using Newtonsoft.Json;
namespace CoreCms.Net.RedisMQ.Subscribe
{
/// <summary>
/// 订单完成时,结算该订单
/// </summary>
public class OrderFinishCommandSubscribe : IRedisSubscribe
{
private readonly ICoreCmsBillPaymentsServices _billPaymentsServices;
private readonly ICoreCmsDistributionOrderServices _distributionOrderServices;
private readonly ICoreCmsDistributionServices _distributionServices;
private readonly ICoreCmsSettingServices _settingServices;
private readonly ICoreCmsUserServices _userServices;
private readonly ICoreCmsAgentOrderServices _agentOrderServices;
public OrderFinishCommandSubscribe(ICoreCmsBillPaymentsServices billPaymentsServices, ICoreCmsDistributionOrderServices distributionOrderServices, ICoreCmsDistributionServices distributionServices, ICoreCmsSettingServices settingServices, ICoreCmsUserServices userServices, ICoreCmsAgentOrderServices agentOrderServices)
{
_billPaymentsServices = billPaymentsServices;
_distributionOrderServices = distributionOrderServices;
_distributionServices = distributionServices;
_settingServices = settingServices;
_userServices = userServices;
_agentOrderServices = agentOrderServices;
}
/// <summary>
/// 订单完成时,结算该订单|延迟队列
/// </summary>
/// <param name="msg"></param>
/// <returns></returns>
[SubscribeDelay(RedisMessageQueueKey.OrderFinishCommand)]
private async Task OrderFinishCommand(string msg)
{
try
{
if (string.IsNullOrEmpty(msg))
{
NLogUtil.WriteAll(NLog.LogLevel.Info, LogType.RedisMessageQueue, "订单完结结佣", "订单编号获取失败");
return;
}
else
{
await _distributionOrderServices.FinishOrder(msg);
await _agentOrderServices.FinishOrder(msg);
NLogUtil.WriteAll(NLog.LogLevel.Info, LogType.RedisMessageQueue, "订单完结结佣", "订单编号获取正常:" + msg);
}
}
catch (Exception ex)
{
NLogUtil.WriteAll(NLog.LogLevel.Error, LogType.RedisMessageQueue, "订单完结结佣", msg, ex);
throw;
}
await Task.CompletedTask;
}
}
}
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;
using SqlSugar;
namespace CoreCms.Net.RedisMQ.Subscribe
{
/// <summary>
/// 用户相关队列操作
/// </summary>
public class UserSubscribe : IRedisSubscribe
{
private readonly ICoreCmsUserServices _userServices;
private readonly ICoreCmsOrderServices _orderServices;
private readonly ICoreCmsBillRefundServices _billRefundServices;
private readonly ICoreCmsUserGradeServices _userGradeServices;
public UserSubscribe(ICoreCmsUserServices userServices, ICoreCmsOrderServices orderServices, ICoreCmsBillRefundServices billRefundServices, ICoreCmsUserGradeServices userGradeServices)
{
_userServices = userServices;
_orderServices = orderServices;
_billRefundServices = billRefundServices;
_userGradeServices = userGradeServices;
}
/// <summary>
/// 订单完成-用户升级处理
/// </summary>
/// <param name="msg"></param>
/// <returns></returns>
[Subscribe(RedisMessageQueueKey.UserUpGrade)]
private async Task UserUpGradeHandler(string msg)
{
try
{
var orderModel = JsonConvert.DeserializeObject<CoreCmsOrder>(msg);
if (orderModel == null)
{
NLogUtil.WriteAll(NLog.LogLevel.Info, LogType.RedisMessageQueue, "订单完成-用户升级处理", "订单数据获取失败");
return;
}
var userInfo = await _userServices.QueryPageAsync(p => p.id == orderModel.userId);
if (userInfo == null)
{
NLogUtil.WriteAll(NLog.LogLevel.Info, LogType.RedisMessageQueue, "订单完成-用户升级处理", "用户数据获取失败");
return;
}
//订单支付的金额
var payedMoney = await _orderServices.GetSumAsync(
p => p.payStatus != (int)GlobalEnumVars.OrderAllStatusType.ALL_PENDING_PAYMENT && p.userId == orderModel.userId,
p => p.orderAmount);
//订单退款金额
var refundMoney = await _billRefundServices.GetSumAsync(
p => p.type == (int)GlobalEnumVars.BillRefundType.Order && p.userId == orderModel.userId &&
p.status != (int)GlobalEnumVars.BillRefundStatus.STATUS_REFUND, p => p.money);
var money = payedMoney - refundMoney;
//取所有用户等级信息
var userGradeModel = await _userGradeServices.QueryListByClauseAsync(p => p.id > 0, p => p.id, OrderByType.Asc);
//var id = 0;
foreach (var item in userGradeModel)
{
}
NLogUtil.WriteAll(NLog.LogLevel.Info, LogType.RedisMessageQueue, "订单完成-用户升级处理", msg);
}
catch (Exception ex)
{
NLogUtil.WriteAll(NLog.LogLevel.Error, LogType.RedisMessageQueue, "订单完成-用户升级处理", msg, ex);
throw;
}
await Task.CompletedTask;
}
}
}
// <autogenerated />
using System;
using System.Reflection;
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETCoreApp,Version=v8.0", FrameworkDisplayName = ".NET 8.0")]
is_global = true
build_property.TargetFramework = net8.0
build_property.TargetPlatformMinVersion =
build_property.UsingMicrosoftNETSdkWeb =
build_property.ProjectTypeGuids =
build_property.InvariantGlobalization =
build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = CoreCms.Net.RedisMQ
build_property.ProjectDir = D:\Code\Shop.ERP\CoreCms.Net.RedisMQ\
build_property.EnableComHosting =
build_property.EnableGeneratedComInterfaceComImportInterop =
build_property.EffectiveAnalysisLevelStyle = 8.0
build_property.EnableCodeStyleSeverity =
......@@ -243,7 +243,6 @@ D:\Code\Shop.ERP\CoreCms.Net.Repository\bin\Debug\net8.0\CoreCms.Net.IRepository
D:\Code\Shop.ERP\CoreCms.Net.Repository\bin\Debug\net8.0\CoreCms.Net.IServices.dll
D:\Code\Shop.ERP\CoreCms.Net.Repository\bin\Debug\net8.0\CoreCms.Net.Loging.dll
D:\Code\Shop.ERP\CoreCms.Net.Repository\bin\Debug\net8.0\CoreCms.Net.Model.dll
D:\Code\Shop.ERP\CoreCms.Net.Repository\bin\Debug\net8.0\CoreCms.Net.RedisMQ.dll
D:\Code\Shop.ERP\CoreCms.Net.Repository\bin\Debug\net8.0\CoreCms.Net.Swagger.dll
D:\Code\Shop.ERP\CoreCms.Net.Repository\bin\Debug\net8.0\CoreCms.Net.Utility.dll
D:\Code\Shop.ERP\CoreCms.Net.Repository\bin\Debug\net8.0\CoreCms.Net.Auth.pdb
......@@ -256,7 +255,6 @@ D:\Code\Shop.ERP\CoreCms.Net.Repository\bin\Debug\net8.0\CoreCms.Net.Model.pdb
D:\Code\Shop.ERP\CoreCms.Net.Repository\bin\Debug\net8.0\CoreCms.Net.Utility.pdb
D:\Code\Shop.ERP\CoreCms.Net.Repository\bin\Debug\net8.0\CoreCms.Net.IServices.pdb
D:\Code\Shop.ERP\CoreCms.Net.Repository\bin\Debug\net8.0\CoreCms.Net.Loging.pdb
D:\Code\Shop.ERP\CoreCms.Net.Repository\bin\Debug\net8.0\CoreCms.Net.RedisMQ.pdb
D:\Code\Shop.ERP\CoreCms.Net.Repository\bin\Debug\net8.0\CoreCms.Net.Swagger.pdb
D:\Code\Shop.ERP\CoreCms.Net.Repository\obj\Debug\net8.0\CoreCms.Net.Repository.csproj.AssemblyReference.cache
D:\Code\Shop.ERP\CoreCms.Net.Repository\obj\Debug\net8.0\CoreCms.Net.Repository.GeneratedMSBuildEditorConfig.editorconfig
......
......@@ -230,7 +230,6 @@ D:\Code\Shop.ERP\CoreCms.Net.Services\bin\Debug\net8.0\CoreCms.Net.IRepository.d
D:\Code\Shop.ERP\CoreCms.Net.Services\bin\Debug\net8.0\CoreCms.Net.IServices.dll
D:\Code\Shop.ERP\CoreCms.Net.Services\bin\Debug\net8.0\CoreCms.Net.Loging.dll
D:\Code\Shop.ERP\CoreCms.Net.Services\bin\Debug\net8.0\CoreCms.Net.Model.dll
D:\Code\Shop.ERP\CoreCms.Net.Services\bin\Debug\net8.0\CoreCms.Net.RedisMQ.dll
D:\Code\Shop.ERP\CoreCms.Net.Services\bin\Debug\net8.0\CoreCms.Net.Swagger.dll
D:\Code\Shop.ERP\CoreCms.Net.Services\bin\Debug\net8.0\CoreCms.Net.Utility.dll
D:\Code\Shop.ERP\CoreCms.Net.Services\bin\Debug\net8.0\CoreCms.Net.Auth.pdb
......@@ -241,7 +240,6 @@ D:\Code\Shop.ERP\CoreCms.Net.Services\bin\Debug\net8.0\CoreCms.Net.IRepository.p
D:\Code\Shop.ERP\CoreCms.Net.Services\bin\Debug\net8.0\CoreCms.Net.IServices.pdb
D:\Code\Shop.ERP\CoreCms.Net.Services\bin\Debug\net8.0\CoreCms.Net.Loging.pdb
D:\Code\Shop.ERP\CoreCms.Net.Services\bin\Debug\net8.0\CoreCms.Net.Model.pdb
D:\Code\Shop.ERP\CoreCms.Net.Services\bin\Debug\net8.0\CoreCms.Net.RedisMQ.pdb
D:\Code\Shop.ERP\CoreCms.Net.Services\bin\Debug\net8.0\CoreCms.Net.Swagger.pdb
D:\Code\Shop.ERP\CoreCms.Net.Services\bin\Debug\net8.0\CoreCms.Net.Utility.pdb
D:\Code\Shop.ERP\CoreCms.Net.Services\obj\Debug\net8.0\CoreCms.Net.Services.csproj.AssemblyReference.cache
......
......@@ -267,7 +267,6 @@ D:\Code\Shop.ERP\CoreCms.Net.Task\bin\Debug\net8.0\CoreCms.Net.IRepository.dll
D:\Code\Shop.ERP\CoreCms.Net.Task\bin\Debug\net8.0\CoreCms.Net.IServices.dll
D:\Code\Shop.ERP\CoreCms.Net.Task\bin\Debug\net8.0\CoreCms.Net.Loging.dll
D:\Code\Shop.ERP\CoreCms.Net.Task\bin\Debug\net8.0\CoreCms.Net.Model.dll
D:\Code\Shop.ERP\CoreCms.Net.Task\bin\Debug\net8.0\CoreCms.Net.RedisMQ.dll
D:\Code\Shop.ERP\CoreCms.Net.Task\bin\Debug\net8.0\CoreCms.Net.Repository.dll
D:\Code\Shop.ERP\CoreCms.Net.Task\bin\Debug\net8.0\CoreCms.Net.Services.dll
D:\Code\Shop.ERP\CoreCms.Net.Task\bin\Debug\net8.0\CoreCms.Net.Swagger.dll
......@@ -284,7 +283,6 @@ D:\Code\Shop.ERP\CoreCms.Net.Task\bin\Debug\net8.0\CoreCms.Net.CodeGenerator.pdb
D:\Code\Shop.ERP\CoreCms.Net.Task\bin\Debug\net8.0\CoreCms.Net.Configuration.pdb
D:\Code\Shop.ERP\CoreCms.Net.Task\bin\Debug\net8.0\CoreCms.Net.Core.pdb
D:\Code\Shop.ERP\CoreCms.Net.Task\bin\Debug\net8.0\CoreCms.Net.Model.pdb
D:\Code\Shop.ERP\CoreCms.Net.Task\bin\Debug\net8.0\CoreCms.Net.RedisMQ.pdb
D:\Code\Shop.ERP\CoreCms.Net.Task\bin\Debug\net8.0\CoreCms.Net.Swagger.pdb
D:\Code\Shop.ERP\CoreCms.Net.Task\obj\Debug\net8.0\CoreCms.Net.Task.csproj.AssemblyReference.cache
D:\Code\Shop.ERP\CoreCms.Net.Task\obj\Debug\net8.0\CoreCms.Net.Task.GeneratedMSBuildEditorConfig.editorconfig
......
......@@ -71,9 +71,6 @@ namespace CoreCms.Net.Web.Admin.Infrastructure
//Swagger接口文档注入
builder.Services.AddAdminSwaggerSetup();
//配置易联云打印机
builder.Services.AddYiLianYunSetup();
//jwt授权支持注入
builder.Services.AddAuthorizationSetupForAdmin();
//上下文注入
......
......@@ -66,9 +66,6 @@ namespace CoreCms.Net.Web.WebApi.Infrastructure
//使用 SignalR
builder.Services.AddSignalR();
//Redis消息队列
builder.Services.AddRedisMessageQueueSetup();
// 引入Payment 依赖注入(支付宝支付/微信支付)
builder.Services.AddAlipay();
builder.Services.AddWeChatPay();
......@@ -83,9 +80,6 @@ namespace CoreCms.Net.Web.WebApi.Infrastructure
//Swagger接口文档注入
builder.Services.AddClientSwaggerSetup();
//配置易联云打印机
builder.Services.AddYiLianYunSetup();
//注册Hangfire定时任务
builder.Services.AddHangFireSetup();
......
......@@ -79,7 +79,6 @@
<ProjectReference Include="..\CoreCms.Net.Mapping\CoreCms.Net.Mapping.csproj" />
<ProjectReference Include="..\CoreCms.Net.Middlewares\CoreCms.Net.Middlewares.csproj" />
<ProjectReference Include="..\CoreCms.Net.Model\CoreCms.Net.Model.csproj" />
<ProjectReference Include="..\CoreCms.Net.RedisMQ\CoreCms.Net.RedisMQ.csproj" />
<ProjectReference Include="..\CoreCms.Net.Repository\CoreCms.Net.Repository.csproj" />
<ProjectReference Include="..\CoreCms.Net.Services\CoreCms.Net.Services.csproj" />
<ProjectReference Include="..\CoreCms.Net.Task\CoreCms.Net.Task.csproj" />
......
......@@ -51,8 +51,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "2.Entity", "2.Entity", "{CA
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CoreCms.Net.Task", "CoreCms.Net.Task\CoreCms.Net.Task.csproj", "{7043B7B2-6496-4FCB-A230-1EBC5E11B91C}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CoreCms.Net.RedisMQ", "CoreCms.Net.RedisMQ\CoreCms.Net.RedisMQ.csproj", "{927E68B4-92D1-4F66-B137-87804055DE93}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "8.MicroService", "8.MicroService", "{213FB1ED-B055-4E93-B735-70B3741EDB3F}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "5.MicroService", "5.MicroService", "{02EA681E-C7D8-13C7-8484-4AC65E1B71E8}"
......@@ -141,10 +139,6 @@ Global
{7043B7B2-6496-4FCB-A230-1EBC5E11B91C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7043B7B2-6496-4FCB-A230-1EBC5E11B91C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7043B7B2-6496-4FCB-A230-1EBC5E11B91C}.Release|Any CPU.Build.0 = Release|Any CPU
{927E68B4-92D1-4F66-B137-87804055DE93}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{927E68B4-92D1-4F66-B137-87804055DE93}.Debug|Any CPU.Build.0 = Debug|Any CPU
{927E68B4-92D1-4F66-B137-87804055DE93}.Release|Any CPU.ActiveCfg = Release|Any CPU
{927E68B4-92D1-4F66-B137-87804055DE93}.Release|Any CPU.Build.0 = Release|Any CPU
{3C435058-1A99-4548-A217-93359E4869B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3C435058-1A99-4548-A217-93359E4869B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3C435058-1A99-4548-A217-93359E4869B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
......@@ -173,7 +167,6 @@ Global
{57648B11-317A-4FE1-BFDB-1FDEAE5DFFDE} = {82634406-6F43-4E90-B57D-5C7AC3DAFF11}
{0E024CA5-FCE6-48A7-8209-201FF2D9237E} = {82634406-6F43-4E90-B57D-5C7AC3DAFF11}
{7043B7B2-6496-4FCB-A230-1EBC5E11B91C} = {B3F41F4C-3681-48F3-9BE3-809763AC1937}
{927E68B4-92D1-4F66-B137-87804055DE93} = {B3F41F4C-3681-48F3-9BE3-809763AC1937}
{3C435058-1A99-4548-A217-93359E4869B9} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment