添加首台标记区分

Areas/Admin/Controllers/MainServer/PosMachinesTwoChangeController.cs

@@ -174,9 +174,12 @@ namespace MySystem.Areas.Admin.Controllers
                 }
 
                 //是否为第一台机具
-                int IsFirst = int.Parse(dic["FirstFlag"].ToString());
-                if (IsFirst == 0) dic["IsFirst"] = "否";
-                if (IsFirst == 1) dic["IsFirst"] = "是";
+                // int IsFirst = int.Parse(dic["FirstFlag"].ToString());
+                // if (IsFirst == 0) dic["IsFirst"] = "否";
+                // if (IsFirst == 1) dic["IsFirst"] = "是";
+
+                dic["IsFirst"] = int.Parse(dic["FirstFlag"].ToString()) == 1 ? "首台" : "非首台"; //是否首台(机具奖励发放)
+                dic["PosIsFirst"] = int.Parse(dic["FirstFlag"].ToString()) == 1 ? "首台" : "非首台"; //是否首台(服务费领取)
 
                 //循环开始时间
                 if (!string.IsNullOrEmpty(dic["RecycEndDate"].ToString()))

Areas/Admin/Controllers/MainServer/PosMachinesTwoController.cs

@@ -197,9 +197,12 @@ namespace MySystem.Areas.Admin.Controllers
                 }
 
                 //是否为第一台机具
-                int IsFirst = int.Parse(dic["FirstFlag"].ToString());
-                if (IsFirst == 0) dic["IsFirst"] = "否";
-                if (IsFirst == 1) dic["IsFirst"] = "是";
+                // int IsFirst = int.Parse(dic["FirstFlag"].ToString());
+                // if (IsFirst == 0) dic["IsFirst"] = "否";
+                // if (IsFirst == 1) dic["IsFirst"] = "是";
+
+                dic["IsFirst"] = int.Parse(dic["FirstFlag"].ToString()) == 1 ? "首台" : "非首台"; //是否首台(机具奖励发放)
+                dic["PosIsFirst"] = int.Parse(dic["FirstFlag"].ToString()) == 1 ? "首台" : "非首台"; //是否首台(服务费领取)
 
                 //实际押金
                 string SeoKeyword = dic["SeoKeyword"].ToString();

Areas/Admin/Controllers/MainServer/PosMerchantInfoListController.cs

@@ -1123,8 +1123,10 @@ namespace MySystem.Areas.Admin.Controllers
                             curData.Add("MerchantName", item.MerchantName); //商户名称
                             curData.Add("MerchantMobile", item.MerchantMobile); //商户手机号
                             curData.Add("MerIdcardNo", item.MerIdcardNo); //商户身份证号
-                            curData.Add("IsFirstName", IsFirstName); //是否首台
-                            curData.Add("IsFirst", IsFirst);
+                            curData.Add("IsFirstName", posInfo.FirstFlag == 1 ? "首台" : "非首台"); //是否首台(服务费领取)
+                            curData.Add("PosIsFirstName", posInfo.IsFirst == 1 ? "首台" : "非首台"); //是否首台(机具奖励发放)
+                            curData.Add("IsFirst", posInfo.FirstFlag);
+                            curData.Add("PosIsFirst", posInfo.IsFirst);
                             curData.Add("BindingTime", string.IsNullOrEmpty(posInfo.BindingTime.ToString()) ? "" : Convert.ToDateTime(posInfo.BindingTime).ToString("yyyy-MM-dd HH:mm:ss")); //绑定时间
                             curData.Add("ActivationTime", string.IsNullOrEmpty(posInfo.ActivationTime.ToString()) ? "" : Convert.ToDateTime(posInfo.ActivationTime).ToString("yyyy-MM-dd HH:mm:ss")); //激活时间
                             dataList.Add(curData);

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -4038,7 +4038,7 @@ namespace MySystem.Areas.Admin.Controllers
                 return "请输入选择费率";
             }
             string Fee = "0.63";
-            if(FeeType == 3)
+            if (FeeType == 3)
             {
                 Fee = "0.6";
             }
