|
@@ -1,10 +1,13 @@
|
|
using iTextSharp.text.pdf.parser;
|
|
using iTextSharp.text.pdf.parser;
|
|
|
|
+using NPOI.SS.Formula.PTG;
|
|
using RestSharp;
|
|
using RestSharp;
|
|
using System;
|
|
using System;
|
|
using System.Collections.Generic;
|
|
using System.Collections.Generic;
|
|
using System.Linq;
|
|
using System.Linq;
|
|
using System.Threading.Tasks;
|
|
using System.Threading.Tasks;
|
|
using XYY.Core.Standard.ExtendMethods;
|
|
using XYY.Core.Standard.ExtendMethods;
|
|
|
|
+using XYY.Data.Standard.Order;
|
|
|
|
+
|
|
//using XYY.Common.Standard;
|
|
//using XYY.Common.Standard;
|
|
using XYY.Model.Standard.Order;
|
|
using XYY.Model.Standard.Order;
|
|
using XYY.Service.Standard.ChannelApi.Base;
|
|
using XYY.Service.Standard.ChannelApi.Base;
|
|
@@ -15,6 +18,13 @@ namespace XYY.Service.Standard.ChannelApi.Sengi.Shiphubx
|
|
{
|
|
{
|
|
public string ServiceName => "Shiphubx";
|
|
public string ServiceName => "Shiphubx";
|
|
|
|
|
|
|
|
+ public IOrderRepository _orderRepository { get; set; }
|
|
|
|
+
|
|
|
|
+ public Api(IOrderRepository orderRepository)
|
|
|
|
+ {
|
|
|
|
+ _orderRepository = orderRepository;
|
|
|
|
+ }
|
|
|
|
+
|
|
public Task<List<BagDeclareErrosResult>> BagDeclare(BagDeclareRequest bagDeclareRequest)
|
|
public Task<List<BagDeclareErrosResult>> BagDeclare(BagDeclareRequest bagDeclareRequest)
|
|
{
|
|
{
|
|
throw new NotImplementedException();
|
|
throw new NotImplementedException();
|
|
@@ -69,6 +79,13 @@ namespace XYY.Service.Standard.ChannelApi.Sengi.Shiphubx
|
|
};
|
|
};
|
|
}
|
|
}
|
|
string refrno = order.SystemNo.Replace("XYYEX", "A");
|
|
string refrno = order.SystemNo.Replace("XYYEX", "A");
|
|
|
|
+ //if (channel.Id == 916)
|
|
|
|
+ //{
|
|
|
|
+ // if (order.IsOnline)
|
|
|
|
+ // refrno = order.TransferNumber;
|
|
|
|
+ // else
|
|
|
|
+ // refrn
|
|
|
|
+ //}
|
|
decimal avgweight = order.CustomerWeight / (decimal)goods.Sum(x => x.Quantity);
|
|
decimal avgweight = order.CustomerWeight / (decimal)goods.Sum(x => x.Quantity);
|
|
decimal orderWeight = order.CustomerWeight;
|
|
decimal orderWeight = order.CustomerWeight;
|
|
CreateOrderReq req = new CreateOrderReq
|
|
CreateOrderReq req = new CreateOrderReq
|
|
@@ -166,14 +183,23 @@ namespace XYY.Service.Standard.ChannelApi.Sengi.Shiphubx
|
|
var orderInfoResponse = client.Execute<LabelResult>(orderInfoRequest);
|
|
var orderInfoResponse = client.Execute<LabelResult>(orderInfoRequest);
|
|
if (orderInfoResponse.IsSuccessful)
|
|
if (orderInfoResponse.IsSuccessful)
|
|
{
|
|
{
|
|
|
|
+ await _orderRepository.AddChannelOrderInfoRecord(order.ChannelId, orderInfoResponse.Data.logistics_code, order.SystemNo);
|
|
string labelUrl = orderInfoResponse.Data.label_url;
|
|
string labelUrl = orderInfoResponse.Data.label_url;
|
|
|
|
+ string serviceNumber = orderInfoResponse.Data.refer_no;
|
|
|
|
+ if (channel.Id == 916)
|
|
|
|
+ {
|
|
|
|
+ if (order.IsOnline)
|
|
|
|
+ serviceNumber = order.TransferNumber;
|
|
|
|
+ else
|
|
|
|
+ serviceNumber = order.SystemNo;
|
|
|
|
+ }
|
|
return new UploadResult
|
|
return new UploadResult
|
|
{
|
|
{
|
|
IsSuccess = true,
|
|
IsSuccess = true,
|
|
TrackingNumber = orderInfoResponse.Data.logistics_code,
|
|
TrackingNumber = orderInfoResponse.Data.logistics_code,
|
|
DownloadUrl = labelUrl,
|
|
DownloadUrl = labelUrl,
|
|
- ServiceOrderNumber = orderInfoResponse.Data.refer_no,
|
|
|
|
- ServiceOrderNumber3 = orderInfoResponse.Data.refer_no
|
|
|
|
|
|
+ ServiceOrderNumber = serviceNumber,
|
|
|
|
+ ServiceOrderNumber3 = serviceNumber
|
|
};
|
|
};
|
|
}
|
|
}
|
|
else
|
|
else
|