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

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -4962,16 +4962,52 @@ 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 IsFirst = "";//是否首台机具
+                    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 = "";//是否达标
                     var timeInfo = "";
                     if (mer.StandardMonths == 10)
                     {
                         IsOk = "已达标";
                     }
+                    else if (mer.StandardStatus == -2)
+                    {
+                        IsOk = "人工已退";
+                    }
+                    else if (mer.StandardMonths >= 0 && mer.StandardStatus == -1)
+                    {
+                        IsOk = "达标失败";
+                    }
+                    else if (mer.StandardStatus == 1 && depositRreturn.Status == 1)
+                    {
+                        IsOk = "已返还";
+                    }
+                    else if (mer.StandardStatus == 101)
+                    {
+                        IsOk = "待领取达标奖";
+                    }
+                    else if (mer.StandardStatus == 1 && depositRreturn.Status == 0)
+                    {
+                        IsOk = "达标奖发放中";
+                    }
                     else
                     {
                         IsOk = "未达标";
                     }
+                    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";