Commit ff8e5e10 by guanzhenshan

利润接口增加仓库编码,货值字段

parent 561e6555
...@@ -545,5 +545,10 @@ namespace Bailun.DC.Models.Orders ...@@ -545,5 +545,10 @@ namespace Bailun.DC.Models.Orders
/// 上架费 /// 上架费
/// </summary> /// </summary>
public decimal? putawayfee { get; set; } public decimal? putawayfee { get; set; }
/// <summary>
/// 货值
/// </summary>
public decimal? productvalue { get; set; }
} }
} }
...@@ -239,6 +239,11 @@ namespace Bailun.DC.Web.Controllers ...@@ -239,6 +239,11 @@ namespace Bailun.DC.Web.Controllers
a.bailun_account_id, a.bailun_account_id,
a.shipping_time, a.shipping_time,
a.has_delete, a.has_delete,
quantity_shipped = a.bailun_sku_quantity_shipped,
a.warehouse_code,
a.id,
a.productvalue,
}); });
return Json(new { return Json(new {
...@@ -284,7 +289,8 @@ namespace Bailun.DC.Web.Controllers ...@@ -284,7 +289,8 @@ namespace Bailun.DC.Web.Controllers
"PaypalOnFile", "PaypalOnFile",
"PrivateListing", "PrivateListing",
"SubscriptionSMBasic", "SubscriptionSMBasic",
"SubtitleFee"}; "SubtitleFee"
};
} }
else if (m.type == 2) //广告费 else if (m.type == 2) //广告费
{ {
...@@ -298,6 +304,7 @@ namespace Bailun.DC.Web.Controllers ...@@ -298,6 +304,7 @@ namespace Bailun.DC.Web.Controllers
var obj = new Services.OrdersServices().ListEbayFee(m.page, pagesize, m.start, m.end, arrtype.ToArray()); var obj = new Services.OrdersServices().ListEbayFee(m.page, pagesize, m.start, m.end, arrtype.ToArray());
var list = obj.Select(a => new { var list = obj.Select(a => new {
a.id,
a.account_entry_type, a.account_entry_type,
a.description, a.description,
bj_date = a.bj_date.Value.ToString("yyyy-MM-dd HH:mm:ss"), bj_date = a.bj_date.Value.ToString("yyyy-MM-dd HH:mm:ss"),
......
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