解决时间格式问题

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

@@ -4594,6 +4594,15 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
             var indexdot = accountname.ToLower().IndexOf(".csv");
 
             accountname = accountname.Substring(0, indexdot);
+
+            if (accountname.Length == 0)
+            {
+                return Json(new {
+                    success = false,
+                    msg = "请填写正确的帐号信息"
+                });
+            }
+
             
             var read = new System.IO.StreamReader(file.OpenReadStream());
             var list = new List<dc_base_income_ebay_paypal>();
@@ -4619,12 +4628,36 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
                     var arr = s.Split(',');
                     if (arr.Length > 1)
                     {
+                        var time = DateTime.Now;
+
+                        if (isChs == 1)
+                        {
+                            time = DateTime.Parse(arr[0] + " " + arr[1]);
+                        }
+                        else
+                        {
+                            var arrDate = arr[0].Split('/');
+
+                            if (arrDate.Length == 3)
+                            {
+                                time = DateTime.Parse(arrDate[2]+"-"+arrDate[0]+"-"+arrDate[1]+" "+arr[1]);
+                            }
+                            else
+                            {
+                                return Json(new
+                                {
+                                    success = false,
+                                    msg = "第" + row_index + "行时间格式转换失败，请重试或联系管理员。",
+                                });
+                            }
+                        }
+
                         try
                         {
                             var m = new dc_base_income_ebay_paypal()
                             {
                                 company_id = companyid,
-                                record_time = DateTime.Parse(arr[0] + " " + arr[1]),
+                                record_time = time,
                                 account_name = accountname,
 
                                 time_zone = arr[2],
@@ -4850,9 +4883,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
 
             var Quantity = row["Quantity"];
             var Balance = row["Balance"];
-
-
-
+            
             var m = new dc_base_income_ebay_paypal() {
                 company_id = companyid,
                 record_time = DateTime.Parse(Date + " " + Time),