【 2. 新增订单接口增加一个数组结构:pullInfo,元素有:api服务商code,开始code,结束code,以及静默时间,停止刷新时间。】
https://www.tapd.cn/60863849/prong/tasks/view/1160863849001027886
This commit is contained in:
parent
7206bc64cd
commit
b919300524
@ -7,6 +7,13 @@ namespace SJZY.Track.Application.Contract.Dtos.ProvideServices;
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public class OrderNoInfo
|
public class OrderNoInfo
|
||||||
{
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 子系统id
|
||||||
|
/// </summary>
|
||||||
|
[Required]
|
||||||
|
[Range(1, int.MaxValue)]
|
||||||
|
public int SubSystemId { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 订单类型,必填
|
/// 订单类型,必填
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@ -24,6 +31,13 @@ public class OrderNoInfo
|
|||||||
|
|
||||||
public class OrderNosInfo
|
public class OrderNosInfo
|
||||||
{
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 子系统id
|
||||||
|
/// </summary>
|
||||||
|
[Required]
|
||||||
|
[Range(1, int.MaxValue)]
|
||||||
|
public int SubSystemId { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 订单类型
|
/// 订单类型
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|||||||
@ -61,4 +61,45 @@ public class UpdateOrderInput : OrderNoInfo
|
|||||||
/// 产品编码
|
/// 产品编码
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string? ProductCode { get; set; }
|
public string? ProductCode { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 业务key
|
||||||
|
/// </summary>
|
||||||
|
public string Key { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 拉取配置信息
|
||||||
|
/// </summary>
|
||||||
|
public List<PullConfigInfo> PullConfigInfos { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public class PullConfigInfo
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 服务商code
|
||||||
|
/// </summary>
|
||||||
|
[Required]
|
||||||
|
public string ServiceCode { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 开始轨迹code
|
||||||
|
/// </summary>
|
||||||
|
public string? StartCode { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 结束轨迹code
|
||||||
|
/// </summary>
|
||||||
|
public string? EndCode { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 静默多久后拉取(小时)
|
||||||
|
/// </summary>
|
||||||
|
[Range(0, 24 * 7)]
|
||||||
|
public int SilenceTime { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 结束多久后停止拉取(小时)
|
||||||
|
/// </summary>
|
||||||
|
[Range(0, 24 * 7)]
|
||||||
|
public int StopTime { get; set; }
|
||||||
}
|
}
|
||||||
|
|||||||
@ -4,7 +4,6 @@ using SJZY.Track.Application.Contract.Services;
|
|||||||
using SJZY.Track.Domain.Aggregates.OrderAggregate;
|
using SJZY.Track.Domain.Aggregates.OrderAggregate;
|
||||||
using SJZY.Track.Domain.Aggregates.TrackDetailsAggregate;
|
using SJZY.Track.Domain.Aggregates.TrackDetailsAggregate;
|
||||||
using SJZY.Track.Domain.Queries;
|
using SJZY.Track.Domain.Queries;
|
||||||
using SJZY.UserCenter.HttpApi.Services;
|
|
||||||
|
|
||||||
namespace SJZY.Track.Application.Services.ProvideServices;
|
namespace SJZY.Track.Application.Services.ProvideServices;
|
||||||
|
|
||||||
@ -34,7 +33,7 @@ public partial class OrderService : ApplicationService, IOrderService
|
|||||||
[HttpPost("Order/Upsert")]
|
[HttpPost("Order/Upsert")]
|
||||||
public async Task<UnifyResultDto<IdBaseDto>> UpsertAsync(UpsertOrderInput input)
|
public async Task<UnifyResultDto<IdBaseDto>> UpsertAsync(UpsertOrderInput input)
|
||||||
{
|
{
|
||||||
var subSystemId = CurrentUserRequest.SubSystemId;
|
var subSystemId = input.SubSystemId;
|
||||||
|
|
||||||
// 校验订单是否已存在,存在则更新
|
// 校验订单是否已存在,存在则更新
|
||||||
var order = await _orderRepository.GetFirstAsync(x =>
|
var order = await _orderRepository.GetFirstAsync(x =>
|
||||||
@ -70,7 +69,7 @@ public partial class OrderService : ApplicationService, IOrderService
|
|||||||
[HttpPost("Order/Delete")]
|
[HttpPost("Order/Delete")]
|
||||||
public async Task<UnifyResultDto<IdBaseDto>> DeleteOrderAsync(DeleteOrderInput input)
|
public async Task<UnifyResultDto<IdBaseDto>> DeleteOrderAsync(DeleteOrderInput input)
|
||||||
{
|
{
|
||||||
var susSystemId = CurrentUserRequest.SubSystemId;
|
var susSystemId = input.SubSystemId;
|
||||||
var orderId = await _orderRepository.GetFirstAsync(x =>
|
var orderId = await _orderRepository.GetFirstAsync(x =>
|
||||||
x.SubSystemId == susSystemId && x.OrderType == input.OrderType && x.OrderNo == input.OrderNo, x => x.Id);
|
x.SubSystemId == susSystemId && x.OrderType == input.OrderType && x.OrderNo == input.OrderNo, x => x.Id);
|
||||||
if (orderId == default)
|
if (orderId == default)
|
||||||
|
|||||||
@ -1,7 +1,6 @@
|
|||||||
using SJZY.Track.Application.Contract.Dtos.ProvideServices;
|
using SJZY.Track.Application.Contract.Dtos.ProvideServices;
|
||||||
using SJZY.Track.Domain.Aggregates.TrackDetailsAggregate;
|
using SJZY.Track.Domain.Aggregates.TrackDetailsAggregate;
|
||||||
using SJZY.Track.Domain.Consts;
|
using SJZY.Track.Domain.Consts;
|
||||||
using SJZY.UserCenter.HttpApi.Services;
|
|
||||||
|
|
||||||
namespace SJZY.Track.Application.Services.ProvideServices;
|
namespace SJZY.Track.Application.Services.ProvideServices;
|
||||||
|
|
||||||
@ -26,7 +25,7 @@ public partial class TrackService
|
|||||||
throw new BusinessException(message: "最多只能查询500单");
|
throw new BusinessException(message: "最多只能查询500单");
|
||||||
}
|
}
|
||||||
|
|
||||||
var subSystemId = CurrentUserRequest.SubSystemId;
|
var subSystemId = input.SubSystemId;
|
||||||
|
|
||||||
var res = new List<GetTrackOutput>();
|
var res = new List<GetTrackOutput>();
|
||||||
input.OrderNos = input.OrderNos.Where(x => !x.IsNullOrWhiteSpace()).Distinct().ToList(); // 单号去重、去空
|
input.OrderNos = input.OrderNos.Where(x => !x.IsNullOrWhiteSpace()).Distinct().ToList(); // 单号去重、去空
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user