@@ -4051,11 +4051,11 @@ namespace MySystem.Areas.Admin.Controllers
                 if (posInfo.Id > 0)
                 {
                     string RecordId = "";
-                    if(RecordFlag == 1)
+                    if (RecordFlag == 1)
                     {
                         decimal ChangeFee = decimal.Parse(Fee);
                         PosMachinesFeeChangeRecord query = db.PosMachinesFeeChangeRecord.FirstOrDefault(m => m.PosId == posInfo.Id && m.ChangeFee == ChangeFee && m.Status == 0);
-                        if(query == null)
+                        if (query == null)
                         {
                             query = db.PosMachinesFeeChangeRecord.Add(new PosMachinesFeeChangeRecord()
                             {
@@ -5152,12 +5152,22 @@ namespace MySystem.Areas.Admin.Controllers
                 {
                     var info = "";
                     var IsFirst = "";//是否首台机具
+                    IsFirst += pos.IsFirst == 1 ? "首台(服务费领取)" + "\n" : "非首台(服务费领取)" + "\n";
+                    IsFirst += pos.FirstFlag == 1 ? "首台(机具奖励发放)" + "\n" : "非首台(机具奖励发放)" + "\n";
                     if (function.CheckNull(mer.MerIdcardNo).Contains("*") || function.CheckNull(mer.MerchantMobile).Contains("*") || function.CheckNull(mer.MerRealName).Contains("*") || string.IsNullOrEmpty(mer.MerRealName))
                     {
                         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.FirstFlag == 1)
                     // {
                     //     IsFirst = "首台";
                     // }
@@ -5165,14 +5175,6 @@ namespace MySystem.Areas.Admin.Controllers
                     // {
                     //     IsFirst = "非首台";
                     // }
-                    if (pos.FirstFlag == 1)
-                    {
-                        IsFirst = "首台";
-                    }
-                    else
-                    {
-                        IsFirst = "非首台";
-                    }
                     var depositRreturn = db.MerchantDepositReturns.Where(m => m.MerchantId == mer.Id).OrderByDescending(m => m.CreateDate).FirstOrDefault() ?? new MerchantDepositReturns();
                     var IsOk = "";//是否达标
                     var timeInfo = "";

wwwroot/layuiadmin/modules_main/FirstPosIndex_Admin.js

@@ -95,7 +95,8 @@ layui.config({
             , { field: 'MerchantName', width: 200, title: '商户名称', sort: true }
             , { field: 'MerchantMobile', width: 200, title: '商户手机号', sort: true }
             , { field: 'MerIdcardNo', width: 200, title: '商户身份证号', sort: true }
-            , { field: 'IsFirstName', width: 200, title: '是否首台', sort: true }
+            , { field: 'IsFirstName', width: 200, title: '是否首台(服务费领取)', sort: true }
+            , { field: 'PosIsFirstName', width: 200, title: '是否首台(机具奖励发放)', sort: true }
             , { field: 'BindingTime', width: 200, title: '绑定时间', sort: true }
             , { field: 'ActivationTime', width: 200, title: '激活时间', sort: true }
             , { title: '操作', align: 'left', toolbar: '#table-list-tools', fixed: 'right' }

wwwroot/layuiadmin/modules_main/PosMachinesTwoChange_Admin.js

@@ -145,7 +145,8 @@ layui.config({
             , { field: 'RecycStartDate', width: 200, title: '循环开始时间', sort: true }
             , { field: 'RecycEndDate', width: 200, title: '循环截止时间', sort: true }
             , { field: 'UserInfo', width: 200, title: '大盟主券标记', sort: true }
-            , { field: 'IsFirst', width: 200, title: '是否第一台机具', sort: true }
+            , { field: 'IsFirst', width: 200, title: '是否首台(服务费领取)', sort: true }
+            , { field: 'PosIsFirst', width: 200, title: '是否首台(机具奖励发放)', sort: true }
             , { field: 'SeoKeyword', width: 200, title: '押金金额', sort: true }
             , { field: 'UpFeeFlag', width: 200, title: '调升标记', sort: true }
             , { field: 'UpFeeDate', width: 200, title: '调升时间', sort: true }

wwwroot/layuiadmin/modules_main/PosMachinesTwo_Admin.js

@@ -168,7 +168,8 @@ layui.config({
             , { field: 'RecycEndDate', width: 200, title: '循环截止时间', sort: true }
             , { field: 'UserInfo', width: 200, title: '大盟主券标记', sort: true }
             , { field: 'OpCode', width: 200, title: '所属运营中心', sort: true }
-            , { field: 'IsFirst', width: 200, title: '是否第一台机具', sort: true }
+            , { field: 'IsFirst', width: 200, title: '是否首台(服务费领取)', sort: true }
+            , { field: 'PosIsFirst', width: 200, title: '是否首台(机具奖励发放)', sort: true }
             , { field: 'SeoKeyword', width: 200, title: '实际押金金额', sort: true }
             , { field: 'PrizeParams', width: 200, title: '设置押金金额', sort: true }
             , { title: '操作', width: 100, align: 'center', fixed: 'right', toolbar: '#table-list-tools' }