Skip to content

D
data-center-auto
Commit 0328f60a by lizefeng
Options

优化账单抓取

parent d60c2315
Showing with 99 additions and 47 deletions
AutoTurnOver.Models/dc_base_amazon_fulfilled_shipments.cs
...@@ -22,6 +22,7 @@ namespace AutoTurnOver.Models ...@@ -22,6 +22,7 @@ namespace AutoTurnOver.Models
public string buyer_name { get; set; } public string buyer_name { get; set; }
public string buyer_phone_number { get; set; } public string buyer_phone_number { get; set; }
public string sku { get; set; } public string sku { get; set; }
public string product_name { get; set; } public string product_name { get; set; }
public decimal? quantity_shipped { get; set; } public decimal? quantity_shipped { get; set; }
public string currency { get; set; } public string currency { get; set; }
......
AutoTurnOver.Services/Dto/ApiAmzonResponseDto.cs
...@@ -150,6 +150,8 @@ namespace AutoTurnOver.Services.Dto ...@@ -150,6 +150,8 @@ namespace AutoTurnOver.Services.Dto
public DateTime? DepositDate { get; set; } public DateTime? DepositDate { get; set; }
} }
[JsonProperty("OtherTransaction")]
[JsonConverter(typeof(OtherTransactionDataConverter))]
public List<OtherTransactionDto> OtherTransaction { get; set; } = new List<OtherTransactionDto> { }; public List<OtherTransactionDto> OtherTransaction { get; set; } = new List<OtherTransactionDto> { };
public class OtherTransactionDto public class OtherTransactionDto
...@@ -209,13 +211,10 @@ namespace AutoTurnOver.Services.Dto ...@@ -209,13 +211,10 @@ namespace AutoTurnOver.Services.Dto
} }
public PromotionDto Promotion { get; set; } [JsonProperty("Promotion")]
public class PromotionDto [JsonConverter(typeof(PromotionDataConverter))]
{ public List<PromotionDto> Promotion { get; set; }
public string MerchantPromotionID { get; set; }
public string Type { get; set; }
public Amount Amount { get; set; }
}
} }
} }
} }
...@@ -260,13 +259,10 @@ namespace AutoTurnOver.Services.Dto ...@@ -260,13 +259,10 @@ namespace AutoTurnOver.Services.Dto
} }
public PromotionDto PromotionAdjustment { get; set; } [JsonProperty("PromotionAdjustment")]
public class PromotionDto [JsonConverter(typeof(PromotionDataConverter))]
{ public List<PromotionDto> PromotionAdjustment { get; set; }
public string MerchantPromotionID { get; set; }
public string Type { get; set; }
public Amount Amount { get; set; }
}
} }
} }
} }
...@@ -285,6 +281,12 @@ namespace AutoTurnOver.Services.Dto ...@@ -285,6 +281,12 @@ namespace AutoTurnOver.Services.Dto
} }
} }
} }
public class PromotionDto
{
public string MerchantPromotionID { get; set; }
public string Type { get; set; }
public Amount Amount { get; set; }
}
public class FeeDto public class FeeDto
{ {
public string Type { get; set; } public string Type { get; set; }
...@@ -330,6 +332,36 @@ namespace AutoTurnOver.Services.Dto ...@@ -330,6 +332,36 @@ namespace AutoTurnOver.Services.Dto
serializer.Serialize(writer, value); serializer.Serialize(writer, value);
} }
} }
class OtherTransactionDataConverter : JsonConverter
{
public override bool CanConvert(Type objectType)
{
return (objectType == typeof(ApiAmazonSettlementDto.AmazonEnvelopeDto.MessageDto.SettlementReportDto.OtherTransactionDto));
}
public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
{
JToken token = JToken.Load(reader);
if (token.Type == JTokenType.Array)
{
return token.ToObject<List<ApiAmazonSettlementDto.AmazonEnvelopeDto.MessageDto.SettlementReportDto.OtherTransactionDto>>();
}
if (token.Type == JTokenType.Object)
{
return new List<ApiAmazonSettlementDto.AmazonEnvelopeDto.MessageDto.SettlementReportDto.OtherTransactionDto> { token.ToObject<ApiAmazonSettlementDto.AmazonEnvelopeDto.MessageDto.SettlementReportDto.OtherTransactionDto>() };
}
else
{
return new List<ApiAmazonSettlementDto.AmazonEnvelopeDto.MessageDto.SettlementReportDto.OtherTransactionDto> { };
}
}
public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
{
serializer.Serialize(writer, value);
}
}
class RefundDataConverter : JsonConverter class RefundDataConverter : JsonConverter
{ {
public override bool CanConvert(Type objectType) public override bool CanConvert(Type objectType)
...@@ -453,6 +485,38 @@ namespace AutoTurnOver.Services.Dto ...@@ -453,6 +485,38 @@ namespace AutoTurnOver.Services.Dto
} }
} }
class PromotionDataConverter : JsonConverter
{
public override bool CanConvert(Type objectType)
{
return (objectType == typeof(ApiAmazonSettlementDto.AmazonEnvelopeDto.PromotionDto));
}
public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
{
JToken token = JToken.Load(reader);
if (token.Type == JTokenType.Array)
{
var test = token.ToString();
return token.ToObject<List<ApiAmazonSettlementDto.AmazonEnvelopeDto.PromotionDto>>();
}
if (token.Type == JTokenType.Object)
{
return new List<ApiAmazonSettlementDto.AmazonEnvelopeDto.PromotionDto> { token.ToObject<ApiAmazonSettlementDto.AmazonEnvelopeDto.PromotionDto> () };
}
else
{
return new List<ApiAmazonSettlementDto.AmazonEnvelopeDto.FeeDto> { };
}
}
public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
{
serializer.Serialize(writer, value);
}
}
class AdjustedItemDataConverter : JsonConverter class AdjustedItemDataConverter : JsonConverter
{ {
public override bool CanConvert(Type objectType) public override bool CanConvert(Type objectType)
......
AutoTurnOver.Utility/DataTableExtensions.cs
...@@ -42,54 +42,41 @@ namespace AutoTurnOver.Utility ...@@ -42,54 +42,41 @@ namespace AutoTurnOver.Utility
} }
public static string DataRowToString(this DataRow row, string key) public static string DataRowToString(this DataRow row,int index)
{ {
if (row[key] == null) if (row[index] == null)
{ {
return null; return null;
} }
else else
{ {
return row[key].ToString(); return row[index].ToString();
} }
} }
public static DateTime? DataRowToDateTime(this DataRow row, string key) public static DateTime? DataRowToDateTime(this DataRow row,int index)
{ {
try
if (row[index] == null)
{ {
if (row[key] == null) return null;
{
return null;
}
else
{
return DateTime.Parse( row[key].ToString());
}
} }
catch (Exception ex) else
{ {
return null; return DateTime.Parse(row[index].ToString());
} }
} }
public static decimal? DataRowToNumber(this DataRow row, string key) public static decimal? DataRowToNumber(this DataRow row,int index)
{ {
try if (row[index] == null)
{ {
if (row[key] == null) return null;
{
return null;
}
else
{
return decimal.Parse( row[key].ToString());
}
} }
catch (Exception ex) else
{ {
return null; return decimal.Parse(row[index].ToString());
} }
} }
......
ResetOutofstock/Program.cs
...@@ -54,10 +54,10 @@ namespace ResetOutofstock ...@@ -54,10 +54,10 @@ namespace ResetOutofstock
//new AmazonDataSynchroService().SynchroFinancialEventGroups(); //new AmazonDataSynchroService().SynchroFinancialEventGroups();
//new AmazonDataSynchroService().SynchroReportIds(); //new AmazonDataSynchroService().SynchroReportIds();
//new AmazonDataSynchroService().SynchroReportIds(FikaAmazonAPI.Utils.Constants.ReportTypes.GET_AMAZON_FULFILLED_SHIPMENTS_DATA_GENERAL); //new AmazonDataSynchroService().SynchroReportIds(FikaAmazonAPI.Utils.Constants.ReportTypes.GET_AMAZON_FULFILLED_SHIPMENTS_DATA_GENERAL,10);
//while (true) //while (true)
//{ //{
// new AmazonDataSynchroService().AnaFbaShipmentReport(); // new AmazonDataSynchroService().AnaReport(-1);
//} //}
} }
catch (Exception ex) catch (Exception ex)
......
ResetOutofstock/ResetOutofstockBackgrounService.cs
...@@ -623,7 +623,7 @@ namespace ResetOutofstock ...@@ -623,7 +623,7 @@ namespace ResetOutofstock
try try
{ {
Console.WriteLine($"开始 拉取亚马逊费用流水，线程Id：{Thread.CurrentThread.ManagedThreadId}，{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}"); Console.WriteLine($"开始 拉取亚马逊费用流水，线程Id：{Thread.CurrentThread.ManagedThreadId}，{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
new AmazonDataSynchroService().SynchroReportIds(FikaAmazonAPI.Utils.Constants.ReportTypes.GET_V2_SETTLEMENT_REPORT_DATA_XML); new AmazonDataSynchroService().SynchroReportIds(FikaAmazonAPI.Utils.Constants.ReportTypes.GET_V2_SETTLEMENT_REPORT_DATA_XML,9);
Console.WriteLine($"结束 拉取亚马逊费用流水，线程Id：{Thread.CurrentThread.ManagedThreadId}，{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}"); Console.WriteLine($"结束 拉取亚马逊费用流水，线程Id：{Thread.CurrentThread.ManagedThreadId}，{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
Thread.Sleep(1000 * 60 * 3 ); Thread.Sleep(1000 * 60 * 3 );
} }
...@@ -645,7 +645,7 @@ namespace ResetOutofstock ...@@ -645,7 +645,7 @@ namespace ResetOutofstock
try try
{ {
Console.WriteLine($"开始 拉取亚马逊 fba发货，线程Id：{Thread.CurrentThread.ManagedThreadId}，{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}"); Console.WriteLine($"开始 拉取亚马逊 fba发货，线程Id：{Thread.CurrentThread.ManagedThreadId}，{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
new AmazonDataSynchroService().SynchroReportIds(FikaAmazonAPI.Utils.Constants.ReportTypes.GET_AMAZON_FULFILLED_SHIPMENTS_DATA_GENERAL); new AmazonDataSynchroService().SynchroReportIds(FikaAmazonAPI.Utils.Constants.ReportTypes.GET_AMAZON_FULFILLED_SHIPMENTS_DATA_GENERAL,9);
Console.WriteLine($"结束 拉取亚马逊 fba发货，线程Id：{Thread.CurrentThread.ManagedThreadId}，{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}"); Console.WriteLine($"结束 拉取亚马逊 fba发货，线程Id：{Thread.CurrentThread.ManagedThreadId}，{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
Thread.Sleep(1000 * 60 * 3 ); Thread.Sleep(1000 * 60 * 3 );
} }
......
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