Commit b97722f3 by lizefeng

fix

parent dc43ff10
...@@ -139,14 +139,18 @@ namespace AutoTurnOver.Services ...@@ -139,14 +139,18 @@ namespace AutoTurnOver.Services
var events = GetFinancialEventsByGroupId(item, feeItem.FinancialEventGroupId); var events = GetFinancialEventsByGroupId(item, feeItem.FinancialEventGroupId);
// 从订单中尝试提取站点
var currencyCodes = events.Where(s => s.AdjustmentEventList != null && s.AdjustmentEventList.Any(s => s.AdjustmentAmount!=null && !(string.IsNullOrWhiteSpace(s.AdjustmentAmount.CurrencyCode)) )).ToList(); transferFee.MarketplaceNameSys = ComputeMarketplaceNameByCurrency(transferFee.currency_code);
if(currencyCodes!=null && currencyCodes.Count >= 1) transferFee.MarketplaceName = transferFee.MarketplaceNameSys;
{
var currencyCode = currencyCodes[0].AdjustmentEventList.FirstOrDefault(s => s.AdjustmentAmount != null && (!string.IsNullOrWhiteSpace(s.AdjustmentAmount.CurrencyCode))); //// 从订单中尝试提取站点
transferFee.MarketplaceName = ComputeMarketplaceNameByCurrency(currencyCode.AdjustmentAmount.CurrencyCode); //var currencyCodes = events.Where(s => s.AdjustmentEventList != null && s.AdjustmentEventList.Any(s => s.AdjustmentAmount!=null && !(string.IsNullOrWhiteSpace(s.AdjustmentAmount.CurrencyCode)) )).ToList();
transferFee.MarketplaceNameSys = ComputeMarketplaceNameByCurrency(currencyCode.AdjustmentAmount.CurrencyCode); //if(currencyCodes!=null && currencyCodes.Count >= 1)
} //{
// var currencyCode = currencyCodes[0].AdjustmentEventList.FirstOrDefault(s => s.AdjustmentAmount != null && (!string.IsNullOrWhiteSpace(s.AdjustmentAmount.CurrencyCode)));
// transferFee.MarketplaceName = ComputeMarketplaceNameByCurrency(currencyCode.AdjustmentAmount.CurrencyCode);
// transferFee.MarketplaceNameSys = ComputeMarketplaceNameByCurrency(currencyCode.AdjustmentAmount.CurrencyCode);
//}
feeDbs.Add(transferFee); feeDbs.Add(transferFee);
......
...@@ -49,7 +49,7 @@ namespace ResetOutofstock ...@@ -49,7 +49,7 @@ namespace ResetOutofstock
//report_invest_return_dao.SynchBtmOrderRefund(); //report_invest_return_dao.SynchBtmOrderRefund();
//report_invest_return_dao.CalculationStockScore("962073701"); //report_invest_return_dao.CalculationStockScore("962073701");
//dc_ana_deviation_dao.PushAnaTask(); //dc_ana_deviation_dao.PushAnaTask();
//new AmazonDataSynchroService().SynchroFinancialEventGroups("Natural Daisy Encens", "US"); new AmazonDataSynchroService().SynchroFinancialEventGroups("Ninezkeji", "UK");
//new AmazonDataSynchroService().SetMarketplaceName(DateTime.Now); //new AmazonDataSynchroService().SetMarketplaceName(DateTime.Now);
//new AmazonDataSynchroService().SetSettlementByDate(); //new AmazonDataSynchroService().SetSettlementByDate();
//new AmazonDataSynchroService().SetMarketplaceName(DateTime.Now.AddHours(-24), 372205); //new AmazonDataSynchroService().SetMarketplaceName(DateTime.Now.AddHours(-24), 372205);
...@@ -61,7 +61,7 @@ namespace ResetOutofstock ...@@ -61,7 +61,7 @@ namespace ResetOutofstock
// btime: DateTime.Parse("2023-04-01"), DateTime.Parse("2023-04-24 23:59:59")); // btime: DateTime.Parse("2023-04-01"), DateTime.Parse("2023-04-24 23:59:59"));
//new AmazonDataSynchroService().SynchroReportIds(FikaAmazonAPI.Utils.Constants.ReportTypes.GET_V2_SETTLEMENT_REPORT_DATA_XML, 13, "Zayigus", "US"); //new AmazonDataSynchroService().SynchroReportIds(FikaAmazonAPI.Utils.Constants.ReportTypes.GET_V2_SETTLEMENT_REPORT_DATA_XML, 13, "Zayigus", "US");
//new AmazonDataSynchroService().AnaReport(1, data_id: "18360251771"); //new AmazonDataSynchroService().AnaReport(1, data_id: "18360251771");
new AmazonDataSynchroService().AnaReport(); //new AmazonDataSynchroService().AnaReport();
//new AmazonDataSynchroService().AnaFbaShipmentReport(); //new AmazonDataSynchroService().AnaFbaShipmentReport();
//new AmazonDataSynchroService().AnaFbaStorageFeeReport(status:-1); //new AmazonDataSynchroService().AnaFbaStorageFeeReport(status:-1);
//new AmazonDataSynchroService().AnaFbaLongTermStorageFeeReport(3); //new AmazonDataSynchroService().AnaFbaLongTermStorageFeeReport(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