Merge branch 'feature-dgy-查询商户达标明细调整' into feature-dgy-后台测试

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -5241,19 +5241,23 @@ namespace MySystem.Areas.Admin.Controllers
                 var mer = db.PosMerchantInfo.FirstOrDefault(m => m.Id == pos.BindMerchantId) ?? new PosMerchantInfo();
                 if (mer.Id > 0)
                 {
-                    if (mer.MerIdcardNo.Contains("*") || mer.MerchantMobile.Contains("*") || mer.MerRealName.Contains("*") || string.IsNullOrEmpty(mer.MerRealName))
-                    {
-                        return "机具" + PosSn + "所对应的商户未认证";
-                    }
-                    var merchantId = db.PosMerchantInfo.Where(m => m.MerIdcardNo == mer.MerIdcardNo && m.MerRealName == mer.MerRealName && m.MerchantMobile == mer.MerchantMobile).Min(m => m.Id);
+                    var info = "";
                     var IsFirst = "";//是否首台机具
-                    if (mer.Id <= merchantId)
+                    if (mer.MerIdcardNo.Contains("*") || mer.MerchantMobile.Contains("*") || mer.MerRealName.Contains("*") || string.IsNullOrEmpty(mer.MerRealName))
                     {
-                        IsFirst = "首台";
+                        info = "机具" + PosSn + "所对应的商户未认证";
                     }
                     else
                     {
-                        IsFirst = "非首台";
+                        var merchantId = db.PosMerchantInfo.Where(m => m.MerIdcardNo == mer.MerIdcardNo && m.MerRealName == mer.MerRealName && m.MerchantMobile == mer.MerchantMobile).Min(m => m.Id);
+                        if (mer.Id <= merchantId)
+                        {
+                            IsFirst = "首台";
+                        }
+                        else
+                        {
+                            IsFirst = "非首台";
+                        }
                     }
                     var depositRreturn = db.MerchantDepositReturns.Where(m => m.MerchantId == mer.Id).OrderByDescending(m => m.CreateDate).FirstOrDefault() ?? new MerchantDepositReturns();
                     var IsOk = "";//是否达标
@@ -5289,7 +5293,11 @@ namespace MySystem.Areas.Admin.Controllers
                             IsOk = "达标奖发放中";
                         }
                     }
-                    result += IsFirst + "\n";
+                    result += info + "\n";
+                    if (!string.IsNullOrEmpty(info))
+                    {
+                        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";