1、增加速卖通广告流水页面

2、增加获取FBA sku利润的接口
3、增加导入速卖通广告数据的功能

Bailun.DC.Models/dc_base_finance_aliexpress.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Bailun.DC.Models
+{
+    /// <summary>
+    /// 速卖通广告费
+    /// </summary>
+    public class dc_base_finance_aliexpress
+    {
+        /// <summary>
+		/// 
+        /// </summary>		
+        public int id { get; set; }
+
+        /// <summary>
+        /// 帐号id
+        /// </summary>		
+        public int account_id { get; set; }
+
+        /// <summary>
+        /// 帐号名称
+        /// </summary>		
+        public string account_name { get; set; }
+
+        /// <summary>
+        /// 商品id
+        /// </summary>		
+        public string product_id { get; set; }
+
+        /// <summary>
+        /// 商品名称
+        /// </summary>		
+        public string product_name { get; set; }
+
+        /// <summary>
+        /// 曝光量
+        /// </summary>		
+        public int exposure { get; set; }
+
+        /// <summary>
+        /// 点击量
+        /// </summary>		
+        public int clickcount { get; set; }
+
+        /// <summary>
+        /// 点击率
+        /// </summary>		
+        public decimal clickrate { get; set; }
+
+        /// <summary>
+        /// 费用
+        /// </summary>		
+        public decimal cost_fee { get; set; }
+
+        /// <summary>
+        /// 费用RMB
+        /// </summary>
+        public decimal cost_fee_rmb { get; set; }
+
+        /// <summary>
+        /// 币种
+        /// </summary>		
+        public string currency { get; set; }
+
+        /// <summary>
+        /// 其他币种转人民币的汇率
+        /// </summary>		
+        public decimal to_rmb_rate { get; set; }
+
+        /// <summary>
+        /// 其他币种转美元的汇率
+        /// </summary>		
+        public decimal to_usd_rate { get; set; }
+
+        /// <summary>
+        /// 平均点击花费
+        /// </summary>		
+        public decimal avg_click_cost { get; set; }
+
+        /// <summary>
+        /// p4p下单数
+        /// </summary>		
+        public int p4p_ordercount { get; set; }
+
+        /// <summary>
+        /// p4p下单金额
+        /// </summary>		
+        public decimal p4p_orderamount { get; set; }
+
+        /// <summary>
+        /// p4p带来的购物车数
+        /// </summary>		
+        public int p4p_shoppingcart_count { get; set; }
+
+        /// <summary>
+        /// p4p带来的收藏数
+        /// </summary>		
+        public int p4p_collect_count { get; set; }
+
+        /// <summary>
+        /// 记录日期
+        /// </summary>		
+        public DateTime recore_time { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>		
+        public DateTime createtime { get; set; }
+
+        /// <summary>
+        /// 是否已删除 1：已删除   0：未删除
+        /// </summary>		
+        public int delstatus { get; set; }
+
+    }
+}

Bailun.DC.Web/Controllers/ApiController.cs

@@ -254,6 +254,50 @@ namespace Bailun.DC.Web.Controllers
         }
 
         /// <summary>
+        /// 获取FBA sku利润数据
+        /// </summary>
+        /// <param name="page"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public JsonResult ListFBASkuProfit([FromBody]Models.Orders.mShipSkuProfitInput m)
+        {
+            var pagesize = 1000;
+            var obj = new Services.OrdersServices().ListFBASkuProfit(m.page, pagesize, m.start, m.end, m.bailun_order_id);
+
+            var list = obj.Select(a => new
+            {
+                a.platform_type,
+                a.seller_account,
+                a.website,
+                a.bailun_order_id,
+                a.origin_order_id,
+                a.transaction_id,
+                a.paid_time,
+                a.gmt_modified,
+                a.bailun_sku,
+                a.amount_sales,
+                a.profit_total,
+                a.company_id,
+                pick_order_id = a.bailun_order_id,
+                a.bailun_account_id,
+                shipping_time = a.paid_time,
+                a.has_delete,
+                quantity_shipped = a.platform_sku_quantity_shipped,
+                a.warehouse_code,
+                a.id,
+                a.productvalue,
+
+            });
+
+            return Json(new
+            {
+                success = true,
+                msg = "",
+                list = list
+            });
+        }
+
+        /// <summary>
         /// 获取ebay费用
         /// </summary>
         /// <param name="start">开始时间</param>

Bailun.DC.Web/Views/Home/Main.cshtml

@@ -304,6 +304,20 @@
                                     </ul>
                                 </li>
                                 <li>
+                                    <a href="javascript:;">
+                                        <i class="fa fa-money"></i>
+                                        <span class="nav-label">AliExpress</span>
+                                        <span class="fa arrow"></span>
+                                    </a>
+                                    <ul class="nav nav-third-level">
+                                        <li>
+                                            <a class="J_menuItem" href="@Url.Content("~/Reports/Orders/AliexpressAD")" data-index="0" style="padding-left:74px">
+                                                <span>AliExpress广告费</span>
+                                            </a>
+                                        </li>
+                                    </ul>
+                                </li>
+                                <li>
                                     <a class="J_menuItem" href="@Url.Content("~/Reports/Orders/PlatformProfitCount")" data-index="0">
                                         <i class="fa fa-money"></i>
                                         <span>平台利润统计</span>