完善速卖通广告费导入功能

Bailun.DC.Models/dc_base_company_account.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Bailun.DC.Models
+{
+    public class dc_base_company_account
+    {
+        /// <summary>
+		/// 
+        /// </summary>		
+        public int id { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>		
+        public int company_id { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>		
+        public int account_id { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>		
+        public string account_name { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>		
+        public string account_email { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>		
+        public string oms_code { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>		
+        public string oms_account { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>		
+        public int platform_id { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>		
+        public string platform_cn { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>		
+        public string platform_en { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>		
+        public int site_id { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>		
+        public string site_cn { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>		
+        public string site_en { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>		
+        public string auth_json { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>		
+        public int status { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>		
+        public string status_cn { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>		
+        public string soap_auth_token { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>		
+        public int soap_auth_status { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>		
+        public int auth_status { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>		
+        public string extension_info { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>		
+        public string developer_json { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>		
+        public string manager { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>		
+        public string seller_id { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>		
+        public string ebay_ad_auth_json { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>		
+        public DateTime bj_create { get; set; }
+
+        /// <summary>
+        /// on update CURRENT_TIMESTAMP
+        /// </summary>		
+        public DateTime bj_modified { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>		
+        public string amazon_ad_auth_json { get; set; }
+
+    }
+}

Bailun.DC.Models/dc_base_finance_aliexpress.cs

@@ -14,6 +14,9 @@ namespace Bailun.DC.Models
         /// </summary>		
         public int id { get; set; }
 
+        
+        public int company_id { get; set; }
+
         /// <summary>
         /// 帐号id
         /// </summary>		

Bailun.DC.Services/CommonServices.cs

@@ -266,6 +266,31 @@ namespace Bailun.DC.Services
             }
         }
 
+        /// <summary>
+        /// 根据账号名称获取账号信息
+        /// </summary>
+        /// <param name="accountname">账号名称</param>
+        /// <param name="companyid">公司id</param>
+        /// <returns></returns>
+        public static dc_base_company_account GetCompanyAccount(string accountname, int companyid)
+        {
+            var sql = "select * from dc_base_company_account where account_name=@account_name and company_id="+companyid;
+            var sqlparam = new DynamicParameters();
+            sqlparam.Add("account_name", accountname);
+
+            using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString))
+            {
+                if (cn.State == System.Data.ConnectionState.Closed)
+                {
+                    cn.Open();
+                }
+
+                var obj = cn.QueryFirstOrDefault<dc_base_company_account>(sql, sqlparam, null, 2 * 60);
+                return obj;
+            }
+
+        }
+
     }
 
     #region 汇率实体 ExchangeRate

Bailun.DC.Services/OrdersServices.cs

@@ -620,7 +620,7 @@ namespace Bailun.DC.Services
                     cn.Open();
                 }
 
-                var obj = cn.Page<Models.Orders.mAmazonStatistics>(parameter.pageIndex, parameter.limit, sql, ref total, sqlparam);
+                var obj = cn.Page<Models.Orders.mAmazonStatistics>(parameter.pageIndex, parameter.limit, sql, ref total, sqlparam,"",2*60);
 
                 return obj.AsList();
             }
@@ -695,7 +695,7 @@ namespace Bailun.DC.Services
                     cn.Open();
                 }
 
-                var obj = cn.QueryFirst<Models.Orders.mAmazonStatistics>(sql, sqlparam);
+                var obj = cn.QueryFirst<Models.Orders.mAmazonStatistics>(sql, sqlparam,null,2*60);
 
                 return obj;
             }

Bailun.DC.Web/Areas/Reports/Views/Orders/AliexpressAD.cshtml

@@ -76,27 +76,13 @@
         var tb;
         var BASE_URL = '@(Url.Content("~/js/webuploader-0.1.5/"))';
         $(document).ready(function () {
-
-            uploadfile('btnupload',
-                '@Url.Content("~/Reports/Orders/ImportAliExpressAD")',
-                function(result){
-                    if(result.result.success)
-                    {
-                        alert('上传成功！');
-                    }
-                    else
-                    {
-                        alert(result.result.msg);
-                    }
-            });
-
             laydate.render({ elem: '#start' });
             laydate.render({ elem: '#end' });
 
             var height = document.body.clientHeight;
             $("#roletable").attr("data-height", (height - 170));
 
-            list();
+            list(1);
 
             listAccount();
 
@@ -105,7 +91,7 @@
             //listcategory12();
         })
 
-        function list() {
+        function list(p) {
             var columns = [
                 {
                     field: 'account_name', title: '帐号', width: '200', iscount: true
@@ -140,6 +126,21 @@
                         }
 
                         companyid = d.companyid;
+
+                        if (p == 1) {
+                            uploadfile('btnupload',
+                                '@Url.Content("~/Reports/Orders/ImportAliExpressAD")',
+                                function(result){
+                                    if(result.result.success)
+                                    {
+                                        alert('上传成功！');
+                                    }
+                                    else
+                                    {
+                                        alert(result.result.msg);
+                                    }
+                            });
+                        }
                     }
                 }, {
                         fixedcol: true,
@@ -235,7 +236,7 @@
                 // swf文件路径
                 swf: BASE_URL + 'Uploader.swf',
                 // 文件接收服务端。
-                server: url!=undefined?url:'@Url.Content("~/File/UploadFile")',
+                server: url != undefined ? (url + '?companyid=' + companyid) : '@Url.Content("~/File/UploadFile")',
                 // 选择文件的按钮。可选。
                 // 内部根据当前运行是创建，可能是input元素，也可能是flash.
                 pick: '#'+id,