添加状态，直营团队提现等

AppStart/RelationClassForConst.cs

@@ -154,8 +154,14 @@ namespace MySystem
                     result = "运营中心分仓奖励";
                     break;
                 case 130:
+                    result = "码牌激活奖励";
+                    break;
+                case 131:
                     result = "预发临时额度退还";
                     break;
+                case 132:
+                    result = "直营团队提现";
+                    break;
                 case 201:
                     result = "分期预扣款";
                     break;

Areas/Admin/Controllers/MainServer/PosMerchantInfoListController.cs

@@ -1103,7 +1103,8 @@ namespace MySystem.Areas.Admin.Controllers
                     if (mer.Id > 0 && !string.IsNullOrEmpty(mer.MerIdcardNo))
                     {
                         string MerchantName = Regex.Replace(mer.MerchantName, @"\d|\W|[A-Za-z]", "");
-                        var posMerchants = db.PosMerchantInfo.Where(m => m.MerIdcardNo.ToUpper().StartsWith(mer.MerIdcardNo.ToUpper().Substring(0, 6)) && m.MerIdcardNo.ToUpper().EndsWith(mer.MerIdcardNo.ToUpper().Substring(mer.MerIdcardNo.Length - 4, 4)) && m.MerchantName.Contains(MerchantName)).ToList();
+                        // var posMerchants = db.PosMerchantInfo.Where(m => m.MerIdcardNo.ToUpper().StartsWith(mer.MerIdcardNo.ToUpper().Substring(0, 6)) && m.MerIdcardNo.ToUpper().EndsWith(mer.MerIdcardNo.ToUpper().Substring(mer.MerIdcardNo.Length - 4, 4)) && m.MerchantName.Contains(MerchantName)).ToList();
+                        var posMerchants = db.PosMerchantInfo.Where(m => m.MerchantName.Contains(MerchantName)).ToList();
                         foreach (var item in posMerchants)
                         {
                             Dictionary<string, object> curData = new Dictionary<string, object>();

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -5311,7 +5311,15 @@ namespace MySystem.Areas.Admin.Controllers
                         info = "机具" + PosSn + "所对应的商户未认证";
                     }
                     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)
+                    // if (mer.Id <= merchantId)
+                    // {
+                    //     IsFirst = "首台";
+                    // }
+                    // else
+                    // {
+                    //     IsFirst = "非首台";
+                    // }
+                    if (pos.IsFirst == 1)
                     {
                         IsFirst = "首台";
                     }

Areas/Admin/Controllers/MainServer/UserCashRecordForBusinessController.cs

@@ -161,6 +161,7 @@ namespace MySystem.Areas.Admin.Controllers
                         UserId = userInfo.Id, //创客
                         ChangeType = 132, //变动类型
                         Kind = 2,
+                        Remark = data.SeoKeyword, // 备注
                         ChangeAmount = decimal.Parse(Amount), //变更金额
                         BeforeTotalAmount = BeforeTotalAmount, //变更前总金额
                         AfterTotalAmount = AfterTotalAmount, //变更后总金额

Areas/Admin/Views/MainServer/UserAccountRecord/Index.cshtml

@@ -127,6 +127,8 @@
                                 <option value="126">机具货款退还</option>
                                 <option value="127">运营中心分仓奖励</option>
                                 <option value="130">预发临时额度退还</option>
+                                <option value="131">码牌激活奖励</option>
+                                <option value="132">直营团队提现</option>
                                 <option value="201">分期预扣款</option>
                                 <option value="202">创客预扣款</option>
                             </select>