调整

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -4684,7 +4684,7 @@ namespace MySystem.Areas.Admin.Controllers
                 {
                     var info = "";
                     var IsFirst = "";//是否首台机具
-                    if ( function.CheckNull(mer.MerIdcardNo).Contains("*") || function.CheckNull(mer.MerchantMobile).Contains("*") || function.CheckNull(mer.MerRealName).Contains("*") || string.IsNullOrEmpty(mer.MerRealName))
+                    if (function.CheckNull(mer.MerIdcardNo).Contains("*") || function.CheckNull(mer.MerchantMobile).Contains("*") || function.CheckNull(mer.MerRealName).Contains("*") || string.IsNullOrEmpty(mer.MerRealName))
                     {
                         info = "机具" + PosSn + "所对应的商户未认证";
                     }
@@ -4734,22 +4734,27 @@ namespace MySystem.Areas.Admin.Controllers
                     result += info + "\n";
                     result += IsFirst + "\n";
                     result += IsOk + "\n";
-                    result += "开机时间：" + DateTime.Parse(pos.BindingTime.ToString()).ToString("yyyy-MM-dd HH:mm:ss") + "\n";
-                    result += "激活时间：" + DateTime.Parse(pos.ActivationTime.ToString()).ToString("yyyy-MM-dd HH:mm:ss") + "\n";
+                    var BindingTime = pos.BindingTime == null ? "" : pos.BindingTime.Value.ToString("yyyy-MM-dd HH:mm:ss");
+                    var ActivationTime = pos.ActivationTime == null ? "" : pos.BindingTime.Value.ToString("yyyy-MM-dd HH:mm:ss");
+                    result += "开机时间：" + BindingTime + "\n";
+                    result += "激活时间：" + ActivationTime + "\n";
                     result += "商户姓名：" + mer.MerRealName + "\n";
-                    result += "明细：\n";
-                    for (int i = 0; i < 12; i++)
+                    if (pos.ActivationTime != null)
                     {
-                        var time = DateTime.Parse(pos.ActivationTime.ToString()).AddMonths(i + 1).ToString("yyyyMM");//达标计算开始时间
-                        timeInfo += "," + time;
-                    }
-                    timeInfo = timeInfo + ",";
-                    var merTradeInfo = db.PosMerchantTradeSummay.Where(m => m.MerchantId == mer.Id && timeInfo.Contains("," + m.TradeMonth + ",")).ToList();
-                    string[] month = timeInfo.TrimStart(',').TrimEnd(',').Split(',');
-                    foreach (var item in month)
-                    {
-                        var tradeAmount = merTradeInfo.Where(m => m.TradeMonth == item).Sum(m => m.TradeAmount);
-                        result += item + "交易额：" + tradeAmount + "\n";
+                        result += "明细：\n";
+                        for (int i = 0; i < 12; i++)
+                        {
+                            var time = pos.ActivationTime.Value.AddMonths(i + 1).ToString("yyyyMM");//达标计算开始时间
+                            timeInfo += "," + time;
+                        }
+                        timeInfo = timeInfo + ",";
+                        var merTradeInfo = db.PosMerchantTradeSummay.Where(m => m.MerchantId == mer.Id && timeInfo.Contains("," + m.TradeMonth + ",")).ToList();
+                        string[] month = timeInfo.TrimStart(',').TrimEnd(',').Split(',');
+                        foreach (var item in month)
+                        {
+                            var tradeAmount = merTradeInfo.Where(m => m.TradeMonth == item).Sum(m => m.TradeAmount);
+                            result += item + "交易额：" + tradeAmount + "\n";
+                        }
                     }
                 }
                 else