whm
/
BookingHeChuan
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan

Browse Source
optimize
wanghaomei 1 year ago
parent 6daf565616 2838d4fd91
commit 067f9a4021
5 changed files with 46 additions and 50 deletions
Show Stats Download Patch File Download Diff File

4
Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
Unescape Escape View File

@ -9647,7 +9647,7 @@ namespace Myshipping.Application
.First(a => a.Id == bookingId);
model.BSSTATUSNAME = maxStatus.ShowName;
model.VERSION = IDGen.NextID().ToString().Replace("-", "");
//model.VERSION = IDGen.NextID().ToString().Replace("-", "");
//更新订舱
_rep.AsUpdateable(model)
@ -9746,7 +9746,7 @@ namespace Myshipping.Application
model.BSSTATUSNAME = string.Empty;
}
model.VERSION = IDGen.NextID().ToString().Replace("-", "");
//model.VERSION = IDGen.NextID().ToString().Replace("-", "");
//更新订舱
_rep.AsUpdateable(model)

8
Myshipping.Application/Service/BookingTruck/BookingTruckService.cs
Unescape Escape View File

@ -1946,13 +1946,13 @@ namespace Myshipping.Application
bookingOrder.TRUCKERID = null;
bookingOrder.TRUCKER = null;
bookingOrder.VERSION = IDGen.NextID().ToString().Replace("-", "");
//bookingOrder.VERSION = IDGen.NextID().ToString().Replace("-", "");
_bookingOrderRepository.AsUpdateable(bookingOrder).UpdateColumns(it => new
{
it.TRUCKERID,
it.TRUCKER,
it.VERSION
//it.VERSION
}).ExecuteCommand();
var syncDongshengRlt = await _bookingOrderService.SendBookingOrder(new long[] { bookingTruckInfo.BookingId.Value });
@ -1978,13 +1978,13 @@ namespace Myshipping.Application
bookingOrder.TRUCKERID = info.TruckCode;
bookingOrder.TRUCKER = info.TruckName;
bookingOrder.VERSION = IDGen.NextID().ToString().Replace("-", "");
//bookingOrder.VERSION = IDGen.NextID().ToString().Replace("-", "");
_bookingOrderRepository.AsUpdateable(bookingOrder).UpdateColumns(it => new
{
it.TRUCKERID,
it.TRUCKER,
it.VERSION
//it.VERSION
}).ExecuteCommand();
//这里直接调用订舱服务的功能，担心有异常所以这里单独做了异常捕获

33
Myshipping.Application/Service/DataSync/DataSyncService.cs
Unescape Escape View File

