Commit 7877f0aa by lizefeng

新增结算表type_cn映射

parent b1a7f188
...@@ -15,6 +15,7 @@ namespace AutoTurnOver.Models ...@@ -15,6 +15,7 @@ namespace AutoTurnOver.Models
public string currency_code { get; set; } public string currency_code { get; set; }
public string settlement_id { get; set; } public string settlement_id { get; set; }
public string type { get; set; } public string type { get; set; }
public string type_cn { get; set; }
public string sku { get; set; } public string sku { get; set; }
public string description { get; set; } public string description { get; set; }
public string quantity { get; set; } public string quantity { get; set; }
......
...@@ -277,6 +277,7 @@ namespace AutoTurnOver.Services ...@@ -277,6 +277,7 @@ namespace AutoTurnOver.Services
settlement_id = "-", settlement_id = "-",
description = $"To account ending in: {feeItem.AccountTail}", description = $"To account ending in: {feeItem.AccountTail}",
type = "Transfer", // 提现 type = "Transfer", // 提现
type_cn = "放款", // 提现
total = (decimal)feeItem.BeginningBalance.CurrencyAmount - (decimal)feeItem.OriginalTotal.CurrencyAmount, total = (decimal)feeItem.BeginningBalance.CurrencyAmount - (decimal)feeItem.OriginalTotal.CurrencyAmount,
currency_code = feeItem.OriginalTotal.CurrencyCode currency_code = feeItem.OriginalTotal.CurrencyCode
}; };
...@@ -691,6 +692,7 @@ namespace AutoTurnOver.Services ...@@ -691,6 +692,7 @@ namespace AutoTurnOver.Services
feeItem.MarketplaceNameSys = marketplaceNameSys; feeItem.MarketplaceNameSys = marketplaceNameSys;
feeItem.start_date = settlementDbData.start_date; feeItem.start_date = settlementDbData.start_date;
feeItem.end_date = settlementDbData.end_date; feeItem.end_date = settlementDbData.end_date;
feeItem.type_cn = GetTypeCn(feeItem.type);
feeItem.settlement_date_str = $"{feeItem.start_date.Value.ToString("yyyy-MM-ddTHH:mm:ss")}~{feeItem.end_date.Value.ToString("yyyy-MM-ddTHH:mm:ss")}"; feeItem.settlement_date_str = $"{feeItem.start_date.Value.ToString("yyyy-MM-ddTHH:mm:ss")}~{feeItem.end_date.Value.ToString("yyyy-MM-ddTHH:mm:ss")}";
feeItem._ts = DateTime.Now; feeItem._ts = DateTime.Now;
feeItem.id = MyMySqlConnection._connection.QueryFirstOrDefault<int?>("select id from dc_base_amazon_fee where data_id=@data_id", new { data_id = feeItem.data_id }) ?? 0; feeItem.id = MyMySqlConnection._connection.QueryFirstOrDefault<int?>("select id from dc_base_amazon_fee where data_id=@data_id", new { data_id = feeItem.data_id }) ?? 0;
...@@ -731,6 +733,47 @@ namespace AutoTurnOver.Services ...@@ -731,6 +733,47 @@ namespace AutoTurnOver.Services
MyMySqlConnection._connection.Update(ana_task); MyMySqlConnection._connection.Update(ana_task);
} }
/// <summary>
/// 中文类型映射
/// </summary>
/// <param name="type_en"></param>
/// <returns></returns>
public string GetTypeCn(string type_en)
{
switch (type_en)
{
case "REVERSAL_REIMBURSEMENT":
case "COMPENSATED_CLAWBACK":
case "FREE_REPLACEMENT_REFUND_ITEMS":
case "MISSING_FROM_INBOUND_CLAWBACK":
case "WAREHOUSE_DAMAGE":
return "Adjustment";
case "Successful charge":
return "Debt";
case "FBA Inventory Fee":
case "RemovalComplete":
return "FBA仓储费";
case "order":
return "订单";
case "Transfer":
return "放款";
case "Service Fee":
return "服务费用";
case "Deal Fee":
return "交易费用";
case "CouponRedemptionFee":
return "空--换券费";
case "Previous Reserve Amount Balance":
return "期初余额";
case "refund":
return "退款";
case "Current Reserve Amount":
return "预留金额";
case "Payable to Amazon":
return "支付给亚马逊";
default:return type_en;
}
}
public void AnaFbaShipmentReport() public void AnaFbaShipmentReport()
{ {
var reportTypeEnum = ReportTypes.GET_AMAZON_FULFILLED_SHIPMENTS_DATA_GENERAL; var reportTypeEnum = ReportTypes.GET_AMAZON_FULFILLED_SHIPMENTS_DATA_GENERAL;
......
...@@ -61,7 +61,7 @@ namespace ResetOutofstock ...@@ -61,7 +61,7 @@ namespace ResetOutofstock
//{ //{
// new AmazonDataSynchroService().AnaReport(status:-1); // new AmazonDataSynchroService().AnaReport(status:-1);
//} //}
//new AmazonDataSynchroService().AnaReport(); //new AmazonDataSynchroService().AnaReport(data_id: "17362312191");
} }
catch (Exception ex) catch (Exception ex)
{ {
......
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