fix子系统
This commit is contained in:
parent
b49678b77f
commit
fb26f5b0d1
@ -9,6 +9,7 @@
|
|||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="BSI.Stack.Rabbit" Version="2.0.9" />
|
<PackageReference Include="BSI.Stack.Rabbit" Version="2.0.9" />
|
||||||
|
<PackageReference Include="Savorboard.CAP.InMemoryMessageQueue" Version="8.2.1"/>
|
||||||
<PackageReference Include="SJZY.InterfaceRelay.Application.Contracts" Version="7.2.3"/>
|
<PackageReference Include="SJZY.InterfaceRelay.Application.Contracts" Version="7.2.3"/>
|
||||||
<PackageReference Include="Volo.Abp.Http.Client" Version="7.0.2" />
|
<PackageReference Include="Volo.Abp.Http.Client" Version="7.0.2" />
|
||||||
<PackageReference Include="Volo.Abp.FluentValidation" Version="7.0.2" />
|
<PackageReference Include="Volo.Abp.FluentValidation" Version="7.0.2" />
|
||||||
@ -19,7 +20,6 @@
|
|||||||
<PackageReference Include="DotNetCore.CAP.RabbitMQ" Version="8.2.0"/>
|
<PackageReference Include="DotNetCore.CAP.RabbitMQ" Version="8.2.0"/>
|
||||||
<PackageReference Include="DotNetCore.CAP.MySql" Version="8.2.0"/>
|
<PackageReference Include="DotNetCore.CAP.MySql" Version="8.2.0"/>
|
||||||
<PackageReference Include="DotNetCore.CAP.InMemoryStorage" Version="8.2.0"/>
|
<PackageReference Include="DotNetCore.CAP.InMemoryStorage" Version="8.2.0"/>
|
||||||
<PackageReference Include="Savorboard.CAP.InMemoryMessageQueue" Version="7.0.0"/>
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
@ -69,7 +69,8 @@ public partial class OrderService
|
|||||||
|
|
||||||
// 查询存在的订单
|
// 查询存在的订单
|
||||||
var existedOrders = await _orderRepository.GetListAsync(x =>
|
var existedOrders = await _orderRepository.GetListAsync(x =>
|
||||||
x.OrderType == input.LinkOrderType && noLinkOrderNos.Contains(x.OrderNo),
|
x.SubSystemId == input.SubSystemId && x.OrderType == input.LinkOrderType &&
|
||||||
|
noLinkOrderNos.Contains(x.OrderNo),
|
||||||
x => new
|
x => new
|
||||||
{
|
{
|
||||||
x.Id,
|
x.Id,
|
||||||
|
|||||||
@ -90,6 +90,14 @@ public class TrackPushService : ApplicationService, ITrackPushService
|
|||||||
return $"即将推送轨迹代码{input.TrackCode}给{orders.Length}个订单";
|
return $"即将推送轨迹代码{input.TrackCode}给{orders.Length}个订单";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取轨迹推送内容
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="subSystemId"></param>
|
||||||
|
/// <param name="customerId"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
[HttpPost("Track/GetTrackPushContentList")]
|
||||||
public async Task<List<TrackPushContentDto>> GetTrackPushContentListAsync(int subSystemId, int customerId)
|
public async Task<List<TrackPushContentDto>> GetTrackPushContentListAsync(int subSystemId, int customerId)
|
||||||
{
|
{
|
||||||
var list = await _trackPushConfigRepository.GetTrackPushContentListAsync(subSystemId, customerId);
|
var list = await _trackPushConfigRepository.GetTrackPushContentListAsync(subSystemId, customerId);
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user