修复导出可导入重复数据的问题，修复检测是否中文的问题

Bailun.DC.Models/dc_base_paypal_account.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Bailun.DC.Models
+{
+    public class dc_base_paypal_account
+    {
+        /// <summary>
+		/// auto_increment
+        /// </summary>		
+        public int id { get; set; }
+
+        /// <summary>
+        /// 帐号/卖家名称
+        /// </summary>		
+        public string seller { get; set; }
+
+        /// <summary>
+        /// 账号密码
+        /// </summary>		
+        public string seller_password { get; set; }
+
+        /// <summary>
+        /// 账号持有人
+        /// </summary>		
+        public string seller_user { get; set; }
+
+        /// <summary>
+        /// 简称
+        /// </summary>		
+        public string abbreviation { get; set; }
+
+        /// <summary>
+        /// 手机号码
+        /// </summary>		
+        public string phone_number { get; set; }
+
+        /// <summary>
+        /// 手机号码持有人
+        /// </summary>		
+        public string phone_number_user { get; set; }
+
+        /// <summary>
+        /// 商家名称
+        /// </summary>		
+        public string merchant { get; set; }
+
+        /// <summary>
+        /// 信用卡
+        /// </summary>		
+        public string credit_card { get; set; }
+
+        /// <summary>
+        /// 信用卡持有人
+        /// </summary>		
+        public string credit_card_user { get; set; }
+
+        /// <summary>
+        /// 信用卡过期时间
+        /// </summary>		
+        public DateTime credit_card_expiration_date { get; set; }
+
+        /// <summary>
+        /// 提现银行
+        /// </summary>		
+        public string withdraw_bank { get; set; }
+
+        /// <summary>
+        /// API用户名
+        /// </summary>		
+        public string api_user_name { get; set; }
+
+        /// <summary>
+        /// API密码
+        /// </summary>		
+        public string api_password { get; set; }
+
+        /// <summary>
+        /// API签名
+        /// </summary>		
+        public string api_signature { get; set; }
+
+        /// <summary>
+        /// token json
+        /// </summary>		
+        public string auth_json { get; set; }
+
+        /// <summary>
+        /// 授权时间
+        /// </summary>		
+        public DateTime auth_time { get; set; }
+
+        /// <summary>
+        /// token失效时间
+        /// </summary>		
+        public DateTime auth_token_expire_time { get; set; }
+
+        /// <summary>
+        /// 创建人Id
+        /// </summary>		
+        public int create_user_id { get; set; }
+
+        /// <summary>
+        /// 创建人
+        /// </summary>		
+        public string create_user_name { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>		
+        public DateTime create_time { get; set; }
+
+        /// <summary>
+        /// 修改人Id
+        /// </summary>		
+        public int modify_user_id { get; set; }
+
+        /// <summary>
+        /// 修改人
+        /// </summary>		
+        public string modify_user_name { get; set; }
+
+        /// <summary>
+        /// 修改时间
+        /// </summary>		
+        public DateTime modify_time { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>		
+        public int company_id { get; set; }
+
+        /// <summary>
+        /// 接口数据id
+        /// </summary>		
+        public int paypal_id { get; set; }
+    }
+}

Bailun.DC.Services/CommonServices.cs

@@ -104,31 +104,31 @@ namespace Bailun.DC.Services
         /// </summary>
         /// <param name="companyid">公司id</param>
         /// <returns></returns>
-        public static List<string> ListPaypalAccount(int? companyid)
-        {
-            using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString))
-            {
-                if (cn.State == System.Data.ConnectionState.Closed)
-                {
-                    cn.Open();
-                }
+        //public static List<string> ListPaypalAccount0(int? companyid)
+        //{
+        //    using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString))
+        //    {
+        //        if (cn.State == System.Data.ConnectionState.Closed)
+        //        {
+        //            cn.Open();
+        //        }
 
-                var sqlparam = new DynamicParameters();
-                var sql = "select account_name from dc_base_income_ebay_paypal where 1=1 ";
+        //        var sqlparam = new DynamicParameters();
+        //        var sql = "select account_name from dc_base_income_ebay_paypal where 1=1 ";
 
-                if (companyid.HasValue && companyid.Value > 0)
-                {
-                    sql += " and company_id=" + companyid.Value;
-                }
+        //        if (companyid.HasValue && companyid.Value > 0)
+        //        {
+        //            sql += " and company_id=" + companyid.Value;
+        //        }
 
-                sql += " group by account_name";
+        //        sql += " group by account_name";
 
-                var obj = cn.Query<string>(sql, null, null, true, 2 * 60).AsList();
+        //        var obj = cn.Query<string>(sql, null, null, true, 2 * 60).AsList();
 
-                return obj;
-            }
+        //        return obj;
+        //    }
 
-        }
+        //}
 
         /// <summary>
         /// 获取平台站点列表
@@ -322,6 +322,56 @@ namespace Bailun.DC.Services
 
         }
 
+        /// <summary>
+        /// paypal帐号列表
+        /// </summary>
+        /// <param name="companyid"></param>
+        /// <returns></returns>
+        public static List<dc_base_paypal_account> ListPaypalAccount(int? companyid)
+        {
+            var sql = "select * from dc_base_paypal_account";
+
+            if (companyid.HasValue && companyid.Value > 0)
+            {
+                sql += " where company_id="+companyid.Value;
+            }
+
+            using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString))
+            {
+                if (cn.State == System.Data.ConnectionState.Closed)
+                {
+                    cn.Open();
+                }
+
+                var obj = cn.Query<dc_base_paypal_account>(sql, null, null, true, 2 * 60).AsList();
+                return obj;
+            }
+        }
+
+        /// <summary>
+        /// 获取paypal帐号信息
+        /// </summary>
+        /// <param name="account">paypal帐号</param>
+        /// <returns></returns>
+        public static dc_base_paypal_account GetPaypalAccount(string account)
+        {
+            var sql = "select * from dc_base_paypal_account where seller=@account";
+            var sqlparam = new DynamicParameters();
+            sqlparam.Add("account", account);
+
+            using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString))
+            {
+                if (cn.State == System.Data.ConnectionState.Closed)
+                {
+                    cn.Open();
+                }
+
+                var obj = cn.QueryFirstOrDefault<dc_base_paypal_account>(sql, sqlparam, null, 2 * 60);
+                return obj;
+            }
+            
+
+        }
     }
 
     #region 汇率实体 ExchangeRate

Bailun.DC.Web/Areas/Reports/Controllers/FinanceController.cs

@@ -4494,8 +4494,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
         #endregion
 
         #endregion
-
-
+        
         #region Ebay收入报告分析
 
         /// <summary>
@@ -4504,7 +4503,6 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
         /// <returns></returns>
         public ActionResult ListEbayIncome()
         {
-
             return View();
         }
 
@@ -4614,7 +4612,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
                     var list = new List<dc_base_income_ebay_paypal>();
                     var s = read.ReadLine();  //不要第一行
 
-                    if (formattype == 1 && s.Substring(0, 2) != "日期")
+                    if (formattype == 1 && s.Replace("\"","").Substring(0, 2) != "日期")
                     {
                         return Json(new
                         {
@@ -4811,7 +4809,6 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
             });
         }
         
-
         #region Private
 
         /// <summary>