@ -2423,23 +2423,22 @@ namespace Myshipping.Application
}
if (!string.IsNullOrEmpty(o.VESSEL) && !string.IsNullOrEmpty(o.VOYNO) && !string.IsNullOrEmpty(o.CARRIERID))
{
var order = await _rep.AsQueryable().Filter(null, true).Where(x => x.VOYNO == o.VOYNO && x.VESSEL == o.VESSEL && x.CARRIERID == o.CARRIERID && x.TenantId == o.TenantId && x.IsDeleted == false && x.Id != item.BookingId).ToListAsync();
foreach (var it in order)
{
var _oldorder = it;
var _oldatd = it.ETA;
if (_oldatd != item.OpTime)
{
it.ETA = item.OpTime;
await _rep.UpdateAsync(it);
await _bookingorderservice.SendBookingOrder(new long[] { it.Id });
await _bookingorderservice.SaveLog(it, _oldorder);
}
}
}
//if (!string.IsNullOrEmpty(o.VESSEL) && !string.IsNullOrEmpty(o.VOYNO) && !string.IsNullOrEmpty(o.CARRIERID))
//{
// var order = await _rep.AsQueryable().Filter(null, true).Where(x => x.VOYNO == o.VOYNO && x.VESSEL == o.VESSEL && x.CARRIERID == o.CARRIERID && x.TenantId == o.TenantId && x.IsDeleted == false && x.Id != item.BookingId).ToListAsync();
// foreach (var it in order)
// {
// var _oldorder = it;
// var _oldatd = it.ETA;
// if (_oldatd != item.OpTime)
// {
// it.ETA = item.OpTime;
// await _rep.UpdateAsync(it);
// await _bookingorderservice.SendBookingOrder(new long[] { it.Id });
// await _bookingorderservice.SaveLog(it, _oldorder);
// }
// }
//}
}
if (item.Status == "MDGATA")
{

31
Myshipping.Application/Service/ExpressDelivery/Dto/ExpressDeliveryDto.cs
Unescape Escape View File

@ -31,6 +31,7 @@ namespace Myshipping.Application.Service.ExpressDelivery.Dto
/// <summary>
/// 快递公司
/// </summary>
[Required(ErrorMessage = "快递公司不能为空")]
public string KDCompany { get; set; }
/// <summary>
@ -49,10 +50,12 @@ namespace Myshipping.Application.Service.ExpressDelivery.Dto
/// <summary>
/// 收件省份Id
/// </summary>
[Required(ErrorMessage = "收件省份不能为空")]
public string SJProvinceId { get; set; }
/// <summary>
/// 收件城市
/// </summary>
[Required(ErrorMessage = "收件城市不能为空")]
public string SJCity { get; set; }
/// <summary>
/// 收件地址
@ -60,45 +63,39 @@ namespace Myshipping.Application.Service.ExpressDelivery.Dto
[Required(ErrorMessage = "收件人地址不能为空")]
public string SJAddress { get; set; }
/// <summary>
/// 收件邮编
/// </summary>
public string SJPostCode { get; set; }
/// <summary>
/// 收件电话
/// </summary>
[Required(ErrorMessage = "收件人电话不能为空")]
public string SJTel { get; set; }
/// <summary>
/// 发件公司
/// 寄件公司
/// </summary>
public string FJCompany { get; set; }
/// <summary>
/// 发件人
/// 寄件人
/// </summary>
[Required(ErrorMessage = "发件人不能为空")]
[Required(ErrorMessage = "寄件人不能为空")]
public string FJPeople { get; set; }
/// <summary>
/// 发件省份
/// 寄件省份
/// </summary>
[Required(ErrorMessage = "寄件省份不能为空")]
public string FJProvince { get; set; }
/// <summary>
/// 发件省份ID
/// 寄件省份ID
/// </summary>
public string FJProvinceId { get; set; }
/// <summary>
/// 发件城市
/// 寄件城市
/// </summary>
[Required(ErrorMessage = "寄件城市不能为空")]
public string FJCity { get; set; }
/// <summary>
/// 发件地址
/// 寄件地址
/// </summary>
[Required(ErrorMessage = "发件人地址不能为空")]
[Required(ErrorMessage = "寄件详细地址不能为空")]
public string FJAddress { get; set; }
/// <summary>
/// 发件邮编
/// </summary>
public string FJPostCode { get; set; }
/// <summary>
/// 发件电话
/// </summary>
[Required(ErrorMessage = "发件人电话不能为空")]
@ -150,7 +147,7 @@ namespace Myshipping.Application.Service.ExpressDelivery.Dto
/// <summary>
/// 结费类型代码；1：现结；2：月结；3：到付
/// </summary>
[Required(ErrorMessage = "结费类型代码不能为空")]
[Required(ErrorMessage = "结费类型不能为空")]
public string SettleAccountsTypeCode { get; set; }
/// <summary>
/// 月结卡号

20
Myshipping.Application/Service/ExpressDelivery/ExpressDeliveryService.cs
Unescape Escape View File

@ -33,8 +33,8 @@ namespace Myshipping.Application
private const string STATUS_ASSOCIATION = "关联快递订单";
private const string STATUS_DISASSOCIATION = "取消关联快递订单";
private const string STATUS_DELETE = "关联快递订单已删除";
private const string STATUS_SEND = "快递下单";
private const string STATUS_CANCEL = "快递消单";
private const string STATUS_SEND = "快递已下单";
private const string STATUS_CANCEL = "快递已消单";
private readonly ILogger<ExpressDeliveryService> _logger;
private readonly ISysCacheService _cache;
@ -75,14 +75,14 @@ namespace Myshipping.Application
var entities = await _orderRep.AsQueryable().Filter(null, true)
.Where(x => x.TenantId == UserManager.TENANT_ID && x.IsDeleted == false)
.WhereIF(!string.IsNullOrWhiteSpace(input.KDNO), u => u.KDNO.Contains(input.KDNO))
.WhereIF(!string.IsNullOrWhiteSpace(input.SJCompany), u => u.KDNO.Contains(input.SJCompany))
.WhereIF(!string.IsNullOrWhiteSpace(input.SJPeople), u => u.KDNO.Contains(input.SJPeople))
.WhereIF(!string.IsNullOrWhiteSpace(input.SJTel), u => u.KDNO.Contains(input.SJTel))
.WhereIF(!string.IsNullOrWhiteSpace(input.FJCompany), u => u.KDNO.Contains(input.FJCompany))
.WhereIF(!string.IsNullOrWhiteSpace(input.FJPeople), u => u.KDNO.Contains(input.FJPeople))
.WhereIF(!string.IsNullOrWhiteSpace(input.FJTel), u => u.KDNO.Contains(input.FJTel))
.WhereIF(!string.IsNullOrWhiteSpace(input.VESSEL), u => u.KDNO.Contains(input.VESSEL))
.WhereIF(!string.IsNullOrWhiteSpace(input.VOYNO), u => u.KDNO.Contains(input.VOYNO))
.WhereIF(!string.IsNullOrWhiteSpace(input.SJCompany), u => u.SJCompany.Contains(input.SJCompany))
.WhereIF(!string.IsNullOrWhiteSpace(input.SJPeople), u => u.SJPeople.Contains(input.SJPeople))
.WhereIF(!string.IsNullOrWhiteSpace(input.SJTel), u => u.SJTel.Contains(input.SJTel))
.WhereIF(!string.IsNullOrWhiteSpace(input.FJCompany), u => u.FJCompany.Contains(input.FJCompany))
.WhereIF(!string.IsNullOrWhiteSpace(input.FJPeople), u => u.FJPeople.Contains(input.FJPeople))
.WhereIF(!string.IsNullOrWhiteSpace(input.FJTel), u => u.FJTel.Contains(input.FJTel))
.WhereIF(!string.IsNullOrWhiteSpace(input.VESSEL), u => u.VESSEL.Contains(input.VESSEL))
.WhereIF(!string.IsNullOrWhiteSpace(input.VOYNO), u => u.VOYNO.Contains(input.VOYNO))
.WhereIF(input.BDate != null, u => u.Date >= input.BDate)
.WhereIF(input.EDate != null, u => u.Date <= input.EDate)
.OrderBy(PageInputOrder.OrderBuilder(input.SortField, input.DescSort))

Write Preview
Loading…
Cancel
Save