设置费率同步机具表相关标记

Areas/Admin/Controllers/HomeController.cs

@@ -93,7 +93,7 @@ namespace MySystem.Areas.Admin.Controllers
             statlist.Add(otherItem);
             otherItem = new Dictionary<string, object>();
             otherItem.Add("Name", "电渠卡库存");
-            otherItem.Add("Count", maindb.PosMachinesTwo.Count(m => m.BrandId == 14 && m.PosSn.StartsWith("CS") && m.BuyUserId == 0 && m.BindingState == 0 && m.ActivationState == 0));
+            otherItem.Add("Count", maindb.PosMachinesTwo.Count(m => m.BrandId == 14 && m.StoreId == 8664 && m.PosSn.StartsWith("CS") && m.BuyUserId == 0 && m.BindingState == 0 && m.ActivationState == 0));
             statlist.Add(otherItem);
             ViewBag.statlist = statlist;
             List<BsModels.RightDic> datalist = db.RightDic.Where(m => m.MainDataList == 1).OrderBy(m => m.Id).ToList();

Areas/Admin/Controllers/MainServer/PosFeeWarningRecordController.cs

@@ -105,7 +105,13 @@ namespace MySystem.Areas.Admin.Controllers
                 //状态
                 int Status = int.Parse(dic["Status"].ToString());
                 if (Status == 1) dic["Status"] = "已同步";
+                if (Status == 2) dic["Status"] = "已执行";
                 if (Status == 0) dic["Status"] = "未同步";
+
+                if(dic["CreateDate"].ToString() == dic["UpdateDate"].ToString())
+                {
+                    dic["UpdateDate"] = "";
+                }
             }
             return Json(obj);
         }

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -4404,6 +4404,25 @@ namespace MySystem.Areas.Admin.Controllers
                         query.MerNo = merchant.KqMerNo;
                         query.UserId = posInfo.UserId;
                         query.ChangeFee = ChangeFee;
+                        if(FeeType == 1)
+                        {
+                            posInfo.UpFeeFlag = 1;
+                            posInfo.DownFeeFlag = 0;
+                            posInfo.DownFeeDate = null;
+                            posInfo.DownFee = 0;
+                        }
+                        else if(FeeType == 2)
+                        {
+                            posInfo.UpFeeFlag = 1;
+                            posInfo.DownFeeFlag = 1;
+                            posInfo.DownFee = 0.63M;
+                        }
+                        else if(FeeType == 3)
+                        {
+                            posInfo.UpFeeFlag = 1;
+                            posInfo.DownFeeFlag = 1;
+                            posInfo.DownFee = 0.6M;
+                        }
                         db.SaveChanges();
                         RecordId = query.Id.ToString();
                     }