Merge branch 'feature-dgy-机具回仓重置服务费和费率' into feature-dgy-后台测试

# Conflicts:
#	Startup.cs
#	wwwroot/layuiadmin/modules_main/PreCardAmountRecord_Admin.js
#	wwwroot/layuiadmin/modules_main/StoreHouseCardAmountRecord_Admin.js
#	wwwroot/layuiadmin/modules_main/Users_Admin.js

.drone.yml

@@ -0,0 +1,82 @@
+kind: pipeline
+type: docker
+name: kxs-adminserver-test
+
+volumes: # 声明数据卷
+  - name: targetDir
+    host:
+      path: /kxs_adminserver_com
+
+clone:
+  disable: false # 启用代码拉取
+
+steps:
+  - name: build-project
+    image: mcr.microsoft.com/dotnet/core/sdk:3.0-alpine
+    pull: if-not-exists
+    depends_on: [clone] # 依赖的步骤
+    volumes: # 挂载数据卷
+      - name: targetDir
+        path: /drone/src/dist/
+    commands: # 执行命令
+      - dotnet publish -c release -o ./publish
+      - ls ./publish
+      - cp -r ./publish/* /drone/src/dist # 复制文件
+      - ls /drone/src/dist
+    when:
+      status:
+        - success # 当前步骤成功时执行
+  - name: scp-project
+    image: appleboy/drone-scp
+    pull: if-not-exists
+    depends_on: [build-project] # 依赖的步骤
+    volumes: # 挂载数据卷
+      - name: targetDir # 数据卷名称
+        path: /kxs_adminserver_com # 容器内目录 绝对路径
+    settings:
+      host:
+        from_secret: host
+      username:
+        from_secret: username
+      password:
+        from_secret: userpwd
+      port: 22
+      command_timeout: 2m
+      target: /home/ABServer/deploy-ready/
+      source:
+        - echo ====开始拷贝=======
+        - /kxs_adminserver_com/*
+        - echo ====结束拷贝=======
+      when:
+        status:
+          - success # 当前步骤成功时执行
+
+  - name: deploy-project
+    image: appleboy/drone-ssh
+    pull: if-not-exists
+    depends_on: [scp-project] # 依赖的步骤
+    settings:
+      host:
+        from_secret: host
+      username:
+        from_secret: username
+      password:
+        from_secret: userpwd
+      port: 22
+      command_timeout: 2m
+      script:
+        - echo ====开始部署=======
+        - cd /home/ABServer/
+        - cp -r /home/ABServer/deploy-ready/kxs_adminserver_com /home/ABServer/webroot/
+        # - docker stop kxs_adminserver_com && docker rm kxs_adminserver_com && docker-compose up -d kxs_adminserver_com
+        - docker restart kxs_adminserver_com
+        - echo ====部署成功=======
+
+trigger:
+  branch:
+    include:
+      - test-adminserver
+  event:
+    include:
+      - pull_request
+      - push

AppStart/Helper/SIMActCountService.cs

@@ -0,0 +1,85 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Threading;
+using MySystem.Models;
+using Library;
+using LitJson;
+
+namespace MySystem
+{
+    public class SIMActCountService
+    {
+        public readonly static SIMActCountService Instance = new SIMActCountService();
+        private SIMActCountService()
+        { }
+
+        public void Start()
+        {
+            Thread th = new Thread(doSomething);
+            th.IsBackground = true;
+            th.Start();
+        }
+
+        public void doSomething()
+        {
+            while (true)
+            {
+                string content = RedisDbconn.Instance.RPop<string>("SIMActCountQueue");
+                if (!string.IsNullOrEmpty(content))
+                {
+                    try
+                    {
+                        JsonData jsonObj = JsonMapper.ToObject(content);
+                        int UserId = int.Parse(jsonObj["UserId"].ToString());
+                        int ActCount = int.Parse(jsonObj["ActCount"].ToString());
+                        WebCMSEntities db = new WebCMSEntities();
+                        Users user = db.Users.FirstOrDefault(m => m.Id == UserId) ?? new Users();
+                        string ParentNav = user.ParentNav;
+                        UserSimActSummary selfStat = db.UserSimActSummary.FirstOrDefault(m => m.UserId == UserId && m.Kind == 0);
+                        if (selfStat == null)
+                        {
+                            selfStat = db.UserSimActSummary.Add(new UserSimActSummary()
+                            {
+                                UserId = UserId
+                            }).Entity;
+                            db.SaveChanges();
+                        }
+                        selfStat.ActCount += ActCount;
+                        ParentNav += "," + UserId + ",";
+                        if (!string.IsNullOrEmpty(ParentNav))
+                        {
+                            string[] ParentNavList = ParentNav.Trim(',').Replace(",,", ",").Split(',');
+                            foreach (string NavUserIdString in ParentNavList)
+                            {
+                                int NavUserId = int.Parse(NavUserIdString);
+                                UserSimActSummary teamStat = db.UserSimActSummary.FirstOrDefault(m => m.UserId == NavUserId && m.Kind == 1);
+                                if (teamStat == null)
+                                {
+                                    teamStat = db.UserSimActSummary.Add(new UserSimActSummary()
+                                    {
+                                        UserId = NavUserId,
+                                        Kind = 1,
+                                    }).Entity;
+                                    db.SaveChanges();
+                                }
+                                teamStat.ActCount += ActCount;
+                            }
+                        }
+                        db.SaveChanges();
+                        db.Dispose();
+                    }
+                    catch (Exception ex)
+                    {
+                        function.WriteLog(DateTime.Now.ToString() + ":" + ex.ToString(), "广电卡激活数变更异常");
+                    }
+                }
+                else
+                {
+                    Thread.Sleep(60000);
+                }
+            }
+        }
+    }
+}

AppStart/Helper/SIMPosMerchantTradeService.cs

@@ -395,31 +395,44 @@ namespace MySystem
                 SimposMerchantInfo checkSimMer = db.SimposMerchantInfo.FirstOrDefault(m => m.KqMerNo == sIMTradeInfo.Mobile && m.KqSnNo == sIMTradeInfo.SimNo);
                 if (checkSimMer != null)
                 {
-                    checkSimMer.Status = -1;
                     if (sIMTradeInfo.UserStatus.Contains("欠费") && checkSimMer.Status != -1)
                     {
                         checkSimMer.Status = -2;
                     }
+                    else
+                    {
+                        checkSimMer.Status = -1;
+                    }
                     db.SaveChanges();
                 }
                 PosMerchantInfo checkMer = db.PosMerchantInfo.FirstOrDefault(m => m.KqMerNo == sIMTradeInfo.Mobile && m.KqSnNo == sIMTradeInfo.SimNo);
                 if (checkMer != null)
                 {
-                    checkMer.Status = -1;
                     if (sIMTradeInfo.UserStatus.Contains("欠费") && checkMer.Status != -1)
                     {
                         checkMer.Status = -2;
                     }
+                    else
+                    {
+                        checkMer.Status = -1;
+                    }
                     db.SaveChanges();
                 }
                 PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == sIMTradeInfo.SimNo);
                 if (pos != null)
-                {
-                    pos.Status = -1;
+                {                    
+                    if(pos.QueryCount == 1 && pos.Status == 0)
+                    {
+                        RedisDbconn.Instance.AddList("SIMActCountQueue", "{\"UserId\":\"" + pos.BuyUserId + "\",\"ActCount\":\"1\"}");
+                    }
                     if (sIMTradeInfo.UserStatus.Contains("欠费") && pos.Status != -1)
                     {
                         pos.Status = -2;
                     }
+                    else
+                    {
+                        pos.Status = -1;
+                    }
                     db.SaveChanges();
                 }
             }

Areas/Admin/Controllers/MainServer/ActivityInfoController.cs

@@ -197,7 +197,7 @@ namespace MySystem.Areas.Admin.Controllers
         }
 
         #endregion
-        
+
         #region 详情
 
         public IActionResult Detail(string right, int Id = 0)
@@ -403,6 +403,7 @@ namespace MySystem.Areas.Admin.Controllers
                     RedisDbconn.Instance.Set("ActivityInfo:" + Id, edit);
                 }
             }
+            AddSysLog("Id：" + Id + "All：" + All, "ActivityInfo", "SetRedis");
         }
 
         #endregion

Areas/Admin/Controllers/MainServer/CouponAssignRecordsController.cs

@@ -452,6 +452,7 @@ namespace MySystem.Areas.Admin.Controllers
                 }
             }
             db.SaveChanges();
+            AddSysLog("0", "CouponAssignRecords", "AssignCoupon");
         }
 
         #endregion

Areas/Admin/Controllers/MainServer/CustomQueryController.cs

@@ -547,6 +547,7 @@ namespace MySystem.Areas.Admin.Controllers
                     new CustomRedisDbconn(ConnectStr).AddNumber(key, decimal.Parse(val));
                 }
             }
+            AddSysLog("0", "CustomQuery", "Confirm");
             return "success";
         }
 

Areas/Admin/Controllers/MainServer/CustomQueryDoController.cs

@@ -448,6 +448,7 @@ namespace MySystem.Areas.Admin.Controllers
             }
             string SendData = "{\"Operater\":\"" + sysAdmin.Id + "\",\"SqlString\":\"" + sql + "\",\"ConnectStr\":\"" + item.DatabaseConnect + "\",\"FileName\":\"" + FileName + "\",\"MaxCount\":\"0\"" + SubSqlString + "}";
             RedisDbconn.Instance.AddList("ExportQueue", SendData);
+            AddSysLog("0", "CustomQueryDo", "ExportExcel");
             return "success";
         }
 

Areas/Admin/Controllers/MainServer/CustomTagSetController.cs

@@ -320,6 +320,7 @@ namespace MySystem.Areas.Admin.Controllers
             List<CustomTagSet> sets = db.CustomTagSet.ToList();
             RedisDbconn.Instance.Clear("CustomTagSet");
             RedisDbconn.Instance.AddList("CustomTagSet", sets.ToArray());
+            AddSysLog("0", "CustomTagSet", "SyncAll");
             return "success";
         }
 

Areas/Admin/Controllers/MainServer/HelpProfitRewardController.cs

@@ -390,6 +390,7 @@ namespace MySystem.Areas.Admin.Controllers
                 RedisDbconn.Instance.AddList("SycnHelpProfitQueue2", date + "#cut#" + OpType + "#cut#" + SysUserName);
                 return "success";
             }
+            AddSysLog("0", "HelpProfitReward", "SycnData");
             return date + "分润已同步，请勿重复操作";
         }
 

Areas/Admin/Controllers/MainServer/IndexIconListController.cs

@@ -327,6 +327,7 @@ namespace MySystem.Areas.Admin.Controllers
             List<IndexIconList> query = db.IndexIconList.Where(m => m.Status > -1).OrderByDescending(m => m.Sort).ThenByDescending(m => m.Id).ToList();
             RedisDbconn.Instance.Clear("IndexIconList");
             RedisDbconn.Instance.AddList("IndexIconList", query.ToArray());
+            AddSysLog("0", "IndexIconList", "SetRedis");
         }
 
         #endregion

Areas/Admin/Controllers/MainServer/KqProductsController.cs

@@ -324,6 +324,7 @@ namespace MySystem.Areas.Admin.Controllers
             List<KqProducts> query = db.KqProducts.Where(m => m.Status > -1).OrderByDescending(m => m.Sort).ThenByDescending(m => m.Id).ToList();
             RedisDbconn.Instance.Clear("KqProductList");
             RedisDbconn.Instance.AddList("KqProductList", query.ToArray());
+            AddSysLog("0", "KqProducts", "SetRedis");
         }
 
         #endregion

Areas/Admin/Controllers/MainServer/LeaderReserveRecordController.cs

@@ -245,6 +245,7 @@ namespace MySystem.Areas.Admin.Controllers
             var FileName = "盟主储蓄金变动记录" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
             string SendData = "{\"Operater\":\"" + sysAdmin.Id + "\",\"SqlString\":\"" + Sql + "\",\"FileName\":\"" + FileName + "\",\"MaxCount\":\"0\"}";
             RedisDbconn.Instance.AddList("ExportQueue", SendData);
+            AddSysLog("0", "LeaderReserveRecord", "QuickExportExcelDo");
             return "success";
         }
         #endregion

Areas/Admin/Controllers/MainServer/LeadersController.cs

@@ -778,6 +778,7 @@ namespace MySystem.Areas.Admin.Controllers
             var FileName = "盟主记录" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
             string SendData = "{\"Operater\":\"" + sysAdmin.Id + "\",\"SqlString\":\"" + Sql + "\",\"FileName\":\"" + FileName + "\",\"MaxCount\":\"0\"}";
             RedisDbconn.Instance.AddList("ExportQueue", SendData);
+            AddSysLog("0", "Leader", "QuickExportExcelDo");
             return "success";
         }
         #endregion

Areas/Admin/Controllers/MainServer/MerchantDepositReturnsController.cs

@@ -555,6 +555,7 @@ namespace MySystem.Areas.Admin.Controllers
                 return "Warning|" + error;
             }
             db.SaveChanges();
+            AddSysLog("0", "MerchantDepositReturns", "Import");
             return "success";
         }
         #endregion
@@ -608,6 +609,7 @@ namespace MySystem.Areas.Admin.Controllers
                 return "Warning|" + error;
             }
             db.SaveChanges();
+            AddSysLog("0", "MerchantDepositReturns", "Imports");
             return "success";
         }
         #endregion
@@ -636,8 +638,9 @@ namespace MySystem.Areas.Admin.Controllers
             }
             DataTable dt = OtherMySqlConn.dtable("UPDATE MerchantDepositReturns SET `Status`=3  WHERE Id IN(" + Ids.TrimEnd(',') + ")");
             string text = string.Format("商户押金退还，记录Id: '" + Ids.TrimEnd(',') + "'，操作人: '" + SysUserName + "_" + SysRealName + "'，Time'" + DateTime.Now + "'");
-            function.WriteLog(text, "商户押金退还");
+            // function.WriteLog(text, "商户押金退还");
             RedisDbconn.Instance.AddList("ToAlipayAccountQueue", Ids.TrimEnd(','));
+            AddSysLog(text, "MerchantDepositReturns", "Imports");
             return "success";
         }
 

Areas/Admin/Controllers/MainServer/PreAmountRecordController.cs

@@ -387,7 +387,7 @@ namespace MySystem.Areas.Admin.Controllers
             var FileName = "小分仓临额提现提现记录" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
             string SendData = "{\"Operater\":\"" + sysAdmin.Id + "\",\"SqlString\":\"" + Sql + "\",\"FileName\":\"" + FileName + "\",\"MaxCount\":\"0\"}";
             RedisDbconn.Instance.AddList("ExportQueue", SendData);
-            AddSysLog(Ids, "PreAmountRecord", "ExportExcel");
+            AddSysLog(Ids, "PreAmountRecord", "QuickExportExcelDo");
             return "success";
         }
         #endregion

Areas/Admin/Controllers/MainServer/PreSendStockDetailController.cs

@@ -473,6 +473,7 @@ namespace MySystem.Areas.Admin.Controllers
             var FileName = "小分仓记录" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
             string SendData = "{\"Operater\":\"" + sysAdmin.Id + "\",\"SqlString\":\"" + Sql + "\",\"FileName\":\"" + FileName + "\",\"MaxCount\":\"0\"}";
             RedisDbconn.Instance.AddList("ExportQueue", SendData);
+            AddSysLog("0", "PreSendStockDetail", "QuickExportExcelDo");
             return "success";
         }
         #endregion

Areas/Admin/Controllers/MainServer/ProductsController.cs

@@ -461,6 +461,7 @@ namespace MySystem.Areas.Admin.Controllers
                     }
                 }
             }
+            AddSysLog("Id：" + Id + "All：" + All, "Products", "SetRedis");
         }
 
         #endregion

Areas/Admin/Controllers/MainServer/ProfitRewardRecordController.cs

@@ -102,7 +102,7 @@ namespace MySystem.Areas.Admin.Controllers
                 var checks = db.ProfitRewardRecord.Any(m => m.CreateDate <= end && m.BrandId == Convert.ToInt32(BrandId));
                 if (check)
                 {
-                    var sId = db.ProfitRewardRecord.Where(m => m.CreateDate >= start  && m.BrandId == Convert.ToInt32(BrandId)).Min(m => m.Id);
+                    var sId = db.ProfitRewardRecord.Where(m => m.CreateDate >= start && m.BrandId == Convert.ToInt32(BrandId)).Min(m => m.Id);
                     condition += "  and Id >=" + sId;
                 }
                 if (checks)
@@ -551,6 +551,7 @@ namespace MySystem.Areas.Admin.Controllers
                 RedisDbconn.Instance.AddList("SycnProfitQueue2", BrandId + "#cut#" + date + "#cut#" + OpType + "#cut#" + SysUserName);
                 return "success";
             }
+            AddSysLog("BrandId：" + BrandId + "OpType：" + OpType, "ProfitRewardRecord", "SycnData");
             return date + "分润已同步，请勿重复操作";
         }
 
@@ -571,6 +572,7 @@ namespace MySystem.Areas.Admin.Controllers
                 DoSubsidyProfitByCondi(forMakerCode.UserId, BrandId, date, OpType);
                 return "success";
             }
+            AddSysLog("BrandId：" + BrandId + "MakerCode：" + MakerCode + "OpType：" + OpType, "ProfitRewardRecord", "SycnData");
             return date + "分润已同步，请勿重复操作";
         }
 

Areas/Admin/Controllers/MainServer/ServiceCenterController.cs

@@ -368,6 +368,7 @@ namespace MySystem.Areas.Admin.Controllers
                     RedisDbconn.Instance.Set("ServiceCenter:" + Id, edit);
                 }
             }
+            AddSysLog("Id：" + Id + "CategoryId：" + CategoryId, "ServiceCenter", "SetRedis");
         }
 
         #endregion

Areas/Admin/Controllers/MainServer/StoreBalanceController.cs

@@ -479,6 +479,7 @@ namespace MySystem.Areas.Admin.Controllers
             var FileName = "仓库库存变动记录" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
             string SendData = "{\"Operater\":\"" + sysAdmin.Id + "\",\"SqlString\":\"" + Sql + "\",\"FileName\":\"" + FileName + "\",\"MaxCount\":\"0\"}";
             RedisDbconn.Instance.AddList("ExportQueue", SendData);
+            AddSysLog("0", "StoreBalance", "QuickExportExcelDo");
             return "success";
         }
         #endregion

Areas/Admin/Controllers/MainServer/StoreHouseAmountRecordController.cs

@@ -634,7 +634,7 @@ namespace MySystem.Areas.Admin.Controllers
 
             result.Add("Fields", ReturnFields);
             OtherMySqlConn.op("UPDATE StoreHouseAmountRecord SET `Status`=2 WHERE Id IN(" + Ids + ") AND `Status`=0");
-            AddSysLog("0", "StoreHouseAmountRecord", "ExportExcel");
+            AddSysLog("0", "StoreHouseAmountRecord", "ExportsExcel");
             return Json(result);
         }
 
@@ -796,7 +796,7 @@ namespace MySystem.Areas.Admin.Controllers
                     db.SaveChanges();
                 }
             }
-            AddSysLog("0", "StoreHouseCardAmountRecord", "Import");
+            AddSysLog("0", "StoreHouseCardAmountRecord", "Imports");
             return "success";
         }
         #endregion

Areas/Admin/Controllers/MainServer/StoreHouseController.cs

@@ -858,7 +858,7 @@ namespace MySystem.Areas.Admin.Controllers
                 }
             }
             RedisDbconn.Instance.Set("StoreForName:" + data.StoreName, Id);
-            AddSysLog(data.Id.ToString(), "StoreHouse", "add");
+            AddSysLog(data.Id.ToString(), "StoreHouse", "Edits");
             db.SaveChanges();
             opdb.SaveChanges();
             SetRedis(Id, user.UserId);
@@ -984,6 +984,7 @@ namespace MySystem.Areas.Admin.Controllers
         {
             string key = function.MD5_16(Guid.NewGuid().ToString());
             RedisDbconn.Instance.AddList("ExcelImport10", ExcelPath + "#cut#" + Kind + "#cut#" + key + "#cut#" + SysUserName);
+            AddSysLog(ExcelPath, "StoreHouse", "ImportPost");
             return "success|" + key;
         }
         public string CheckImport(string key)
@@ -1219,6 +1220,17 @@ namespace MySystem.Areas.Admin.Controllers
                                 opData.Add(posInfo.BuyUserId + ":" + posInfo.BrandId);
                             }
 
+                            var BeforeDeposit = 0;
+                            if (string.IsNullOrEmpty(pos.PrizeParams))
+                            {
+                                BeforeDeposit = 299;
+                                if (pos.BrandId == 6) BeforeDeposit = 249;
+                            }
+                            else
+                            {
+                                BeforeDeposit = int.Parse(pos.PrizeParams);
+                            }
+
                             posInfo.StoreId = toStore.Id;
                             posInfo.BuyUserId = 0;
                             posInfo.UserId = 0;
@@ -1249,6 +1261,41 @@ namespace MySystem.Areas.Admin.Controllers
                             fromStore.LaveNum -= 1;
                             posInfo.FirstFlag = 0;
                             posInfo.IsExecute = 0;
+
+                            //机具回仓重置服务费和费率(服务费默认为299，立刷为249 费率为0.6)
+                            Dictionary<string, object> req = new Dictionary<string, object>();
+                            var DepositId = "299";
+                            req.Add("PosSnId", pos.Id);
+                            req.Add("BrandId", pos.BrandId);
+                            if (pos.BrandId == 6) DepositId = "249";
+                            req.Add("Deposit", DepositId);
+                            //重置服务费
+                            RedisDbconn.Instance.AddList("ChangePosFeeQueue", Newtonsoft.Json.JsonConvert.SerializeObject(req));
+
+                            //添加设置押金添加记录
+                            PublicFunction.MerchantDepositSet(pos.BrandId, 0, pos.Id, pos.PosSn, BeforeDeposit, decimal.Parse(DepositId), "");
+
+                            var ChangeFee = 0.60M;
+                            var ChangeKind = 3;
+                            var OpMan = "系统";
+                            var posMachinesFeeChangeRecord = db.PosMachinesFeeChangeRecord.Add(new PosMachinesFeeChangeRecord()
+                            {
+                                CreateDate = DateTime.Now, //创建时间
+                                SeoDescription = "系统添加-过期机具回仓重置费率",
+                                Sort = pos.BrandId, //品牌Id
+                                PosId = pos.Id, //机具Id
+                                PosSn = pos.PosSn,
+                                ChangeFee = ChangeFee, //调整费率
+                            }).Entity;
+                            db.SaveChanges();
+
+                            // PosId:机具Id
+                            // Kind:1或2，1为费率0.63+3，2为费率0.63，3为费率0.6
+                            // OpMan:操作人，app传创客编号，后台传SysUserName
+                            //重置费率
+                            string infos = "{\"RecordId\":\"" + posMachinesFeeChangeRecord.Id + "\",\"PosId\":\"" + pos.Id + "\",\"Fee\": \"" + ChangeFee.ToString("f0").TrimEnd('0') + "\",\"Kind\": \"" + ChangeKind + "\",\"OpMan\": \"" + OpMan + "\"}";
+                            RedisDbconn.Instance.AddList("SetDepositQueue", infos);
+
                             PublicFunction.ClearPosHistory(db, posInfo.PosSn); //清除机具历史记录
                             db.SaveChanges();
                         }
@@ -1315,6 +1362,17 @@ namespace MySystem.Areas.Admin.Controllers
                                 opData.Add(posInfo.BuyUserId + ":" + posInfo.BrandId);
                             }
 
+                            var BeforeDeposit = 0;
+                            if (string.IsNullOrEmpty(pos.PrizeParams))
+                            {
+                                BeforeDeposit = 299;
+                                if (pos.BrandId == 6) BeforeDeposit = 249;
+                            }
+                            else
+                            {
+                                BeforeDeposit = int.Parse(pos.PrizeParams);
+                            }
+
                             posInfo.StoreId = toStore.Id;
                             posInfo.BuyUserId = 0;
                             posInfo.UserId = 0;
@@ -1343,6 +1401,41 @@ namespace MySystem.Areas.Admin.Controllers
                             toStore.TotalNum += 1;
                             posInfo.FirstFlag = 0;
                             posInfo.IsExecute = 0;
+
+                            //机具回仓重置服务费和费率(服务费默认为299，立刷为249 费率为0.6)
+                            Dictionary<string, object> req = new Dictionary<string, object>();
+                            var DepositId = "299";
+                            req.Add("PosSnId", pos.Id);
+                            req.Add("BrandId", pos.BrandId);
+                            if (pos.BrandId == 6) DepositId = "249";
+                            req.Add("Deposit", DepositId);
+                            //重置服务费
+                            RedisDbconn.Instance.AddList("ChangePosFeeQueue", Newtonsoft.Json.JsonConvert.SerializeObject(req));
+
+                            //添加设置押金添加记录
+                            PublicFunction.MerchantDepositSet(pos.BrandId, 0, pos.Id, pos.PosSn, BeforeDeposit, decimal.Parse(DepositId), "");
+
+                            var ChangeFee = 0.60M;
+                            var ChangeKind = 3;
+                            var OpMan = "系统";
+                            var posMachinesFeeChangeRecord = db.PosMachinesFeeChangeRecord.Add(new PosMachinesFeeChangeRecord()
+                            {
+                                CreateDate = DateTime.Now, //创建时间
+                                SeoDescription = "系统添加-过期机具回仓重置费率",
+                                Sort = pos.BrandId, //品牌Id
+                                PosId = pos.Id, //机具Id
+                                PosSn = pos.PosSn,
+                                ChangeFee = ChangeFee, //调整费率
+                            }).Entity;
+                            db.SaveChanges();
+
+                            // PosId:机具Id
+                            // Kind:1或2，1为费率0.63+3，2为费率0.63，3为费率0.6
+                            // OpMan:操作人，app传创客编号，后台传SysUserName
+                            //重置费率
+                            string infos = "{\"RecordId\":\"" + posMachinesFeeChangeRecord.Id + "\",\"PosId\":\"" + pos.Id + "\",\"Fee\": \"" + ChangeFee.ToString("f0").TrimEnd('0') + "\",\"Kind\": \"" + ChangeKind + "\",\"OpMan\": \"" + OpMan + "\"}";
+                            RedisDbconn.Instance.AddList("SetDepositQueue", infos);
+                            
                             PublicFunction.ClearPosHistory(db, posInfo.PosSn); //清除机具历史记录
                             db.SaveChanges();
                         }
@@ -1355,7 +1448,7 @@ namespace MySystem.Areas.Admin.Controllers
                     PublicFunction.SycnMachineCount(int.Parse(datalist[0]), int.Parse(datalist[1]));
                 }
             }
-            AddSysLog("0", "MachinesRejectStore", "Import");
+            AddSysLog("0", "MachinesRejectStore", "RejectStore");
             return "success";
         }
         #endregion
@@ -1832,6 +1925,7 @@ namespace MySystem.Areas.Admin.Controllers
             var FileName = "仓库统计管理记录" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
             string SendData = "{\"Operater\":\"" + sysAdmin.Id + "\",\"SqlString\":\"" + Sql + "\",\"FileName\":\"" + FileName + "\",\"MaxCount\":\"0\"}";
             RedisDbconn.Instance.AddList("ExportQueue", SendData);
+            AddSysLog("0", "StoreHouse", "StatQuickExportExcelDo");
             return "success";
         }
         #endregion

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -72,6 +72,7 @@ namespace MySystem.Areas.Admin.Controllers
                     }
                     db.SaveChanges();
                     function.WriteLog(DateTime.Now.ToString() + ":下级：" + MakerCode + ", 上级：" + ParentMakerCode, "换线日志");
+                    AddSysLog("MakerCode：" + MakerCode + "ParentMakerCode：" + ParentMakerCode, "SysTools", "RelationForUserDo");
                     return "success";
                 }
                 return "创客编号不存在";
@@ -108,6 +109,7 @@ namespace MySystem.Areas.Admin.Controllers
         [HttpPost]
         public string CheckMachineDo(string MakerCode, string PosSn, int AddActPrize = 0, int IsSend = 0)
         {
+            AddSysLog("MakerCode：" + MakerCode + "PosSn：" + PosSn + "AddActPrize：" + AddActPrize, "SysTools", "CheckMachineDo");
             if (string.IsNullOrEmpty(MakerCode))
             {
                 return "请输入创客编号";
@@ -345,6 +347,7 @@ namespace MySystem.Areas.Admin.Controllers
         [HttpPost]
         public string CheckMachine2Do(string MakerCode, string PosSn, string MerNo = "", int AddActPrize = 0)
         {
+            AddSysLog("MakerCode：" + MakerCode + "PosSn：" + PosSn + "AddActPrize：" + AddActPrize, "SysTools", "CheckMachine2Do");
             if (string.IsNullOrEmpty(MakerCode))
             {
                 return "请输入创客编号";
@@ -531,6 +534,7 @@ namespace MySystem.Areas.Admin.Controllers
         [HttpPost]
         public string CheckMachineForTeam1Do(string MakerCode, string PosSn, int AddActPrize = 0, int IsSend = 0)
         {
+            AddSysLog("MakerCode：" + MakerCode + "PosSn：" + PosSn + "AddActPrize：" + AddActPrize, "SysTools", "CheckMachineForTeam1Do");
             if (string.IsNullOrEmpty(MakerCode))
             {
                 return "请输入创客编号";
@@ -968,6 +972,7 @@ namespace MySystem.Areas.Admin.Controllers
         [HttpPost]
         public string SetMerAgentDo(string MakerCode, string PosSn, string MerNo, int IsSend = 0)
         {
+            AddSysLog("MakerCode：" + MakerCode + "PosSn：" + PosSn + "MerNo：" + MerNo, "SysTools", "SetMerAgentDo");
             if (string.IsNullOrEmpty(MakerCode))
             {
                 return "请输入创客编号";
@@ -1093,6 +1098,7 @@ namespace MySystem.Areas.Admin.Controllers
         [HttpPost]
         public string CancelMerAgentDo(string MakerCode, string PosSn, int IsSend = 0)
         {
+            AddSysLog("MakerCode：" + MakerCode + "PosSn：" + PosSn, "SysTools", "CancelMerAgentDo");
             if (string.IsNullOrEmpty(MakerCode))
             {
                 return "请输入创客编号";
@@ -1200,6 +1206,7 @@ namespace MySystem.Areas.Admin.Controllers
         [HttpPost]
         public string SeeSnDetailDo(string PosSn)
         {
+            AddSysLog("PosSn：" + PosSn, "SysTools", "SeeSnDetailDo");
             if (string.IsNullOrEmpty(PosSn))
             {
                 return "请输入机具SN";
@@ -1464,6 +1471,7 @@ namespace MySystem.Areas.Admin.Controllers
         [HttpPost]
         public string MakeCouponsDo(int Kind, int Number)
         {
+            AddSysLog("Kind：" + Kind + "Number：" + Number, "SysTools", "MakeCouponsDo");
             DateTime checkTime = DateTime.Parse("1900-01-01");
             string checkTimeString = RedisDbconn.Instance.Get<string>("MakerCouponsQueueCheckTime");
             if (!string.IsNullOrEmpty(checkTimeString))
@@ -1493,6 +1501,7 @@ namespace MySystem.Areas.Admin.Controllers
         [HttpPost]
         public JsonResult ExportPosDo()
         {
+            AddSysLog("0", "SysTools", "ExportPosDo");
             WebCMSEntities db = new WebCMSEntities();
             List<PosMachinesTwo> poses = db.PosMachinesTwo.Where(m => m.CreditTrade < 1000 && m.BindingState == 1).ToList();
             int total = poses.Count;
@@ -1581,6 +1590,7 @@ namespace MySystem.Areas.Admin.Controllers
         [HttpPost]
         public string ChangePosDo(string OldSn, string NewSn, string BackStoreNo, string OutStoreNo, string MerNo = "", int IsSend = 0)
         {
+            AddSysLog("0", "SysTools", "ChangePosDo");
             if (string.IsNullOrEmpty(OldSn))
             {
                 return "请输入原机具SN";
@@ -1836,6 +1846,7 @@ namespace MySystem.Areas.Admin.Controllers
         [HttpPost]
         public string ChangeBadPosDo(string ChangeType, string MakerCode, string StoreCode, string OldSn, string NewSn, string FromStoreNo, string BackStoreNo, int IsSend = 0)
         {
+            AddSysLog("0", "SysTools", "ChangeBadPosDo");
             string[] OldSnList;
             string[] NewSnList;
             decimal amount = 0;
@@ -1994,6 +2005,17 @@ namespace MySystem.Areas.Admin.Controllers
                         opData.Add(oldpos.BuyUserId + ":" + oldpos.BrandId);
                     }
 
+                    var BeforeDeposit = 0;
+                    if (string.IsNullOrEmpty(oldpos.PrizeParams))
+                    {
+                        BeforeDeposit = 299;
+                        if (oldpos.BrandId == 6) BeforeDeposit = 249;
+                    }
+                    else
+                    {
+                        BeforeDeposit = int.Parse(oldpos.PrizeParams);
+                    }
+
                     oldpos.StoreId = storeBack.Id;
                     oldpos.QueryCount = 0;
                     oldpos.UpdateDate = null;
@@ -2037,6 +2059,41 @@ namespace MySystem.Areas.Admin.Controllers
                     oldpos.Status = -1;
                     oldpos.FirstFlag = 0;
                     oldpos.IsExecute = 0;
+
+                    //机具回仓重置服务费和费率(服务费默认为299，立刷为249 费率为0.6)
+                    Dictionary<string, object> req = new Dictionary<string, object>();
+                    var DepositId = "299";
+                    req.Add("PosSnId", oldpos.Id);
+                    req.Add("BrandId", oldpos.BrandId);
+                    if (oldpos.BrandId == 6) DepositId = "249";
+                    req.Add("Deposit", DepositId);
+                    //重置服务费
+                    RedisDbconn.Instance.AddList("ChangePosFeeQueue", Newtonsoft.Json.JsonConvert.SerializeObject(req));
+
+                    //添加设置押金添加记录
+                    PublicFunction.MerchantDepositSet(oldpos.BrandId, 0, oldpos.Id, oldpos.PosSn, BeforeDeposit, decimal.Parse(DepositId), "");
+
+                    var ChangeFee = 0.60M;
+                    var ChangeKind = 3;
+                    var OpMan = "系统";
+                    var posMachinesFeeChangeRecord = db.PosMachinesFeeChangeRecord.Add(new PosMachinesFeeChangeRecord()
+                    {
+                        CreateDate = DateTime.Now, //创建时间
+                        SeoDescription = "系统添加-过期机具回仓重置费率",
+                        Sort = oldpos.BrandId, //品牌Id
+                        PosId = oldpos.Id, //机具Id
+                        PosSn = oldpos.PosSn,
+                        ChangeFee = ChangeFee, //调整费率
+                    }).Entity;
+                    db.SaveChanges();
+
+                    // PosId:机具Id
+                    // Kind:1或2，1为费率0.63+3，2为费率0.63，3为费率0.6
+                    // OpMan:操作人，app传创客编号，后台传SysUserName
+                    //重置费率
+                    string infos = "{\"RecordId\":\"" + posMachinesFeeChangeRecord.Id + "\",\"PosId\":\"" + oldpos.Id + "\",\"Fee\": \"" + ChangeFee.ToString("f0").TrimEnd('0') + "\",\"Kind\": \"" + ChangeKind + "\",\"OpMan\": \"" + OpMan + "\"}";
+                    RedisDbconn.Instance.AddList("SetDepositQueue", infos);
+
                     PublicFunction.ClearPosHistory(db, oldpos.PosSn); //清除机具历史记录
                     db.SaveChanges();
                     opdb.SaveChanges();
@@ -2230,6 +2287,17 @@ namespace MySystem.Areas.Admin.Controllers
                         }
                     }
 
+                    var BeforeDeposit = 0;
+                    if (string.IsNullOrEmpty(oldpos.PrizeParams))
+                    {
+                        BeforeDeposit = 299;
+                        if (oldpos.BrandId == 6) BeforeDeposit = 249;
+                    }
+                    else
+                    {
+                        BeforeDeposit = int.Parse(oldpos.PrizeParams);
+                    }
+
                     oldpos.StoreId = storeBack.Id;
                     oldpos.QueryCount = 0;
                     oldpos.UpdateDate = null;
@@ -2273,6 +2341,41 @@ namespace MySystem.Areas.Admin.Controllers
                     oldpos.Status = -1;
                     oldpos.FirstFlag = 0;
                     oldpos.IsExecute = 0;
+
+                    //机具回仓重置服务费和费率(服务费默认为299，立刷为249 费率为0.6)
+                    Dictionary<string, object> req = new Dictionary<string, object>();
+                    var DepositId = "299";
+                    req.Add("PosSnId", oldpos.Id);
+                    req.Add("BrandId", oldpos.BrandId);
+                    if (oldpos.BrandId == 6) DepositId = "249";
+                    req.Add("Deposit", DepositId);
+                    //重置服务费
+                    RedisDbconn.Instance.AddList("ChangePosFeeQueue", Newtonsoft.Json.JsonConvert.SerializeObject(req));
+
+                    //添加设置押金添加记录
+                    PublicFunction.MerchantDepositSet(oldpos.BrandId, 0, oldpos.Id, oldpos.PosSn, BeforeDeposit, decimal.Parse(DepositId), "");
+
+                    var ChangeFee = 0.60M;
+                    var ChangeKind = 3;
+                    var OpMan = "系统";
+                    var posMachinesFeeChangeRecord = db.PosMachinesFeeChangeRecord.Add(new PosMachinesFeeChangeRecord()
+                    {
+                        CreateDate = DateTime.Now, //创建时间
+                        SeoDescription = "系统添加-过期机具回仓重置费率",
+                        Sort = oldpos.BrandId, //品牌Id
+                        PosId = oldpos.Id, //机具Id
+                        PosSn = oldpos.PosSn,
+                        ChangeFee = ChangeFee, //调整费率
+                    }).Entity;
+                    db.SaveChanges();
+
+                    // PosId:机具Id
+                    // Kind:1或2，1为费率0.63+3，2为费率0.63，3为费率0.6
+                    // OpMan:操作人，app传创客编号，后台传SysUserName
+                    //重置费率
+                    string infos = "{\"RecordId\":\"" + posMachinesFeeChangeRecord.Id + "\",\"PosId\":\"" + oldpos.Id + "\",\"Fee\": \"" + ChangeFee.ToString("f0").TrimEnd('0') + "\",\"Kind\": \"" + ChangeKind + "\",\"OpMan\": \"" + OpMan + "\"}";
+                    RedisDbconn.Instance.AddList("SetDepositQueue", infos);
+
                     PublicFunction.ClearPosHistory(db, oldpos.PosSn); //清除机具历史记录
                     db.SaveChanges();
                     opdb.SaveChanges();
@@ -2341,6 +2444,7 @@ namespace MySystem.Areas.Admin.Controllers
         [HttpPost]
         public string ChangePosCrossBrandDo(string MakerCode, string OldSn, string BackStoreNo, string NewSn, string FromStoreNo, int IsSend = 0)
         {
+            AddSysLog("0", "SysTools", "ChangePosCrossBrandDo");
             string[] OldSnList;
             string[] NewSnList;
             decimal amount = 0;
@@ -2558,6 +2662,17 @@ namespace MySystem.Areas.Admin.Controllers
                     opData.Add(oldpos.BuyUserId + ":" + oldpos.BrandId);
                 }
 
+                var BeforeDeposit = 0;
+                if (string.IsNullOrEmpty(oldpos.PrizeParams))
+                {
+                    BeforeDeposit = 299;
+                    if (oldpos.BrandId == 6) BeforeDeposit = 249;
+                }
+                else
+                {
+                    BeforeDeposit = int.Parse(oldpos.PrizeParams);
+                }
+
                 oldpos.StoreId = storeBack.Id;
                 oldpos.QueryCount = 0;
                 oldpos.UpdateDate = null;
@@ -2601,6 +2716,40 @@ namespace MySystem.Areas.Admin.Controllers
                 oldpos.FirstFlag = 0;
                 oldpos.IsExecute = 0;
 
+                //机具回仓重置服务费和费率(服务费默认为299，立刷为249 费率为0.6)
+                Dictionary<string, object> req = new Dictionary<string, object>();
+                var DepositId = "299";
+                req.Add("PosSnId", oldpos.Id);
+                req.Add("BrandId", oldpos.BrandId);
+                if (oldpos.BrandId == 6) DepositId = "249";
+                req.Add("Deposit", DepositId);
+                //重置服务费
+                RedisDbconn.Instance.AddList("ChangePosFeeQueue", Newtonsoft.Json.JsonConvert.SerializeObject(req));
+
+                //添加设置押金添加记录
+                PublicFunction.MerchantDepositSet(oldpos.BrandId, 0, oldpos.Id, oldpos.PosSn, BeforeDeposit, decimal.Parse(DepositId), "");
+
+                var ChangeFee = 0.60M;
+                var ChangeKind = 3;
+                var OpMan = "系统";
+                var posMachinesFeeChangeRecord = db.PosMachinesFeeChangeRecord.Add(new PosMachinesFeeChangeRecord()
+                {
+                    CreateDate = DateTime.Now, //创建时间
+                    SeoDescription = "系统添加-过期机具回仓重置费率",
+                    Sort = oldpos.BrandId, //品牌Id
+                    PosId = oldpos.Id, //机具Id
+                    PosSn = oldpos.PosSn,
+                    ChangeFee = ChangeFee, //调整费率
+                }).Entity;
+                db.SaveChanges();
+
+                // PosId:机具Id
+                // Kind:1或2，1为费率0.63+3，2为费率0.63，3为费率0.6
+                // OpMan:操作人，app传创客编号，后台传SysUserName
+                //重置费率
+                string infos = "{\"RecordId\":\"" + posMachinesFeeChangeRecord.Id + "\",\"PosId\":\"" + oldpos.Id + "\",\"Fee\": \"" + ChangeFee.ToString("f0").TrimEnd('0') + "\",\"Kind\": \"" + ChangeKind + "\",\"OpMan\": \"" + OpMan + "\"}";
+                RedisDbconn.Instance.AddList("SetDepositQueue", infos);
+
                 PublicFunction.ClearPosHistory(db, oldpos.PosSn); //清除机具历史记录
                 db.SaveChanges();
                 opdb.SaveChanges();
@@ -2644,6 +2793,7 @@ namespace MySystem.Areas.Admin.Controllers
         [HttpPost]
         public string UnbindDo(string PosSn, string MakerCode, string MerNo, int IsSend = 0)
         {
+            AddSysLog("PosSn：" + PosSn + "MakerCode：" + MakerCode + "MerNo：" + MerNo, "SysTools", "UnbindDo");
             if (string.IsNullOrEmpty(PosSn))
             {
                 return "请输入机具SN";
@@ -2798,6 +2948,7 @@ namespace MySystem.Areas.Admin.Controllers
         [HttpPost]
         public string ChangeSignQuanDo(string Coupons, string MakerCode)
         {
+            AddSysLog("0", "SysTools", "ChangeSignQuanDo");
             if (string.IsNullOrEmpty(Coupons))
             {
                 return "请输入机具券码，多个券码用回车分隔";
@@ -2843,6 +2994,7 @@ namespace MySystem.Areas.Admin.Controllers
         [HttpPost]
         public string ChangeSignSnDo(string PosSn, string MakerCode)
         {
+            AddSysLog("0", "SysTools", "ChangeSignSnDo");
             if (string.IsNullOrEmpty(PosSn))
             {
                 return "请输入机具SN，多个SN用回车分隔";
@@ -2902,6 +3054,7 @@ namespace MySystem.Areas.Admin.Controllers
 
         public IActionResult LoopData(string SwapSnExpand, string SnNos, int page = 1, int limit = 30)
         {
+            AddSysLog("0", "SysTools", "LoopData");
             Dictionary<string, string> Fields = new Dictionary<string, string>();
             Fields.Add("SwapSnExpand", "1"); //申请机具SN
             Fields.Add("SnNos", "1"); //发货机具SN
@@ -3036,6 +3189,7 @@ namespace MySystem.Areas.Admin.Controllers
 
         public string SourceLoopData(string SnNo, int page = 1, int limit = 30)
         {
+            AddSysLog("0", "SysTools", "SourceLoopData");
             var result = "";
             var machineForSnNo = db.MachineForSnNo.FirstOrDefault(m => m.SnNo == SnNo) ?? new MachineForSnNo();
             var pos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == machineForSnNo.SnId) ?? new PosMachinesTwo();
@@ -3071,6 +3225,7 @@ namespace MySystem.Areas.Admin.Controllers
         [HttpPost]
         public Dictionary<string, string> Prize100Do(string MakerCode)
         {
+            AddSysLog("MakerCode：" + MakerCode, "SysTools", "Prize100Do");
             Dictionary<string, string> dic = new Dictionary<string, string>();
             string result = "";
             UserForMakerCode forMakerCode = db.UserForMakerCode.FirstOrDefault(m => m.MakerCode == MakerCode);
@@ -3148,6 +3303,7 @@ namespace MySystem.Areas.Admin.Controllers
         }
         public string AddPrize100(int Id)
         {
+            AddSysLog(Id, "SysTools", "AddPrize100");
             Orders order = db.Orders.FirstOrDefault(m => m.Id == Id);
             if (order != null)
             {
@@ -3192,6 +3348,7 @@ namespace MySystem.Areas.Admin.Controllers
         }
         public void DirectPrize(WebCMSEntities db, int OrderId, int UserId, int Count = 1)
         {
+            AddSysLog("OrderId：" + OrderId + "UserId：" + UserId, "SysTools", "DirectPrize");
             UserAccount account = db.UserAccount.FirstOrDefault(m => m.Id == UserId);
             if (account == null)
             {
@@ -3243,6 +3400,7 @@ namespace MySystem.Areas.Admin.Controllers
         [HttpPost]
         public Dictionary<string, string> OpenPrizeDo(string PosSn)
         {
+            AddSysLog("PosSn：" + PosSn, "SysTools", "OpenPrizeDo");
             Dictionary<string, string> dic = new Dictionary<string, string>();
             string result = "";
             PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == PosSn);
@@ -3302,6 +3460,7 @@ namespace MySystem.Areas.Admin.Controllers
         }
         public string AddOpenPrize(int Id)
         {
+            AddSysLog(Id, "SysTools", "AddOpenPrize");
             PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == Id && m.ActivationState == 1);
             if (pos == null)
             {
@@ -3330,7 +3489,14 @@ namespace MySystem.Areas.Admin.Controllers
             Users user = db.Users.FirstOrDefault(m => m.Id == pos.BuyUserId);
             if (user != null)
             {
-                RedisDbconn.Instance.AddList("OpenRewardQueue", Id.ToString());
+                if (pos.IsFirst == 1 && pos.ActivationState == 1 && pos.BindingTime.Value.AddDays(30) <= DateTime.Now && pos.BindingTime.Value.AddDays(60) > DateTime.Now && pos.CreditTrade >= 10000 && pos.CardType < 100)
+                {
+                    RedisDbconn.Instance.AddList("LeaderRewardQueue", pos.Id.ToString());
+                }
+                else
+                {
+                    return "操作失败" + pos.PosSn + ',' + "不满足发放条件首台绑定30天到60天交易超过10000元内非营训机" + '\n';
+                }
                 return "操作成功，请稍后查询";
             }
             db.Dispose();
@@ -3352,6 +3518,7 @@ namespace MySystem.Areas.Admin.Controllers
         [HttpPost]
         public Dictionary<string, string> FluxPrizeDo(string PosSn)
         {
+            AddSysLog("PosSn：" + PosSn, "SysTools", "FluxPrizeDo");
             Dictionary<string, string> dic = new Dictionary<string, string>();
             string result = "";
             PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == PosSn);
@@ -3406,6 +3573,7 @@ namespace MySystem.Areas.Admin.Controllers
         }
         public string AddFluxPrize(int Id)
         {
+            AddSysLog(Id, "SysTools", "AddFluxPrize");
             PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == Id && m.ActivationState == 1);
             if (pos == null)
             {
@@ -3597,6 +3765,7 @@ namespace MySystem.Areas.Admin.Controllers
         [HttpPost]
         public string LisFeeDo(string PosSns, decimal Fee, string Kind, string Fix)
         {
+            AddSysLog("PosSns：" + PosSns, "SysTools", "LisFeeDo");
             if (string.IsNullOrEmpty(PosSns))
             {
                 return "请输入机具号";
@@ -3649,6 +3818,7 @@ namespace MySystem.Areas.Admin.Controllers
         // 设置费率
         public string SetLiSFee(string sn, decimal serviceFee)
         {
+            AddSysLog("PosSn：" + sn + "serviceFee：" + serviceFee, "SysTools", "SetLiSFee");
             Dictionary<string, object> dic = new Dictionary<string, object>();
             dic.Add("agentId", LiSAgentId);
             dic.Add("deviceSn", sn);
@@ -3671,6 +3841,7 @@ namespace MySystem.Areas.Admin.Controllers
         // 设置押金
         public string SetLiSDeposit(string sn, int serviceFee)
         {
+            AddSysLog("PosSn：" + sn + "serviceFee：" + serviceFee, "SysTools", "SetLiSDeposit");
             serviceFee = serviceFee * 100;
             Dictionary<string, object> dic = new Dictionary<string, object>();
             dic.Add("agentId", LiSAgentId);
@@ -3772,6 +3943,7 @@ namespace MySystem.Areas.Admin.Controllers
         [HttpPost]
         public string CheckThreeElementsDo(string bankcard, string idcard, string name)
         {
+            AddSysLog("bankcard：" + bankcard + "idcard：" + idcard + "name：" + name, "SysTools", "CheckThreeElementsDo");
             var host = "https://bankcard3c.shumaidata.com";
             var path = "/bankcard3c";
             var method = "GET";
@@ -3855,6 +4027,7 @@ namespace MySystem.Areas.Admin.Controllers
         [HttpPost]
         public string CheckFourElementsDo(string bankcard, string idcard, string mobile, string name)
         {
+            AddSysLog("bankcard：" + bankcard + "idcard：" + idcard + "name：" + name + "mobile：" + mobile, "SysTools", "CheckFourElementsDo");
             var host = "https://bankcard4c.shumaidata.com";
             var path = "/bankcard4c";
             var method = "GET";
@@ -3950,6 +4123,7 @@ namespace MySystem.Areas.Admin.Controllers
         public string SyncMerchantStatusDo(string PosSn)
         {
 
+            AddSysLog("PosSn：" + PosSn, "SysTools", "SyncMerchantStatusDo");
             if (string.IsNullOrEmpty(PosSn))
             {
                 return "请输入机具号";
@@ -3994,6 +4168,7 @@ namespace MySystem.Areas.Admin.Controllers
         [HttpPost]
         public string PosRewardReissuedDo(string PosSn)
         {
+            AddSysLog("PosSn：" + PosSn, "SysTools", "PosRewardReissuedDo");
             if (string.IsNullOrEmpty(PosSn))
             {
                 return "请输入机具SN";
@@ -4014,7 +4189,14 @@ namespace MySystem.Areas.Admin.Controllers
                 {
                     if (posInfo.Id > 0)
                     {
-                        RedisDbconn.Instance.AddList("OpenRewardQueue", posInfo.Id.ToString());
+                        if (posInfo.IsFirst == 1 && posInfo.ActivationState == 1 && posInfo.BindingTime.Value.AddDays(30) <= DateTime.Now && posInfo.BindingTime.Value.AddDays(60) > DateTime.Now && posInfo.CreditTrade >= 10000 && posInfo.CardType < 100)
+                        {
+                            RedisDbconn.Instance.AddList("LeaderRewardQueue", posInfo.Id.ToString());
+                        }
+                        else
+                        {
+                            return "操作失败" + posInfo.PosSn + ',' + "不满足发放条件首台绑定30天到60天交易超过10000元内非营训机" + '\n';
+                        }
                     }
 
                 }
@@ -4044,6 +4226,7 @@ namespace MySystem.Areas.Admin.Controllers
         [HttpPost]
         public string SetPosFeeDo(string PosSn, int FeeType, int RecordFlag = 0)
         {
+            AddSysLog("PosSn：" + PosSn + "FeeType：" + FeeType + "RecordFlag：" + RecordFlag, "SysTools", "SetPosFeeDo");
             if (string.IsNullOrEmpty(PosSn))
             {
                 return "请输入机具SN";
@@ -4117,6 +4300,7 @@ namespace MySystem.Areas.Admin.Controllers
         [HttpPost]
         public string RelationPosAndMerchantDo(string PosSn, string MerchantNo, string MerchantName)
         {
+            AddSysLog("PosSn：" + PosSn + "MerchantNo：" + MerchantNo + "MerchantName：" + MerchantName, "SysTools", "RelationPosAndMerchantDo");
             if (string.IsNullOrEmpty(PosSn))
             {
                 return "请输入机具SN";
@@ -4166,6 +4350,7 @@ namespace MySystem.Areas.Admin.Controllers
         [HttpPost]
         public string SetMerchantInfoDo(string PosSn, string MerchantNo, string MerchantName, string MerIdcardNo, string MerchantMobile)
         {
+            AddSysLog("PosSn：" + PosSn + "MerchantNo：" + MerchantNo + "MerchantName：" + MerchantName + "MerIdcardNo：" + MerIdcardNo + "MerchantMobile：" + MerchantMobile, "SysTools", "SetMerchantInfoDo");
             if (string.IsNullOrEmpty(PosSn))
             {
                 return "请输入机具SN";
@@ -4222,6 +4407,7 @@ namespace MySystem.Areas.Admin.Controllers
         [HttpPost]
         public string AuthMakerDo(string MakerCode, string RealName, string CertId, string BackCard, string BackName)
         {
+            AddSysLog("MakerCode：" + MakerCode + "RealName：" + RealName + "CertId：" + CertId + "BackName：" + BackName, "SysTools", "AuthMakerDo");
             if (string.IsNullOrEmpty(MakerCode))
             {
                 return "请输入创客编号";
@@ -4348,6 +4534,7 @@ namespace MySystem.Areas.Admin.Controllers
 
         public string TransferPosDo(string PosSn, string FromMakerCode, string ToMakerCode)
         {
+            AddSysLog("PosSn：" + PosSn + "FromMakerCode：" + FromMakerCode + "ToMakerCode：" + ToMakerCode, "SysTools", "TransferPosDo");
             if (string.IsNullOrEmpty(PosSn))
             {
                 return "请输入机具SN";
@@ -4480,6 +4667,7 @@ namespace MySystem.Areas.Admin.Controllers
         [HttpPost]
         public string RestoreStatusDo(string OrderNo)
         {
+            AddSysLog("OrderNo：" + OrderNo, "SysTools", "RestoreStatusDo");
             if (string.IsNullOrEmpty(OrderNo))
             {
                 return "请输入提现订单编号";
@@ -4521,6 +4709,7 @@ namespace MySystem.Areas.Admin.Controllers
         [HttpPost]
         public string SeeUserLoopDo(string MakerCode)
         {
+            AddSysLog("MakerCode：" + MakerCode, "SysTools", "SeeUserLoopDo");
             var userForMakerCode = db.UserForMakerCode.FirstOrDefault(m => m.MakerCode == MakerCode) ?? new UserForMakerCode();
             var user = db.Users.FirstOrDefault(m => m.Id == userForMakerCode.UserId) ?? new Users();
             var pos = db.PosMachinesTwo.Where(m => m.Status > -1 && m.BuyUserId == user.Id).ToList();
@@ -4558,6 +4747,7 @@ namespace MySystem.Areas.Admin.Controllers
 
         public string CashWithoutUserDo(string Content)
         {
+            AddSysLog("Content：" + Content, "SysTools", "CashWithoutUserDo");
             CustomTagSet set = db.CustomTagSet.FirstOrDefault(m => m.Tags == "CashWithoutUser");
             if (set == null)
             {
@@ -4589,6 +4779,7 @@ namespace MySystem.Areas.Admin.Controllers
         [HttpPost]
         public string BadPosToStoreDo(string OldSn)
         {
+            AddSysLog("OldSn：" + OldSn, "SysTools", "BadPosToStoreDo");
             string[] OldSnList;
             OldSnList = OldSn.Replace("\r", "").Split('\n');
             string error = "";
@@ -4602,6 +4793,18 @@ namespace MySystem.Areas.Admin.Controllers
                 {
                     opData.Add(oldpos.BuyUserId + ":" + oldpos.BrandId);
                 }
+
+                var BeforeDeposit = 0;
+                if (string.IsNullOrEmpty(oldpos.PrizeParams))
+                {
+                    BeforeDeposit = 299;
+                    if (oldpos.BrandId == 6) BeforeDeposit = 249;
+                }
+                else
+                {
+                    BeforeDeposit = int.Parse(oldpos.PrizeParams);
+                }
+
                 oldpos.Status = 1;
                 oldpos.PosSnType = 0;
                 oldpos.QueryCount = 0;
@@ -4645,6 +4848,41 @@ namespace MySystem.Areas.Admin.Controllers
                 oldpos.UserId = 0;
                 oldpos.FirstFlag = 0;
                 oldpos.IsExecute = 0;
+
+                //机具回仓重置服务费和费率(服务费默认为299，立刷为249 费率为0.6)
+                Dictionary<string, object> req = new Dictionary<string, object>();
+                var DepositId = "299";
+                req.Add("PosSnId", oldpos.Id);
+                req.Add("BrandId", oldpos.BrandId);
+                if (oldpos.BrandId == 6) DepositId = "249";
+                req.Add("Deposit", DepositId);
+                //重置服务费
+                RedisDbconn.Instance.AddList("ChangePosFeeQueue", Newtonsoft.Json.JsonConvert.SerializeObject(req));
+
+                //添加设置押金添加记录
+                PublicFunction.MerchantDepositSet(oldpos.BrandId, 0, oldpos.Id, oldpos.PosSn, BeforeDeposit, decimal.Parse(DepositId), "");
+
+                var ChangeFee = 0.60M;
+                var ChangeKind = 3;
+                var OpMan = "系统";
+                var posMachinesFeeChangeRecord = db.PosMachinesFeeChangeRecord.Add(new PosMachinesFeeChangeRecord()
+                {
+                    CreateDate = DateTime.Now, //创建时间
+                    SeoDescription = "系统添加-过期机具回仓重置费率",
+                    Sort = oldpos.BrandId, //品牌Id
+                    PosId = oldpos.Id, //机具Id
+                    PosSn = oldpos.PosSn,
+                    ChangeFee = ChangeFee, //调整费率
+                }).Entity;
+                db.SaveChanges();
+
+                // PosId:机具Id
+                // Kind:1或2，1为费率0.63+3，2为费率0.63，3为费率0.6
+                // OpMan:操作人，app传创客编号，后台传SysUserName
+                //重置费率
+                string infos = "{\"RecordId\":\"" + posMachinesFeeChangeRecord.Id + "\",\"PosId\":\"" + oldpos.Id + "\",\"Fee\": \"" + ChangeFee.ToString("f0").TrimEnd('0') + "\",\"Kind\": \"" + ChangeKind + "\",\"OpMan\": \"" + OpMan + "\"}";
+                RedisDbconn.Instance.AddList("SetDepositQueue", infos);
+
                 PublicFunction.ClearPosHistory(db, oldpos.PosSn); //清除机具历史记录
             }
             if (!string.IsNullOrEmpty(error))
@@ -4673,6 +4911,7 @@ namespace MySystem.Areas.Admin.Controllers
 
         public string TransferPosCouponDo(string Kind, string PosCouponCodes, string FromMakerCode, string ToMakerCode, string LeaderMakerCode = "")
         {
+            AddSysLog("Kind：" + Kind + "PosCouponCodes：" + PosCouponCodes + "FromMakerCode：" + FromMakerCode + "ToMakerCode：" + ToMakerCode + "LeaderMakerCode：" + LeaderMakerCode, "SysTools", "TransferPosCouponDo");
             if (string.IsNullOrEmpty(Kind))
             {
                 return "请选择划拨的券类型";
@@ -4806,6 +5045,7 @@ namespace MySystem.Areas.Admin.Controllers
         [HttpPost]
         public string RefundPosFeeDo(string PosSn, string BackStoreNo, int IsBack = 0)
         {
+            AddSysLog("PosSn：" + PosSn + "BackStoreNo：" + BackStoreNo + "IsBack：" + IsBack, "SysTools", "RefundPosFeeDo");
             if (string.IsNullOrEmpty(PosSn))
             {
                 return "请输入机具SN";
@@ -4971,6 +5211,17 @@ namespace MySystem.Areas.Admin.Controllers
                         opData.Add(pos.BuyUserId + ":" + pos.BrandId);
                     }
 
+                    var BeforeDeposit = 0;
+                    if (string.IsNullOrEmpty(pos.PrizeParams))
+                    {
+                        BeforeDeposit = 299;
+                        if (pos.BrandId == 6) BeforeDeposit = 249;
+                    }
+                    else
+                    {
+                        BeforeDeposit = int.Parse(pos.PrizeParams);
+                    }
+
                     pos.StoreId = BackStore.Id;//变更机具所属仓库，重置为仓库机
                     pos.Status = 1;
                     pos.QueryCount = 0;
@@ -5014,6 +5265,41 @@ namespace MySystem.Areas.Admin.Controllers
                     pos.UserId = 0;
                     pos.FirstFlag = 0;
                     pos.IsExecute = 0;
+
+                    //机具回仓重置服务费和费率(服务费默认为299，立刷为249 费率为0.6)
+                    Dictionary<string, object> req = new Dictionary<string, object>();
+                    var DepositId = "299";
+                    req.Add("PosSnId", pos.Id);
+                    req.Add("BrandId", pos.BrandId);
+                    if (pos.BrandId == 6) DepositId = "249";
+                    req.Add("Deposit", DepositId);
+                    //重置服务费
+                    RedisDbconn.Instance.AddList("ChangePosFeeQueue", Newtonsoft.Json.JsonConvert.SerializeObject(req));
+
+                    //添加设置押金添加记录
+                    PublicFunction.MerchantDepositSet(pos.BrandId, 0, pos.Id, pos.PosSn, BeforeDeposit, decimal.Parse(DepositId), "");
+
+                    var ChangeFee = 0.60M;
+                    var ChangeKind = 3;
+                    var OpMan = "系统";
+                    var posMachinesFeeChangeRecord = db.PosMachinesFeeChangeRecord.Add(new PosMachinesFeeChangeRecord()
+                    {
+                        CreateDate = DateTime.Now, //创建时间
+                        SeoDescription = "系统添加-过期机具回仓重置费率",
+                        Sort = pos.BrandId, //品牌Id
+                        PosId = pos.Id, //机具Id
+                        PosSn = pos.PosSn,
+                        ChangeFee = ChangeFee, //调整费率
+                    }).Entity;
+                    db.SaveChanges();
+
+                    // PosId:机具Id
+                    // Kind:1或2，1为费率0.63+3，2为费率0.63，3为费率0.6
+                    // OpMan:操作人，app传创客编号，后台传SysUserName
+                    //重置费率
+                    string infos = "{\"RecordId\":\"" + posMachinesFeeChangeRecord.Id + "\",\"PosId\":\"" + pos.Id + "\",\"Fee\": \"" + ChangeFee.ToString("f0").TrimEnd('0') + "\",\"Kind\": \"" + ChangeKind + "\",\"OpMan\": \"" + OpMan + "\"}";
+                    RedisDbconn.Instance.AddList("SetDepositQueue", infos);
+
                     PublicFunction.ClearPosHistory(db, pos.PosSn); //清除机具历史记录
                 }
                 else
@@ -5077,6 +5363,7 @@ namespace MySystem.Areas.Admin.Controllers
         [HttpPost]
         public string AddMerchantnfoDo(string PosSn, string MerSn)
         {
+            AddSysLog("PosSn+：" + PosSn + "MerSn：" + MerSn, "SysTools", "AddMerchantnfoDo");
             if (string.IsNullOrEmpty(PosSn))
             {
                 return "请输入机具号";
@@ -5154,6 +5441,7 @@ namespace MySystem.Areas.Admin.Controllers
         [HttpPost]
         public string SeeMerchantTradeDetailDo(string PosSn)
         {
+            AddSysLog("PosSn：" + PosSn, "SysTools", "SeeMerchantTradeDetailDo");
             if (string.IsNullOrEmpty(PosSn))
             {
                 return "请输入机具SN";
@@ -5411,6 +5699,7 @@ namespace MySystem.Areas.Admin.Controllers
         [HttpPost]
         public string RestoreUserInfoDo(string MakerCode)
         {
+            AddSysLog("MakerCode：" + MakerCode, "SysTools", "RestoreUserInfoDo");
             var user = db.Users.FirstOrDefault(m => m.Status == -1 && m.MakerCode == MakerCode) ?? new Users();
             if (user.Id == 0)
             {
@@ -5460,6 +5749,7 @@ namespace MySystem.Areas.Admin.Controllers
         [HttpPost]
         public string QrCodeEncryptionDo(string SnNos)
         {
+            AddSysLog("0", "SysTools", "QrCodeEncryptionDo");
             string[] SnNo = SnNos.Replace("\r", "").Replace("\n", ",").Split(',');
             string code = "";
             string sn = "";
@@ -5486,6 +5776,7 @@ namespace MySystem.Areas.Admin.Controllers
         [HttpPost]
         public string QrCodeDescryptionDo(string SnNos)
         {
+            AddSysLog("0", "SysTools", "QrCodeDescryptionDo");
             string[] SnNo = SnNos.Replace("\r", "").Replace("\n", ",").Split(',');
             string code = "";
             string sn = "";
@@ -5520,6 +5811,7 @@ namespace MySystem.Areas.Admin.Controllers
         }
         public string SeeUserLevel4InfoDo(string MakerCode, string MakerCodes)
         {
+            AddSysLog("0", "SysTools", "SeeUserLevel4InfoDo");
             var user = db.Users.FirstOrDefault(m => m.MakerCode == MakerCode) ?? new Users();
             string[] SnNo = MakerCodes.Replace("\r", "").Replace("\n", ",").Split(',');
             string code = "";
@@ -5552,6 +5844,7 @@ namespace MySystem.Areas.Admin.Controllers
         #region 直营团队数据
         public JsonResult Team1InfoDo(string MakerCode, string BindingTime, string ActivationTime, string PosFeeSelect, string BrandId, int page = 1, int limit = 30)
         {
+            AddSysLog("0", "SysTools", "Team1InfoDo");
             string conn = Library.ConfigurationManager.AppSettings["SqlConnStr"].ToString();
             List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
             string condition = " where 1=1";
@@ -5690,6 +5983,7 @@ namespace MySystem.Areas.Admin.Controllers
             var FileName = MakerCode + RealName + "直营团队数据记录" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
             string SendData = "{\"Operater\":\"" + sysAdmin.Id + "\",\"SqlString\":\"" + Sql + "\",\"FileName\":\"" + FileName + "\",\"MaxCount\":\"0\"}";
             RedisDbconn.Instance.AddList("ExportQueue", SendData);
+            AddSysLog("0", "SysTools", "ExportTeam1InfoExcelDo");
             return "success";
         }
         #endregion
@@ -5708,6 +6002,7 @@ namespace MySystem.Areas.Admin.Controllers
         [HttpPost]
         public string ChangePosFeeDo(string PosSn, string BrandId, string Deposit)
         {
+            AddSysLog("0", "SysTools", "ChangePosFeeDo");
             if (string.IsNullOrEmpty(PosSn))
             {
                 return "请输入机具SN";

Areas/Admin/Controllers/MainServer/ToChargeBackRecordController.cs

@@ -641,7 +641,7 @@ namespace MySystem.Areas.Admin.Controllers
                 function.WriteLog(text, "机具回收确认退还");//机具回收确认退还
             }
             db.SaveChanges();
-            AddSysLog("0", "ToChargeBackRecord", "Import");
+            AddSysLog("0", "ToChargeBackRecord", "Imports");
             return "success";
         }
         #endregion
@@ -811,6 +811,7 @@ namespace MySystem.Areas.Admin.Controllers
             var FileName = "创客预扣款记录" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
             string SendData = "{\"Operater\":\"" + sysAdmin.Id + "\",\"SqlString\":\"" + Sql + "\",\"FileName\":\"" + FileName + "\",\"MaxCount\":\"0\"}";
             RedisDbconn.Instance.AddList("ExportQueue", SendData);
+            AddSysLog("0", "ToChargeBackRecord", "QuickExportExcelDo");
             return "success";
         }
         #endregion

Areas/Admin/Controllers/MainServer/TradeRecordController.cs

@@ -602,31 +602,44 @@ namespace MySystem.Areas.Admin.Controllers
                     SimposMerchantInfo checkSimMer = db.SimposMerchantInfo.FirstOrDefault(m => m.KqMerNo == Mobile && m.KqSnNo == SimNo);
                     if (checkSimMer != null)
                     {
-                        checkSimMer.Status = -1;
                         if (UserStatus.Contains("欠费") && checkSimMer.Status != -1)
                         {
                             checkSimMer.Status = -2;
                         }
+                        else
+                        {
+                            checkSimMer.Status = -1;
+                        }
                         db.SaveChanges();
                     }
                     PosMerchantInfo checkMer = db.PosMerchantInfo.FirstOrDefault(m => m.KqMerNo == Mobile && m.KqSnNo == SimNo);
                     if (checkMer != null)
                     {
-                        checkMer.Status = -1;
                         if (UserStatus.Contains("欠费") && checkMer.Status != -1)
                         {
                             checkMer.Status = -2;
                         }
+                        else
+                        {
+                            checkMer.Status = -1;
+                        }
                         db.SaveChanges();
                     }
                     PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == SimNo);
                     if (pos != null)
                     {
-                        pos.Status = -1;
+                        if (pos.QueryCount == 1 && pos.Status == 0)
+                        {
+                            RedisDbconn.Instance.AddList("SIMActCountQueue", "{\"UserId\":\"" + pos.BuyUserId + "\",\"ActCount\":\"1\"}");
+                        }
                         if (UserStatus.Contains("欠费") && pos.Status != -1)
                         {
                             pos.Status = -2;
                         }
+                        else
+                        {
+                            pos.Status = -1;
+                        }
                         db.SaveChanges();
                     }
                 }
@@ -686,7 +699,7 @@ namespace MySystem.Areas.Admin.Controllers
                     DoCount += 1;
                 }
             }
-            AddSysLog("0", "TradeRecord", "Import");
+            AddSysLog("0", "TradeRecord", "ImportTradePost");
             return "success|" + DoCount;
         }
         #endregion
@@ -700,6 +713,7 @@ namespace MySystem.Areas.Admin.Controllers
         [HttpPost]
         public string ImportByQueuePost(string ExcelPath, int Kind = 0)
         {
+            AddSysLog("ExcelPath：" + ExcelPath + "Kind：" + Kind, "TradeRecord", "ImportByQueuePost");
             string key = function.MD5_16(Guid.NewGuid().ToString());
             RedisDbconn.Instance.AddList("SIMPosMerchantTradeQueue", ExcelPath + "#cut#" + Kind + "#cut#" + key + "#cut#" + SysUserName);
             return "success|" + key;

Areas/Admin/Controllers/MainServer/UserAccountRecordController.cs

@@ -797,6 +797,7 @@ namespace MySystem.Areas.Admin.Controllers
             var FileName = "创客账户变动记录" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
             string SendData = "{\"Operater\":\"" + sysAdmin.Id + "\",\"SqlString\":\"" + Sql + "\",\"FileName\":\"" + FileName + "\",\"MaxCount\":\"0\"}";
             RedisDbconn.Instance.AddList("ExportQueue", SendData);
+            AddSysLog("0", "UserAccountRecord", "QuickExportExcelDo");
             return "success";
         }
         #endregion

Areas/Admin/Controllers/MainServer/UserCashRecordController.cs

@@ -474,6 +474,7 @@ namespace MySystem.Areas.Admin.Controllers
         [HttpPost]
         public string ImportPost(string ExcelPath)
         {
+            AddSysLog("0", "UserCashRecord", "ImportPost");
             string key = function.MD5_16(Guid.NewGuid().ToString());
             RedisDbconn.Instance.AddList("ExcelImport10", ExcelPath + "#cut#UserCashRecord#cut#" + key + "#cut#" + SysUserName);
             return "success|" + key;
@@ -740,6 +741,7 @@ namespace MySystem.Areas.Admin.Controllers
             var FileName = "创客提现记录" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
             string SendData = "{\"Operater\":\"" + sysAdmin.Id + "\",\"SqlString\":\"" + Sql + "\",\"FileName\":\"" + FileName + "\",\"MaxCount\":\"0\"}";
             RedisDbconn.Instance.AddList("ExportQueue", SendData);
+            AddSysLog("0", "UserAccountRecord", "UserQuickExportExcelDo");
             return "success";
         }
         #endregion
@@ -1125,6 +1127,7 @@ namespace MySystem.Areas.Admin.Controllers
             var FileName = "盟主提现记录" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
             string SendData = "{\"Operater\":\"" + sysAdmin.Id + "\",\"SqlString\":\"" + Sql + "\",\"FileName\":\"" + FileName + "\",\"MaxCount\":\"0\"}";
             RedisDbconn.Instance.AddList("ExportQueue", SendData);
+            AddSysLog("0", "UserAccountRecord", "LeaderQuickExportExcelDo");
             return "success";
         }
         #endregion

Areas/Admin/Controllers/MainServer/UserCashRecordForBusinessController.cs

@@ -240,6 +240,7 @@ namespace MySystem.Areas.Admin.Controllers
             var FileName = "直营团队提现记录" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
             string SendData = "{\"Operater\":\"" + sysAdmin.Id + "\",\"SqlString\":\"" + Sql + "\",\"FileName\":\"" + FileName + "\",\"MaxCount\":\"0\"}";
             RedisDbconn.Instance.AddList("ExportQueue", SendData);
+            AddSysLog("0", "UserCashRecordForBusiness", "QuickExportExcelDo");
             return "success";
         }
         #endregion

Areas/Admin/Controllers/MainServer/UserRankWhiteController.cs

@@ -557,6 +557,7 @@ namespace MySystem.Areas.Admin.Controllers
             var FileName = "创客预设职级记录" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
             string SendData = "{\"Operater\":\"" + sysAdmin.Id + "\",\"SqlString\":\"" + Sql + "\",\"FileName\":\"" + FileName + "\",\"MaxCount\":\"0\"}";
             RedisDbconn.Instance.AddList("ExportQueue", SendData);
+            AddSysLog("0", "UserRankWhite", "QuickExportExcelDo");
             return "success";
         }
         #endregion

Areas/Admin/Controllers/MainServer/UsersController.cs

@@ -462,6 +462,7 @@ namespace MySystem.Areas.Admin.Controllers
             DataTable dt = OtherMySqlConn.dtable("update SmallStoreHouse s set TotalNum=(select count(Id) from PreSendStockDetail where ToUserId=s.UserId and ApplyFlag=0 and Status>-1 and Status<2),LaveNum=10-(select count(Id) from PreSendStockDetail where ToUserId=s.UserId and ApplyFlag=0 and Status>-1 and Status<2) where UserId=" + Id);
             string text = string.Format("重置小分仓机具数，UserId: '" + Id + "'，操作人: '" + SysUserName + "_" + SysRealName + "'，Time'" + DateTime.Now + "'");
             function.WriteLog(text, "重置小分仓机具数");
+            AddSysLog("0", "Users", "ResetSmallPosCount");
             return "success";
         }
 
@@ -475,6 +476,7 @@ namespace MySystem.Areas.Admin.Controllers
             var apptoken = RedisDbconn.Instance.GetKeys("apptoken:*" + UserId);
             RedisDbconn.Instance.Clear("utoken:*" + UserId);
             RedisDbconn.Instance.Clear("apptoken:*" + UserId);
+            AddSysLog(Id, "Users", "ClearToken");
             return "success";
         }
 
@@ -726,6 +728,7 @@ namespace MySystem.Areas.Admin.Controllers
         // 满足以上全部条件的用户可申请注销，申请后用户二次填写确认填写信息（姓名、手机号、身份证号）即可完成注销
         public string Cancel(string UserId)
         {
+            AddSysLog("0", "Users", "Cancel");
             Users user = db.Users.FirstOrDefault(m => m.Id == Convert.ToInt32(UserId));
             if (user != null)
             {
@@ -987,6 +990,7 @@ namespace MySystem.Areas.Admin.Controllers
                 user.RiskRemark = data.RiskRemark;
                 db.SaveChanges();
             }
+            AddSysLog("0", "Users", "Risk");
             return "success";
         }
 
@@ -1507,7 +1511,7 @@ namespace MySystem.Areas.Admin.Controllers
             ReturnFields.Add("UserLevel", "创客等级");
 
             result.Add("Fields", ReturnFields);
-            AddSysLog("0", "Users", "ExportExcel");
+            AddSysLog("0", "Users", "ExportSJExcel");
             return Json(result);
         }
 
@@ -1578,6 +1582,7 @@ namespace MySystem.Areas.Admin.Controllers
                 function.WriteLog(DateTime.Now.ToString() + "\n" + ex.ToString(), "统计创客的交易额异常");
                 return "同步异常";
             }
+            AddSysLog("0", "Users", "SycnTradeAmountDo");
             return "success";
         }
 
@@ -2975,6 +2980,7 @@ namespace MySystem.Areas.Admin.Controllers
             var FileName = "批量查询创客信息" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
             string SendData = "{\"Operater\":\"" + sysAdmin.Id + "\",\"SqlString\":\"" + sql + "\",\"FileName\":\"" + FileName + "\",\"MaxCount\":\"0\"}";
             RedisDbconn.Instance.AddList("ExportQueue", SendData);
+            AddSysLog("0", "Users", "ExportBatchSeeUserInfoExcelDo");
             return "success";
         }
         #endregion

Areas/Admin/Controllers/OperateServer/StoreHouseOperateController.cs

@@ -716,6 +716,17 @@ namespace MySystem.Areas.Admin.Controllers
                                     opData.Add(posInfo.BuyUserId + ":" + posInfo.BrandId);
                                 }
 
+                                var BeforeDeposit = 0;
+                                if (string.IsNullOrEmpty(posInfo.PrizeParams))
+                                {
+                                    BeforeDeposit = 299;
+                                    if (posInfo.BrandId == 6) BeforeDeposit = 249;
+                                }
+                                else
+                                {
+                                    BeforeDeposit = int.Parse(posInfo.PrizeParams);
+                                }
+
                                 posInfo.StoreId = toStore.Id;
                                 posInfo.BuyUserId = 0;
                                 posInfo.UserId = 0;
@@ -746,6 +757,41 @@ namespace MySystem.Areas.Admin.Controllers
                                 toStore.LaveNum += 1;
                                 fromStore.TotalNum -= 1;
                                 fromStore.LaveNum -= 1;
+
+                                //机具回仓重置服务费和费率(服务费默认为299，立刷为249 费率为0.6)
+                                Dictionary<string, object> req = new Dictionary<string, object>();
+                                var DepositId = "299";
+                                req.Add("PosSnId", posInfo.Id);
+                                req.Add("BrandId", posInfo.BrandId);
+                                if (posInfo.BrandId == 6) DepositId = "249";
+                                req.Add("Deposit", DepositId);
+                                //重置服务费
+                                RedisDbconn.Instance.AddList("ChangePosFeeQueue", Newtonsoft.Json.JsonConvert.SerializeObject(req));
+
+                                //添加设置押金添加记录
+                                PublicFunction.MerchantDepositSet(posInfo.BrandId, 0, posInfo.Id, posInfo.PosSn, BeforeDeposit, decimal.Parse(DepositId), "");
+
+                                var ChangeFee = 0.60M;
+                                var ChangeKind = 3;
+                                var OpMan = "系统";
+                                var posMachinesFeeChangeRecord = db.PosMachinesFeeChangeRecord.Add(new PosMachinesFeeChangeRecord()
+                                {
+                                    CreateDate = DateTime.Now, //创建时间
+                                    SeoDescription = "系统添加-过期机具回仓重置费率",
+                                    Sort = posInfo.BrandId, //品牌Id
+                                    PosId = posInfo.Id, //机具Id
+                                    PosSn = posInfo.PosSn,
+                                    ChangeFee = ChangeFee, //调整费率
+                                }).Entity;
+                                db.SaveChanges();
+
+                                // PosId:机具Id
+                                // Kind:1或2，1为费率0.63+3，2为费率0.63，3为费率0.6
+                                // OpMan:操作人，app传创客编号，后台传SysUserName
+                                //重置费率
+                                string infos = "{\"RecordId\":\"" + posMachinesFeeChangeRecord.Id + "\",\"PosId\":\"" + posInfo.Id + "\",\"Fee\": \"" + ChangeFee.ToString("f0").TrimEnd('0') + "\",\"Kind\": \"" + ChangeKind + "\",\"OpMan\": \"" + OpMan + "\"}";
+                                RedisDbconn.Instance.AddList("SetDepositQueue", infos);
+
                                 PublicFunction.ClearPosHistory(db, posInfo.PosSn); //清除机具历史记录
                                 db.SaveChanges();
                             }
@@ -811,6 +857,17 @@ namespace MySystem.Areas.Admin.Controllers
                                     opData.Add(posInfo.BuyUserId + ":" + posInfo.BrandId);
                                 }
 
+                                var BeforeDeposit = 0;
+                                if (string.IsNullOrEmpty(posInfo.PrizeParams))
+                                {
+                                    BeforeDeposit = 299;
+                                    if (posInfo.BrandId == 6) BeforeDeposit = 249;
+                                }
+                                else
+                                {
+                                    BeforeDeposit = int.Parse(posInfo.PrizeParams);
+                                }
+
                                 posInfo.StoreId = toStore.Id;
                                 posInfo.BuyUserId = 0;
                                 posInfo.UserId = 0;
@@ -839,6 +896,41 @@ namespace MySystem.Areas.Admin.Controllers
                                 fuserMachineData.UnBindCount -= 1;
                                 toStore.LaveNum += 1;
                                 toStore.TotalNum += 1;
+
+                                //机具回仓重置服务费和费率(服务费默认为299，立刷为249 费率为0.6)
+                                Dictionary<string, object> req = new Dictionary<string, object>();
+                                var DepositId = "299";
+                                req.Add("PosSnId", posInfo.Id);
+                                req.Add("BrandId", posInfo.BrandId);
+                                if (posInfo.BrandId == 6) DepositId = "249";
+                                req.Add("Deposit", DepositId);
+                                //重置服务费
+                                RedisDbconn.Instance.AddList("ChangePosFeeQueue", Newtonsoft.Json.JsonConvert.SerializeObject(req));
+
+                                //添加设置押金添加记录
+                                PublicFunction.MerchantDepositSet(posInfo.BrandId, 0, posInfo.Id, posInfo.PosSn, BeforeDeposit, decimal.Parse(DepositId), "");
+
+                                var ChangeFee = 0.60M;
+                                var ChangeKind = 3;
+                                var OpMan = "系统";
+                                var posMachinesFeeChangeRecord = db.PosMachinesFeeChangeRecord.Add(new PosMachinesFeeChangeRecord()
+                                {
+                                    CreateDate = DateTime.Now, //创建时间
+                                    SeoDescription = "系统添加-过期机具回仓重置费率",
+                                    Sort = posInfo.BrandId, //品牌Id
+                                    PosId = posInfo.Id, //机具Id
+                                    PosSn = posInfo.PosSn,
+                                    ChangeFee = ChangeFee, //调整费率
+                                }).Entity;
+                                db.SaveChanges();
+
+                                // PosId:机具Id
+                                // Kind:1或2，1为费率0.63+3，2为费率0.63，3为费率0.6
+                                // OpMan:操作人，app传创客编号，后台传SysUserName
+                                //重置费率
+                                string infos = "{\"RecordId\":\"" + posMachinesFeeChangeRecord.Id + "\",\"PosId\":\"" + posInfo.Id + "\",\"Fee\": \"" + ChangeFee.ToString("f0").TrimEnd('0') + "\",\"Kind\": \"" + ChangeKind + "\",\"OpMan\": \"" + OpMan + "\"}";
+                                RedisDbconn.Instance.AddList("SetDepositQueue", infos);
+                                
                                 PublicFunction.ClearPosHistory(db, posInfo.PosSn); //清除机具历史记录
                                 db.SaveChanges();
                             }

Areas/Admin/Controllers/OperateServer/UserCashRecordOperateController.cs

@@ -524,7 +524,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// <returns></returns>
         public string ReduceDo(int Id, string Remark)
         {
-            AddSysLog(Id, "UserCashRecord", "Reduce");
+            AddSysLog(Id, "OpUserCashRecord", "Reduce");
             UserCashRecord edit = opdb.UserCashRecord.FirstOrDefault(m => m.Id == Id);
             if (edit != null)
             {

Areas/Admin/Controllers/OperateServer/UserCashRecordOperatesController.cs

@@ -582,7 +582,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// <returns></returns>
         public string ReduceDo(int Id, string Remark)
         {
-            AddSysLog(Id, "UserCashRecord", "Reduce");
+            AddSysLog(Id, "OpUserCashRecord", "Reduce");
             UserCashRecord edit = opdb.UserCashRecord.FirstOrDefault(m => m.Id == Id);
             if (edit != null)
             {

Controllers/HomeController.cs

@@ -178,30 +178,85 @@ namespace MySystem.Controllers
     
         public string test(string p)
         {
-            
-            // BsModels.WebCMSEntities db = new BsModels.WebCMSEntities();
-            // var sysadmins = db.SysAdmin.ToList();
-            // foreach(var sysadmin in sysadmins)
-            // {
-            //     BsModels.SysAdmin edit = db.SysAdmin.FirstOrDefault(m => m.Id == sysadmin.Id);
-            //     if(edit != null)
-            //     {
-            //         string pwd = function.get_Random(8);
-            //         edit.Password = function.MD5_32(pwd);
-            //         db.SaveChanges();
-            //         function.WriteLog(edit.AdminName + ":" + pwd, "pwd");
-            //     }
-            // }
-            // db.Dispose();
-
-            // WebCMSEntities db = new WebCMSEntities();
-            // List<string> nos = new List<string>();
-            // nos.Add("BC2024010814562964923941884");
-            // List<UserCashRecord> list = db.UserCashRecord.Where(m => nos.Contains(m.CashOrderNo)).ToList();
-            // foreach (UserCashRecord edit in list)
-            // {
-            //     RedisDbconn.Instance.AddList("JkCashPayApplyQueue", Newtonsoft.Json.JsonConvert.SerializeObject(edit));
-            // }
+            RedisDbconn.Instance.AddList("SIMActCountQueue", "{\"UserId\":\"174\",\"ActCount\":\"1\"}");	
+            RedisDbconn.Instance.AddList("SIMActCountQueue", "{\"UserId\":\"391\",\"ActCount\":\"1\"}");	
+            RedisDbconn.Instance.AddList("SIMActCountQueue", "{\"UserId\":\"392\",\"ActCount\":\"1\"}");	
+            RedisDbconn.Instance.AddList("SIMActCountQueue", "{\"UserId\":\"588\",\"ActCount\":\"1\"}");	
+            RedisDbconn.Instance.AddList("SIMActCountQueue", "{\"UserId\":\"607\",\"ActCount\":\"1\"}");	
+            RedisDbconn.Instance.AddList("SIMActCountQueue", "{\"UserId\":\"4273\",\"ActCount\":\"5\"}");	
+            RedisDbconn.Instance.AddList("SIMActCountQueue", "{\"UserId\":\"54784\",\"ActCount\":\"1\"}");	
+            RedisDbconn.Instance.AddList("SIMActCountQueue", "{\"UserId\":\"56153\",\"ActCount\":\"1\"}");	
+            RedisDbconn.Instance.AddList("SIMActCountQueue", "{\"UserId\":\"120862\",\"ActCount\":\"1\"}");	
+            RedisDbconn.Instance.AddList("SIMActCountQueue", "{\"UserId\":\"125505\",\"ActCount\":\"1\"}");	
+            RedisDbconn.Instance.AddList("SIMActCountQueue", "{\"UserId\":\"127366\",\"ActCount\":\"1\"}");	
+            RedisDbconn.Instance.AddList("SIMActCountQueue", "{\"UserId\":\"129563\",\"ActCount\":\"1\"}");	
+            RedisDbconn.Instance.AddList("SIMActCountQueue", "{\"UserId\":\"136041\",\"ActCount\":\"1\"}");	
+            RedisDbconn.Instance.AddList("SIMActCountQueue", "{\"UserId\":\"137182\",\"ActCount\":\"1\"}");	
+            RedisDbconn.Instance.AddList("SIMActCountQueue", "{\"UserId\":\"138250\",\"ActCount\":\"2\"}");	
+            RedisDbconn.Instance.AddList("SIMActCountQueue", "{\"UserId\":\"142975\",\"ActCount\":\"1\"}");	
+            RedisDbconn.Instance.AddList("SIMActCountQueue", "{\"UserId\":\"143114\",\"ActCount\":\"1\"}");	
+            RedisDbconn.Instance.AddList("SIMActCountQueue", "{\"UserId\":\"155982\",\"ActCount\":\"2\"}");	
+            RedisDbconn.Instance.AddList("SIMActCountQueue", "{\"UserId\":\"156928\",\"ActCount\":\"1\"}");	
+            RedisDbconn.Instance.AddList("SIMActCountQueue", "{\"UserId\":\"162971\",\"ActCount\":\"1\"}");	
+            RedisDbconn.Instance.AddList("SIMActCountQueue", "{\"UserId\":\"166743\",\"ActCount\":\"1\"}");	
+            RedisDbconn.Instance.AddList("SIMActCountQueue", "{\"UserId\":\"168049\",\"ActCount\":\"1\"}");	
+            RedisDbconn.Instance.AddList("SIMActCountQueue", "{\"UserId\":\"168585\",\"ActCount\":\"1\"}");	
+            RedisDbconn.Instance.AddList("SIMActCountQueue", "{\"UserId\":\"170205\",\"ActCount\":\"1\"}");	
+            RedisDbconn.Instance.AddList("SIMActCountQueue", "{\"UserId\":\"172119\",\"ActCount\":\"1\"}");	
+            RedisDbconn.Instance.AddList("SIMActCountQueue", "{\"UserId\":\"172725\",\"ActCount\":\"2\"}");	
+            RedisDbconn.Instance.AddList("SIMActCountQueue", "{\"UserId\":\"173164\",\"ActCount\":\"1\"}");	
+            RedisDbconn.Instance.AddList("SIMActCountQueue", "{\"UserId\":\"173658\",\"ActCount\":\"1\"}");	
+            RedisDbconn.Instance.AddList("SIMActCountQueue", "{\"UserId\":\"173706\",\"ActCount\":\"2\"}");	
+            RedisDbconn.Instance.AddList("SIMActCountQueue", "{\"UserId\":\"173790\",\"ActCount\":\"3\"}");	
+            RedisDbconn.Instance.AddList("SIMActCountQueue", "{\"UserId\":\"173793\",\"ActCount\":\"2\"}");	
+            RedisDbconn.Instance.AddList("SIMActCountQueue", "{\"UserId\":\"173802\",\"ActCount\":\"1\"}");	
+            RedisDbconn.Instance.AddList("SIMActCountQueue", "{\"UserId\":\"173828\",\"ActCount\":\"1\"}");	
+            RedisDbconn.Instance.AddList("SIMActCountQueue", "{\"UserId\":\"174149\",\"ActCount\":\"1\"}");	
+            RedisDbconn.Instance.AddList("SIMActCountQueue", "{\"UserId\":\"174282\",\"ActCount\":\"3\"}");	
+            RedisDbconn.Instance.AddList("SIMActCountQueue", "{\"UserId\":\"174384\",\"ActCount\":\"2\"}");	
+            RedisDbconn.Instance.AddList("SIMActCountQueue", "{\"UserId\":\"174447\",\"ActCount\":\"1\"}");	
+            RedisDbconn.Instance.AddList("SIMActCountQueue", "{\"UserId\":\"174506\",\"ActCount\":\"2\"}");	
+            RedisDbconn.Instance.AddList("SIMActCountQueue", "{\"UserId\":\"174651\",\"ActCount\":\"1\"}");	
+            RedisDbconn.Instance.AddList("SIMActCountQueue", "{\"UserId\":\"174889\",\"ActCount\":\"1\"}");	
+            RedisDbconn.Instance.AddList("SIMActCountQueue", "{\"UserId\":\"174909\",\"ActCount\":\"1\"}");	
+            RedisDbconn.Instance.AddList("SIMActCountQueue", "{\"UserId\":\"174912\",\"ActCount\":\"1\"}");	
+            RedisDbconn.Instance.AddList("SIMActCountQueue", "{\"UserId\":\"174957\",\"ActCount\":\"1\"}");	
+            RedisDbconn.Instance.AddList("SIMActCountQueue", "{\"UserId\":\"174987\",\"ActCount\":\"1\"}");	
+            RedisDbconn.Instance.AddList("SIMActCountQueue", "{\"UserId\":\"175113\",\"ActCount\":\"4\"}");	
+            RedisDbconn.Instance.AddList("SIMActCountQueue", "{\"UserId\":\"175156\",\"ActCount\":\"4\"}");	
+            RedisDbconn.Instance.AddList("SIMActCountQueue", "{\"UserId\":\"175309\",\"ActCount\":\"1\"}");	
+            RedisDbconn.Instance.AddList("SIMActCountQueue", "{\"UserId\":\"175325\",\"ActCount\":\"1\"}");	
+            RedisDbconn.Instance.AddList("SIMActCountQueue", "{\"UserId\":\"175336\",\"ActCount\":\"1\"}");	
+            RedisDbconn.Instance.AddList("SIMActCountQueue", "{\"UserId\":\"175471\",\"ActCount\":\"1\"}");	
+            RedisDbconn.Instance.AddList("SIMActCountQueue", "{\"UserId\":\"175486\",\"ActCount\":\"2\"}");	
+            RedisDbconn.Instance.AddList("SIMActCountQueue", "{\"UserId\":\"175655\",\"ActCount\":\"1\"}");	
+            RedisDbconn.Instance.AddList("SIMActCountQueue", "{\"UserId\":\"175748\",\"ActCount\":\"1\"}");	
+            RedisDbconn.Instance.AddList("SIMActCountQueue", "{\"UserId\":\"175780\",\"ActCount\":\"1\"}");	
+            RedisDbconn.Instance.AddList("SIMActCountQueue", "{\"UserId\":\"175910\",\"ActCount\":\"2\"}");	
+            RedisDbconn.Instance.AddList("SIMActCountQueue", "{\"UserId\":\"175937\",\"ActCount\":\"1\"}");	
+            RedisDbconn.Instance.AddList("SIMActCountQueue", "{\"UserId\":\"175952\",\"ActCount\":\"2\"}");	
+            RedisDbconn.Instance.AddList("SIMActCountQueue", "{\"UserId\":\"176048\",\"ActCount\":\"1\"}");	
+            RedisDbconn.Instance.AddList("SIMActCountQueue", "{\"UserId\":\"176176\",\"ActCount\":\"3\"}");	
+            RedisDbconn.Instance.AddList("SIMActCountQueue", "{\"UserId\":\"176356\",\"ActCount\":\"1\"}");	
+            RedisDbconn.Instance.AddList("SIMActCountQueue", "{\"UserId\":\"176468\",\"ActCount\":\"1\"}");	
+            RedisDbconn.Instance.AddList("SIMActCountQueue", "{\"UserId\":\"176648\",\"ActCount\":\"1\"}");	
+            RedisDbconn.Instance.AddList("SIMActCountQueue", "{\"UserId\":\"177017\",\"ActCount\":\"1\"}");	
+            RedisDbconn.Instance.AddList("SIMActCountQueue", "{\"UserId\":\"177073\",\"ActCount\":\"1\"}");	
+            RedisDbconn.Instance.AddList("SIMActCountQueue", "{\"UserId\":\"177342\",\"ActCount\":\"3\"}");	
+            RedisDbconn.Instance.AddList("SIMActCountQueue", "{\"UserId\":\"177350\",\"ActCount\":\"1\"}");	
+            RedisDbconn.Instance.AddList("SIMActCountQueue", "{\"UserId\":\"177592\",\"ActCount\":\"1\"}");	
+            RedisDbconn.Instance.AddList("SIMActCountQueue", "{\"UserId\":\"177598\",\"ActCount\":\"1\"}");	
+            RedisDbconn.Instance.AddList("SIMActCountQueue", "{\"UserId\":\"178374\",\"ActCount\":\"1\"}");	
+            RedisDbconn.Instance.AddList("SIMActCountQueue", "{\"UserId\":\"178386\",\"ActCount\":\"1\"}");	
+            RedisDbconn.Instance.AddList("SIMActCountQueue", "{\"UserId\":\"178388\",\"ActCount\":\"1\"}");	
+            RedisDbconn.Instance.AddList("SIMActCountQueue", "{\"UserId\":\"178905\",\"ActCount\":\"2\"}");	
+            RedisDbconn.Instance.AddList("SIMActCountQueue", "{\"UserId\":\"179058\",\"ActCount\":\"1\"}");	
+            RedisDbconn.Instance.AddList("SIMActCountQueue", "{\"UserId\":\"179555\",\"ActCount\":\"1\"}");	
+            RedisDbconn.Instance.AddList("SIMActCountQueue", "{\"UserId\":\"180360\",\"ActCount\":\"1\"}");	
+            RedisDbconn.Instance.AddList("SIMActCountQueue", "{\"UserId\":\"180961\",\"ActCount\":\"1\"}");	
+            RedisDbconn.Instance.AddList("SIMActCountQueue", "{\"UserId\":\"181484\",\"ActCount\":\"1\"}");	
+            RedisDbconn.Instance.AddList("SIMActCountQueue", "{\"UserId\":\"181897\",\"ActCount\":\"1\"}");	
+            RedisDbconn.Instance.AddList("SIMActCountQueue", "{\"UserId\":\"182771\",\"ActCount\":\"1\"}");	
             return "ok";
         }
 

Models/UserSimActSummary.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models
+{
+    public partial class UserSimActSummary
+    {
+        public int Id { get; set; }
+        public int Sort { get; set; }
+        public int Status { get; set; }
+        public int Version { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public int ActCount { get; set; }
+        public int UserId { get; set; }
+        public int Kind { get; set; }
+    }
+}

Models/WebCMSEntities.cs

@@ -290,6 +290,7 @@ namespace MySystem.Models
         public virtual DbSet<UserRankWhite> UserRankWhite { get; set; }
         public virtual DbSet<UserRankWhiteBefore> UserRankWhiteBefore { get; set; }
         public virtual DbSet<UserRebateDetail> UserRebateDetail { get; set; }
+        public virtual DbSet<UserSimActSummary> UserSimActSummary { get; set; }
         public virtual DbSet<UserSnActInfo> UserSnActInfo { get; set; }
         public virtual DbSet<UserSnDelayChange> UserSnDelayChange { get; set; }
         public virtual DbSet<UserStoreChange> UserStoreChange { get; set; }
@@ -20275,6 +20276,45 @@ namespace MySystem.Models
                 entity.Property(e => e.Version).HasColumnType("int(11)");
             });
 
+            modelBuilder.Entity<UserSimActSummary>(entity =>
+            {
+                entity.HasComment("广电卡激活数统计");
+
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.ActCount)
+                    .HasColumnType("int(11)")
+                    .HasComment("激活数");
+
+                entity.Property(e => e.CreateDate)
+                    .HasColumnType("datetime")
+                    .HasComment("创建时间");
+
+                entity.Property(e => e.Kind)
+                    .HasColumnType("int(11)")
+                    .HasComment("类型");
+
+                entity.Property(e => e.Sort)
+                    .HasColumnType("int(11)")
+                    .HasComment("排序序号");
+
+                entity.Property(e => e.Status)
+                    .HasColumnType("int(11)")
+                    .HasComment("状态");
+
+                entity.Property(e => e.UpdateDate)
+                    .HasColumnType("datetime")
+                    .HasComment("修改时间");
+
+                entity.Property(e => e.UserId)
+                    .HasColumnType("int(11)")
+                    .HasComment("创客");
+
+                entity.Property(e => e.Version)
+                    .HasColumnType("int(11)")
+                    .HasComment("版本号");
+            });
+
             modelBuilder.Entity<UserSnActInfo>(entity =>
             {
                 entity.HasComment("机具激活限制信息");

Startup.cs

@@ -155,6 +155,7 @@ namespace MySystem
                 SIMPosMerchantTradeService.Instance.Start(); //导入广电卡数据
                 GetRadioCardInfoService.Instance.Start(); //获取行销宝信息
                 SycnUserMachineCountHelper.Instance.Start(); //重置创客机具数量
+                SIMActCountService.Instance.Start(); //统计注销欠费卡张数
 
                 TestHelper.Instance.Start(); //生成兑换券
 

wwwroot/layuiadmin/config.js

@@ -1,111 +0,0 @@
-/**
-
- @Name：layuiAdmin iframe版全局配置
- @Author：贤心
- @Site：http://www.layui.com/admin/
- @License：LPPL（layui付费产品协议）
-    
- */
- 
-layui.define(['laytpl', 'layer', 'element', 'util'], function(exports){
-  exports('setter', {
-    container: 'LAY_app' //容器ID
-    ,base: layui.cache.base //记录静态资源所在路径
-    ,views: layui.cache.base + 'tpl/' //动态模板所在目录
-    ,entry: 'index' //默认视图文件名
-    ,engine: '.html' //视图文件后缀名
-    ,pageTabs: true //是否开启页面选项卡功能。iframe版推荐开启
-    
-    ,name: 'layuiAdmin'
-    ,tableName: 'layuiAdmin' //本地存储表名
-    ,MOD_NAME: 'admin' //模块事件名
-    
-    ,debug: true //是否开启调试模式。如开启，接口异常时会抛出异常 URL 等信息
-
-    //自定义请求字段
-    ,request: {
-      tokenName: false //自动携带 token 的字段名（如：access_token）。可设置 false 不携带。
-    }
-    
-    //自定义响应字段
-    ,response: {
-      statusName: 'code' //数据状态的字段名称
-      ,statusCode: {
-        ok: 0 //数据状态一切正常的状态码
-        ,logout: 1001 //登录状态失效的状态码
-      }
-      ,msgName: 'msg' //状态信息的字段名称
-      ,dataName: 'data' //数据详情的字段名称
-    }
-    
-    //扩展的第三方模块
-    ,extend: [
-      'echarts', //echarts 核心包
-      'echartsTheme' //echarts 主题
-    ]
-    
-    //主题配置
-    ,theme: {
-      //内置主题配色方案
-      color: [{
-        main: '#20222A' //主题色
-        ,selected: '#009688' //选中色
-        ,alias: 'default' //默认别名
-      },{
-        main: '#03152A'
-        ,selected: '#3B91FF'
-        ,alias: 'dark-blue' //藏蓝
-      },{
-        main: '#2E241B'
-        ,selected: '#A48566'
-        ,alias: 'coffee' //咖啡
-      },{
-        main: '#50314F'
-        ,selected: '#7A4D7B'
-        ,alias: 'purple-red' //紫红
-      },{
-        main: '#344058'
-        ,logo: '#1E9FFF'
-        ,selected: '#1E9FFF'
-        ,alias: 'ocean' //海洋
-      },{
-        main: '#3A3D49'
-        ,logo: '#2F9688'
-        ,selected: '#5FB878'
-        ,alias: 'green' //墨绿
-      },{
-        main: '#20222A'
-        ,logo: '#F78400'
-        ,selected: '#F78400'
-        ,alias: 'red' //橙色
-      },{
-        main: '#28333E'
-        ,logo: '#AA3130'
-        ,selected: '#AA3130'
-        ,alias: 'fashion-red' //时尚红
-      },{
-        main: '#24262F'
-        ,logo: '#3A3D49'
-        ,selected: '#009688'
-        ,alias: 'classic-black' //经典黑
-      },{
-        logo: '#226A62'
-        ,header: '#2F9688'
-        ,alias: 'green-header' //墨绿头
-      },{
-        main: '#344058'
-        ,logo: '#0085E8'
-        ,selected: '#1E9FFF'
-        ,header: '#1E9FFF'
-        ,alias: 'ocean-header' //海洋头
-      },{
-        header: '#393D49'
-        ,alias: 'classic-black-header' //经典黑头
-      }]
-      
-      //初始的颜色索引，对应上面的配色方案数组索引
-      //如果本地已经有主题色记录，则以本地记录为优先，除非请求本地数据（localStorage）
-      ,initColorIndex: 0
-    }
-  });
-});

wwwroot/layuiadmin/json/console/prograss.js

@@ -1,36 +0,0 @@
-{
-  "code": 0
-  ,"msg": ""
-  ,"count": "100"
-  ,"data": [{
-    "prograss": "开会"
-    ,"time": "一小时"
-    ,"complete": "已完成"
-    ,"LAY_CHECKED": true
-  },{
-    "prograss": "项目开发"
-    ,"time": "两小时"
-    ,"complete": "进行中"
-    ,"LAY_CHECKED": true
-  },{
-    "prograss": "陪吃饭"
-    ,"time": "一小时"
-    ,"complete": "未完成"
-  },{
-    "prograss": "修改小bug"
-    ,"time": "半小时"
-    ,"complete": "未完成"
-  },{
-    "prograss": "修改大bug"
-    ,"time": "两小时"
-    ,"complete": "未完成"
-  },{
-    "prograss": "修改小bug"
-    ,"time": "半小时"
-    ,"complete": "未完成"
-  },{
-    "prograss": "修改大bug"
-    ,"time": "两小时"
-    ,"complete": "未完成"
-  }]
-}

wwwroot/layuiadmin/json/console/top-card.js

@@ -1,76 +0,0 @@
-{
-  "code": 0
-  ,"msg": ""
-  ,"count": "100"
-  ,"data": [{
-    "id": 111
-    ,"title": "社区开始接受 “赞助商广告” 投放"
-    ,"username": "贤心"
-    ,"channel": "公告"
-    ,"href": "http://fly.layui.com/jie/15697/"
-    ,"crt": 61632
-  },{
-    "id": 222
-    ,"title": "layui 一周年"
-    ,"username": "猫吃"
-    ,"channel": "讨论"
-    ,"href": "http://fly.layui.com/jie/16622/"
-    ,"crt": 61632
-  },{
-    "id": 333
-    ,"title": "四个月的前端"
-    ,"username": "fd"
-    ,"channel": "分享"
-    ,"href": "http://fly.layui.com/jie/16651/"
-    ,"crt": 61632
-  },{
-    "id": 333
-    ,"title": "如何评价LayUI和他的作者闲心"
-    ,"username": "纸飞机"
-    ,"channel": "提问"
-    ,"href": "http://fly.layui.com/jie/9352/"
-    ,"crt": 61632
-  },{
-    "id": 333
-    ,"title": "如何评价LayUI和他的作者闲心"
-    ,"username": "纸飞机"
-    ,"channel": "提问"
-    ,"href": "http://fly.layui.com/jie/9352/"
-    ,"crt": 61632
-  },{
-    "id": 333
-    ,"title": "如何评价LayUI和他的作者闲心"
-    ,"username": "纸飞机"
-    ,"channel": "提问"
-    ,"href": "http://fly.layui.com/jie/9352/"
-    ,"crt": 61632
-  },{
-    "id": 333
-    ,"title": "如何评价LayUI和他的作者闲心"
-    ,"username": "纸飞机"
-    ,"channel": "提问"
-    ,"href": "http://fly.layui.com/jie/9352/"
-    ,"crt": 61632
-  },{
-    "id": 333
-    ,"title": "如何评价LayUI和他的作者闲心"
-    ,"username": "纸飞机"
-    ,"channel": "提问"
-    ,"href": "http://fly.layui.com/jie/9352/"
-    ,"crt": 61632
-  },{
-    "id": 333
-    ,"title": "如何评价LayUI和他的作者闲心"
-    ,"username": "纸飞机"
-    ,"channel": "提问"
-    ,"href": "http://fly.layui.com/jie/9352/"
-    ,"crt": 61632
-  },{
-    "id": 333
-    ,"title": "如何评价LayUI和他的作者闲心"
-    ,"username": "纸飞机"
-    ,"channel": "提问"
-    ,"href": "http://fly.layui.com/jie/9352/"
-    ,"crt": 61632
-  }]
-}

wwwroot/layuiadmin/json/console/top-search.js

@@ -1,46 +0,0 @@
-{
-  "code": 0
-  ,"msg": ""
-  ,"count": "100"
-  ,"data": [{
-    "keywords": "贤心是男是女"
-    ,"frequency": 8520
-    ,"userNums": 2216
-  },{
-    "keywords": "Java程序员能找到女朋友吗"
-    ,"frequency": 666
-    ,"userNums": 333
-  },{
-    "keywords": "此表格是静态模拟数据"
-    ,"frequency": 666
-    ,"userNums": 333
-  },{
-    "keywords": "layui官方教程"
-    ,"frequency": 666
-    ,"userNums": 333
-  },{
-    "keywords": "layui官方教程"
-    ,"frequency": 666
-    ,"userNums": 333
-  },{
-    "keywords": "layui官方教程"
-    ,"frequency": 666
-    ,"userNums": 333
-  },{
-    "keywords": "layui官方教程"
-    ,"frequency": 666
-    ,"userNums": 333
-  },{
-    "keywords": "layui官方教程"
-    ,"frequency": 666
-    ,"userNums": 333
-  },{
-    "keywords": "layui官方教程"
-    ,"frequency": 666
-    ,"userNums": 333
-  },{
-    "keywords": "layui官方教程"
-    ,"frequency": 666
-    ,"userNums": 333
-  }]
-}

wwwroot/layuiadmin/json/content/comment.js

@@ -1,56 +0,0 @@
-{
-  "code": 0
-  ,"msg": ""
-  ,"count": "100"
-  ,"data": [{
-    "id": "001"
-    ,"reviewers": "赵"
-    ,"content": "我又爱上编程了"
-    ,"commtime": 20160312
-  },{
-    "id": "002"
-    ,"reviewers": "钱"
-    ,"content": "女生出门要小心"
-    ,"commtime": 20160821
-  },{
-    "id": "003"
-    ,"reviewers": "孙"
-    ,"content": "框架就用layui"
-    ,"commtime": 20161212
-  },{
-    "id": "004"
-    ,"reviewers": "李"
-    ,"content": "心姐么么哒" 
-    ,"commtime": 20170311
-  },{
-    "id": "005"
-    ,"reviewers": "周"
-    ,"content": "希望明天是个好天气"
-    ,"commtime": 20170612
-  },{
-    "id": "006"
-    ,"reviewers": "吴"
-    ,"content": "我又爱上编程了"
-    ,"commtime": 20171112
-  },{
-    "id": "007"
-    ,"reviewers": "郑"
-    ,"content": "女生出门要小心"
-    ,"commtime": 20171230
-  },{
-    "id": "008"
-    ,"reviewers": "王"
-    ,"content": "框架就用layui"
-    ,"commtime": 20180112
-  },{
-    "id": "009"
-    ,"reviewers": "冯"
-    ,"content": "心姐么么哒"
-    ,"commtime": 20180221
-  },{
-    "id": "010"
-    ,"reviewers": "陈"
-    ,"content": "希望明天是个好天气"
-    ,"commtime": 20180312
-  }]
-}

wwwroot/layuiadmin/json/content/list.js

@@ -1,62 +0,0 @@
-{
-  "code": 0
-  ,"msg": ""
-  ,"count": "100"
-  ,"data": [{
-    "id": "001"
-    ,"label": "美食"
-    ,"title": "舌尖上的中国第一季"
-    ,"author": "作者-1"
-    ,"content": "通过中华美食的多个侧面，来展现食物给中国人生活带来的仪式、伦理等方面的文化；见识中国特色食材以及与食物相关、构成中国美食特有气质的一系列元素；了解中华饮食文化的精致和源远流长"
-    ,"uploadtime": 20121204
-    ,"status": true
-  },{
-    "id": "002"
-    ,"label": "美食"
-    ,"title": "舌尖上的中国第二季"
-    ,"author": "作者-2"
-    ,"content": "以食物为窗口，读懂中国——通过美食，使人们可以有滋有味地认知这个古老的东方国度。“一方水土一方人”，本片将通过展示人们日常生活中与美食相关的多重侧面，描绘与感知中国人的文化传统、家族观念、生活态度与故土难离。人们收获、保存、烹饪、生产美食，并在其过程中留存和传承食物所承载的味觉记忆、饮食习俗、文化样态与家常情感。"
-    ,"uploadtime": 20141204
-    ,"status": false
-  },{
-    "id": "003"
-    ,"label": "美食"
-    ,"title": "舌尖上的中国第三季"
-    ,"author": "作者-3"
-    ,"content": "以食物为窗口，读懂中国——通过美食，使人们可以有滋有味地认知这个古老的东方国度。“一方水土一方人”，本片将通过展示人们日常生活中与美食相关的多重侧面，描绘与感知中国人的文化传统、家族观念、生活态度与故土难离。人们收获、保存、烹饪、生产美食，并在其过程中留存和传承食物所承载的味觉记忆、饮食习俗、文化样态与家常情感将世界美食和中国美食进行比照。春耕、夏耘、秋收、冬藏，天人合一的东方哲学让中国饮食依时而变，智慧灵动，中医营养摄生学说创造了食材运用的新天地，儒家人伦道德则把心意和家的味道端上我们的餐桌。淘洗历史，糅合时光，一代又一代的中国人在天地间升起烟火，用至精至诚的心意烹制食物，一餐一食之间，中国人展示个性，确认归属，构建文明，理解和把握着世界的奥妙。"
-    ,"uploadtime": 20161204
-    ,"status": false
-  },{
-    "id": "004"
-    ,"label": "历史"
-    ,"title": "诸葛亮骂王朗"
-    ,"author": "作者-1"
-    ,"content": "皓首匹夫！苍髯老贼！你即将命归于九泉之下，届时，有何面目见汉朝二十四代先帝？二臣贼子！你枉活七十有六，一生未立寸功，只会摇唇舞舌，助曹为虐！一条断脊之犬，还敢在我军阵前狺狺狂吠！我从未见过如此厚颜无耻之人！！！"
-    ,"uploadtime": 20180201
-    ,"status": false
-  },{
-    "id": "005"
-    ,"label": "新闻"
-    ,"title": "新时代特色中国梦"
-    ,"author": "作者-1"
-    ,"content": "今天，我们比历史上任何时期都更接近、更有信心和能力实现中华民族伟大复兴的目标。新时代已经到来，蓝图已经绘就，中国梦离我们越来越近了。"
-    ,"uploadtime": 20180512
-    ,"status": false
-  },{
-    "id": "006"
-    ,"label": "新闻"
-    ,"title": "新时代特色中国梦"
-    ,"author": "作者-2"
-    ,"content": "梦想不会主动走向我们，只有我们去主动实现梦想。行百里者半九十。虽然中国梦离我们越来越近了，但是要实现中国梦，还要靠我们以永不懈怠的精神状态、功在不舍的坚强意志，不忘初心，继续前进。"
-    ,"uploadtime": 20180514
-    ,"status": false
-  },{
-    "id": "007"
-    ,"label": "体育"
-    ,"title": "皇马大战利物浦"
-    ,"author": "作者-3"
-    ,"content": "对欧足联而言，更想要产生个新冠军。连续三年都是同一个冠军队，这会毁掉欧冠……”格里姆表态，“皇马有梦幻般的阵容，但从促进竞争的角度而言，另一支球队获胜会更好。"
-    ,"uploadtime": 20180515
-    ,"status": false
-  }]
-}

wwwroot/layuiadmin/json/content/tags.js

@@ -1,21 +0,0 @@
-{
-  "code": 0
-  ,"msg": ""
-  ,"count": "100"
-  ,"data": [{
-    "id": "001"
-    ,"tags": "美食"
-  },{
-    "id": "002"
-    ,"tags": "新闻"  
-  },{
-    "id": "003"
-    ,"tags": "八卦"
-  },{
-    "id": "004"
-    ,"tags": "体育"  
-  },{
-    "id": "005"
-    ,"tags": "音乐"
-  }]
-}

wwwroot/layuiadmin/json/forum/list.js

@@ -1,62 +0,0 @@
-{
-  "code": 0
-  ,"msg": ""
-  ,"count": "100"
-  ,"data": [{
-    "id": "1001"
-    ,"poster": "赵"
-    ,"avatar": "https://wx4.sinaimg.cn/mw1024/5db11ff4gy1fmx4keaw9pj20dw08caa4.jpg"
-    ,"content": "为什么花儿这么么红"
-    ,"posttime": 20160805
-    ,"top": false
-  },{
-    "id": "1002"
-    ,"poster": "钱"
-    ,"avatar": "https://wx4.sinaimg.cn/mw1024/5db11ff4gy1fmx4keaw9pj20dw08caa4.jpg"
-    ,"content": "喜欢胡歌，赞赞赞"
-    ,"posttime": 20161205
-    ,"top": true
-  },{
-    "id": "1003"
-    ,"poster": "孙"
-    ,"avatar": "https://wx4.sinaimg.cn/mw1024/5db11ff4gy1fmx4keaw9pj20dw08caa4.jpg"
-    ,"content": "明天就要考试了，好紧张，求保佑"
-    ,"posttime": 20170405
-    ,"top": false
-  },{
-    "id": "1004"
-    ,"poster": "李"
-    ,"avatar": "https://wx4.sinaimg.cn/mw1024/5db11ff4gy1fmx4keaw9pj20dw08caa4.jpg"
-    ,"content": "希望明天是个好天气" 
-    ,"posttime": 20171005
-    ,"top": false
-  },{
-    "id": "1005"
-    ,"poster": "周"
-    ,"avatar": "https://wx4.sinaimg.cn/mw1024/5db11ff4gy1fmx4keaw9pj20dw08caa4.jpg"
-    ,"content": "女追男隔层纱，是不是真的"
-    ,"posttime": 20180205
-    ,"top": false
-  },{
-    "id": "1006"
-    ,"poster": "吴"
-    ,"avatar": "https://wx4.sinaimg.cn/mw1024/5db11ff4gy1fmx4keaw9pj20dw08caa4.jpg"
-    ,"content": "竟然有人跳楼，年轻人想不开啊！" 
-    ,"posttime": 20180512
-    ,"top": false
-  },{
-    "id": "1007"
-    ,"poster": "郑"
-    ,"avatar": "https://wx4.sinaimg.cn/mw1024/5db11ff4gy1fmx4keaw9pj20dw08caa4.jpg"
-    ,"content": "大家一定不能学那个年轻人，珍爱生命啊"
-    ,"posttime": 20180512
-    ,"top": false
-  },{
-    "id": "1008"
-    ,"poster": "王"
-    ,"avatar": "https://wx4.sinaimg.cn/mw1024/5db11ff4gy1fmx4keaw9pj20dw08caa4.jpg"
-    ,"content": "想知道南昌哪里有好吃的西安肉夹馍"
-    ,"posttime": 20180514
-    ,"top": false
-  }]
-}

wwwroot/layuiadmin/json/forum/replys.js

@@ -1,69 +0,0 @@
-{
-  "code": 0
-  ,"msg": ""
-  ,"count": "100"
-  ,"data": [{
-    "id": "001"
-    ,"replyer": "吴"
-    ,"cardid": "1002"
-    ,"avatar": "https://wx2.sinaimg.cn/mw690/5db11ff4gy1fmx4kec5bvj20eb0h3mxh.jpg"
-    ,"content": "有眼光，我也喜欢胡歌！"
-    ,"replytime": 20161205
-  },{
-    "id": "002"
-    ,"replyer": "郑"
-    ,"cardid": "1002"
-    ,"avatar": "https://wx2.sinaimg.cn/mw690/5db11ff4gy1fmx4kec5bvj20eb0h3mxh.jpg"
-    ,"content": "同上同上。"
-    ,"replytime": 20161205
-  },{
-    "id": "003"
-    ,"replyer": "王"
-    ,"cardid": "1003"
-    ,"avatar": "https://wx2.sinaimg.cn/mw690/5db11ff4gy1fmx4kec5bvj20eb0h3mxh.jpg"
-    ,"content": "能过一定过，不能过紧张也没用"
-    ,"replytime": 20170405
-  },{
-    "id": "004"
-    ,"replyer": "冯"
-    ,"cardid": "1001"
-    ,"avatar": "https://wx2.sinaimg.cn/mw690/5db11ff4gy1fmx4kec5bvj20eb0h3mxh.jpg"
-    ,"content": "可能因为你流鼻血了。" 
-    ,"replytime": 20170405
-  },{
-    "id": "005"
-    ,"replyer": "陈"
-    ,"cardid": "1003"
-    ,"avatar": "https://wx2.sinaimg.cn/mw690/5db11ff4gy1fmx4kec5bvj20eb0h3mxh.jpg"
-    ,"content": "加油加油，看好你"
-    ,"replytime": 20170405
-  },{
-    "id": "006"
-    ,"replyer": "褚"
-    ,"cardid": "1005"
-    ,"avatar": "https://wx2.sinaimg.cn/mw690/5db11ff4gy1fmx4kec5bvj20eb0h3mxh.jpg"
-    ,"content": "纯属放屁" 
-    ,"replytime": 20180207
-  },{
-    "id": "007"
-    ,"replyer": "卫"
-    ,"cardid": "1005"
-    ,"avatar": "https://wx2.sinaimg.cn/mw690/5db11ff4gy1fmx4kec5bvj20eb0h3mxh.jpg"
-    ,"content": "可以试试"
-    ,"replytime": 20180207
-  },{
-    "id": "006"
-    ,"replyer": "蒋"
-    ,"cardid": "1006"
-    ,"avatar": "https://wx2.sinaimg.cn/mw690/5db11ff4gy1fmx4kec5bvj20eb0h3mxh.jpg"
-    ,"content": "是啊是啊，太恐怖了。" 
-    ,"replytime": 20180512
-  },{
-    "id": "007"
-    ,"replyer": "沈"
-    ,"cardid": "1008"
-    ,"avatar": "https://wx2.sinaimg.cn/mw690/5db11ff4gy1fmx4kec5bvj20eb0h3mxh.jpg"
-    ,"content": "魏家凉皮的凉皮就很不错奥。"
-    ,"replytime": 20180515
-  }]
-}

wwwroot/layuiadmin/json/layer/photos.js

@@ -1,39 +0,0 @@
-{
-  "code": 0,
-  "msg": "",
-  "title": "JSON请求的相册",
-  "id": 8,
-  "start": 0,
-  "data": [
-    {
-      "alt": "layer",
-      "pid": 109,
-      "src": "https://wx4.sinaimg.cn/mw1024/5db11ff4gy1fmx4keaw9pj20dw08caa4.jpg",
-      "thumb": ""
-    },
-    {
-      "alt": "说好的，一起Fly",
-      "pid": 110,
-      "src": "https://wx4.sinaimg.cn/mw1024/5db11ff4gy1fmx4kebemcj20ga09saa1.jpg",
-      "thumb": ""
-    },
-    {
-      "alt": "佟丽娅女神",
-      "pid": 111,
-      "src": "https://wx2.sinaimg.cn/mw690/5db11ff4gy1fmx4kec5bvj20eb0h3mxh.jpg",
-      "thumb": ""
-    },
-    {
-      "alt": "凤姐是个好人",
-      "pid": 112,
-      "src": "https://wx3.sinaimg.cn/mw690/5db11ff4gy1fmx4kec9vuj20b20dwmyk.jpg",
-      "thumb": ""
-    },
-    {
-      "alt": "星空如此深邃",
-      "pid": 113,
-      "src": "https://wx3.sinaimg.cn/mw690/5db11ff4gy1fmx4keca8ag208g06iglw.gif",
-      "thumb": ""
-    }
-  ]
-}

wwwroot/layuiadmin/json/layim/getList.js

@@ -1,96 +0,0 @@
-{
-  "code": 0
-  ,"msg": ""
-  ,"data": {
-    "mine": {
-      "username": "纸飞机"
-      ,"id": "100000"
-      ,"status": "online"
-      ,"sign": "在深邃的编码世界，做一枚轻盈的纸飞机"
-      ,"avatar": "//res.layui.com/images/fly/avatar/00.jpg"
-    }
-    ,"friend": [{
-      "groupname": "知名人物"
-      ,"id": 0
-      ,"list": [{
-        "username": "贤心"
-        ,"id": "100001"
-        ,"avatar": "//tva1.sinaimg.cn/crop.0.0.118.118.180/5db11ff4gw1e77d3nqrv8j203b03cweg.jpg"
-        ,"sign": "这些都是测试数据，实际使用请严格按照该格式返回"
-        ,"status": "online"
-      },{
-        "username": "刘涛tamia"
-        ,"id": "100001222"
-        ,"sign": "如约而至，不负姊妹欢乐颂"
-        ,"avatar": "//tva4.sinaimg.cn/crop.0.1.1125.1125.180/475bb144jw8f9nwebnuhkj20v90vbwh9.jpg"
-      },{
-        "username": "谢楠"
-        ,"id": "10034001"
-        ,"avatar": "//tva2.sinaimg.cn/crop.1.0.747.747.180/633f068fjw8f9h040n951j20ku0kr74t.jpg"
-        ,"sign": ""
-      },{
-        "username": "马小云"
-        ,"id": "168168"
-        ,"avatar": "//tva1.sinaimg.cn/crop.0.0.180.180.180/7fde8b93jw1e8qgp5bmzyj2050050aa8.jpg"
-        ,"sign": "让天下没有难写的代码"
-      },{
-        "username": "徐小峥"
-        ,"id": "666666"
-        ,"avatar": "//tva1.sinaimg.cn/crop.0.0.512.512.180/6a4acad5jw8eqi6yaholjj20e80e8t9f.jpg"
-        ,"sign": "代码在囧途，也要写到底"
-      }]
-    },{
-      "groupname": "网红声优"
-      ,"id": 1
-      ,"list": [{
-        "username": "罗玉凤"
-        ,"id": "121286"
-        ,"avatar": "//tva4.sinaimg.cn/crop.0.0.640.640.180/4a02849cjw8fc8vn18vktj20hs0hs75v.jpg"
-        ,"sign": "在自己实力不济的时候，不要去相信什么媒体和记者。他们不是善良的人，有时候候他们的采访对当事人而言就是陷阱"
-      },{
-        "username": "Z_子晴"
-        ,"id": "108101"
-        ,"avatar": "//tva1.sinaimg.cn/crop.0.23.1242.1242.180/8693225ajw8fbimjimpjwj20yi0zs77l.jpg"
-        ,"sign": "微电商达人"
-      },{
-        "username": "大鱼_MsYuyu"
-        ,"id": "12123454"
-        ,"avatar": "//tva2.sinaimg.cn/crop.0.0.512.512.180/005LMAegjw8f2bp9qg4mrj30e80e8dg5.jpg"
-        ,"sign": "我瘋了！這也太準了吧  超級笑點低"
-      },{
-        "username": "醋醋cucu"
-        ,"id": "102101"
-        ,"avatar": "//tva2.sinaimg.cn/crop.0.0.640.640.180/648fbe5ejw8ethmg0u9egj20hs0ht0tn.jpg"
-        ,"sign": ""
-      },{
-        "username": "柏雪近在它香"
-        ,"id": "3435343"
-        ,"avatar": "//tva2.sinaimg.cn/crop.0.8.751.751.180/961a9be5jw8fczq7q98i7j20kv0lcwfn.jpg"
-        ,"sign": ""
-      }]
-    },{
-      "groupname": "女神艺人"
-      ,"id": 2
-      ,"list": [{
-        "username": "王祖贤"
-        ,"id": "76543"
-        ,"avatar": "//wx2.sinaimg.cn/mw690/5db11ff4gy1flxmew7edlj203d03wt8n.jpg"
-        ,"sign": "我爱贤心"
-      },{
-        "username": "佟丽娅"
-        ,"id": "4803920"
-        ,"avatar": "//tva3.sinaimg.cn/crop.0.0.750.750.180/5033b6dbjw8etqysyifpkj20ku0kuwfw.jpg"
-        ,"sign": "我也爱贤心吖吖啊"
-      }]
-    }]
-    ,"group": [{
-      "groupname": "前端群"
-      ,"id": "101"
-      ,"avatar": "//tva1.sinaimg.cn/crop.0.0.200.200.50/006q8Q6bjw8f20zsdem2mj305k05kdfw.jpg"
-    },{
-      "groupname": "Fly社区官方群"
-      ,"id": "102"
-      ,"avatar": "//tva2.sinaimg.cn/crop.0.0.199.199.180/005Zseqhjw1eplix1brxxj305k05kjrf.jpg"
-    }]
-  }
-}

wwwroot/layuiadmin/json/layim/getMembers.js

@@ -1,67 +0,0 @@
-{
-  "code": 0
-  ,"msg": ""
-  ,"data": {
-    "list": [{
-      "username": "贤心"
-      ,"id": "100001"
-      ,"avatar": "//tva1.sinaimg.cn/crop.0.0.118.118.180/5db11ff4gw1e77d3nqrv8j203b03cweg.jpg"
-      ,"sign": "这些都是测试数据，实际使用请严格按照该格式返回"
-    },{
-      "username": "Z_子晴"
-      ,"id": "108101"
-      ,"avatar": "//tva1.sinaimg.cn/crop.0.23.1242.1242.180/8693225ajw8fbimjimpjwj20yi0zs77l.jpg"
-      ,"sign": "微电商达人"
-    },{
-      "username": "Lemon_CC"
-      ,"id": "102101"
-      ,"avatar": "//tva4.sinaimg.cn/crop.0.0.180.180.180/6d424ea5jw1e8qgp5bmzyj2050050aa8.jpg"
-      ,"sign": ""
-    },{
-      "username": "马小云"
-      ,"id": "168168"
-      ,"avatar": "//tva1.sinaimg.cn/crop.0.0.180.180.180/7fde8b93jw1e8qgp5bmzyj2050050aa8.jpg"
-      ,"sign": "让天下没有难写的代码"
-    },{
-      "username": "徐小峥"
-      ,"id": "666666"
-      ,"avatar": "//tva1.sinaimg.cn/crop.0.0.512.512.180/6a4acad5jw8eqi6yaholjj20e80e8t9f.jpg"
-      ,"sign": "代码在囧途，也要写到底"
-    },{
-      "username": "罗玉凤"
-      ,"id": "121286"
-      ,"avatar": "//tva4.sinaimg.cn/crop.0.0.640.640.180/4a02849cjw8fc8vn18vktj20hs0hs75v.jpg"
-      ,"sign": "在自己实力不济的时候，不要去相信什么媒体和记者。他们不是善良的人，有时候候他们的采访对当事人而言就是陷阱"
-    },{
-      "username": "刘涛tamia"
-      ,"id": "100001222"
-      ,"avatar": "//tva4.sinaimg.cn/crop.0.1.1125.1125.180/475bb144jw8f9nwebnuhkj20v90vbwh9.jpg"
-      ,"sign": "如约而至，不负姊妹欢乐颂"
-    },{
-        "username": "大鱼_MsYuyu"
-        ,"id": "12123454"
-        ,"avatar": "//tva2.sinaimg.cn/crop.0.0.512.512.180/005LMAegjw8f2bp9qg4mrj30e80e8dg5.jpg"
-        ,"sign": "我瘋了！這也太準了吧  超級笑點低"
-      },{
-        "username": "谢楠"
-        ,"id": "10034001"
-        ,"avatar": "//tva2.sinaimg.cn/crop.1.0.747.747.180/633f068fjw8f9h040n951j20ku0kr74t.jpg"
-        ,"sign": ""
-      },{
-        "username": "柏雪近在它香"
-        ,"id": "3435343"
-        ,"avatar": "//tva2.sinaimg.cn/crop.0.8.751.751.180/961a9be5jw8fczq7q98i7j20kv0lcwfn.jpg"
-        ,"sign": ""
-      },{
-        "username": "林心如"
-        ,"id": "76543"
-        ,"avatar": "//tva3.sinaimg.cn/crop.0.0.512.512.180/48f122e6jw8fcmi072lkyj20e80e8t9i.jpg"
-        ,"sign": "我爱贤心"
-      },{
-        "username": "佟丽娅"
-        ,"id": "4803920"
-        ,"avatar": "//tva3.sinaimg.cn/crop.0.0.750.750.180/5033b6dbjw8etqysyifpkj20ku0kuwfw.jpg"
-        ,"sign": "我也爱贤心吖吖啊"
-      }]
-  }
-}

wwwroot/layuiadmin/json/mall/order.js

@@ -1,42 +0,0 @@
-{
-  "code": 0
-  ,"msg": ""
-  ,"count": "100"
-  ,"data": [{
-    "invoice": "X123565541"
-    ,"username": "张小三"
-    ,"orderDate": "2017-11-10"
-    ,"amount": 800
-    ,"status": 1
-  },{
-    "invoice": "X123565542"
-    ,"username": "李小四"
-    ,"orderDate": "2017-11-10"
-    ,"amount": 800
-    ,"status": 0
-  },{
-    "invoice": "X123565543"
-    ,"username": "王老五"
-    ,"orderDate": "2017-11-10"
-    ,"amount": 800
-    ,"status": 1
-  },{
-    "invoice": "X123565544"
-    ,"username": "赵小六"
-    ,"orderDate": "2017-11-09"
-    ,"amount": 1600
-    ,"status": 1
-  },{
-    "invoice": "X123565545"
-    ,"username": "孙小七"
-    ,"orderDate": "2017-11-09"
-    ,"amount": 1600
-    ,"status": -1
-  },{
-    "invoice": "X123565546"
-    ,"username": "周小八"
-    ,"orderDate": "2017-11-08"
-    ,"amount": 2600
-    ,"status": 1
-  }]
-}

wwwroot/layuiadmin/json/menu.js

@@ -1,227 +0,0 @@
-{
-  "code": 0
-  ,"msg": ""
-  ,"data": [{
-    "name": "component"
-    ,"title": "组件"
-    ,"icon": "layui-icon-component"
-    ,"list": [{
-      "name": "grid"
-      ,"title": "栅格"
-      ,"list": [{
-        "name": "list"
-        ,"title": "等比例列表排列"
-      },{
-        "name": "mobile"
-        ,"title": "按移动端排列"
-      },{
-        "name": "mobile-pc"
-        ,"title": "移动桌面端组合"
-      },{
-        "name": "all"
-        ,"title": "全端复杂组合"
-      },{
-        "name": "stack"
-        ,"title": "低于桌面堆叠排列"
-      },{
-        "name": "speed-dial"
-        ,"title": "九宫格"
-      }]
-    }, {
-      "name": "button"
-      ,"title": "按钮"
-    }, {
-      "name": "form"
-      ,"title": "表单"
-      ,"list": [{
-        "name": "element"
-        ,"title": "表单元素"
-      },{
-        "name": "group"
-        ,"title": "表单组合"
-      }]
-    }, {
-      "name": "nav"
-      ,"title": "导航"
-    }, {
-      "name": "tabs"
-      ,"title": "选项卡"
-    }, {
-      "name": "progress"
-      ,"title": "进度条"
-    }, {
-      "name": "panel"
-      ,"title": "面板"
-    }, {
-      "name": "badge"
-      ,"title": "徽章"
-    }, {
-      "name": "timeline"
-      ,"title": "时间线"
-    }, {
-      "name": "anim"
-      ,"title": "动画"
-    }, {
-      "name": "auxiliar"
-      ,"title": "辅助"
-    }, {
-      "name": "layer"
-      ,"title": "通用弹层"
-      ,"list": [{
-        "name": "list"
-        ,"title": "功能演示"
-      },{
-        "name": "special-demo"
-        ,"title": "特殊示例"
-      },{
-        "name": "theme"
-        ,"title": "风格定制"
-      }]
-    }, {
-      "name": "laydate"
-      ,"title": "日期时间"
-    }, {
-      "name": "table"
-      ,"title": "表格"
-    }, {
-      "name": "laypage"
-      ,"title": "分页"
-    }, {
-      "name": "upload"
-      ,"title": "上传"
-    }, {
-      "name": "carousel"
-      ,"title": "轮播"
-    }, {
-      "name": "laytpl"
-      ,"title": "模板引擎"
-    }, {
-      "name": "flow"
-      ,"title": "流加载"
-    }, {
-      "name": "util"
-      ,"title": "工具"
-    }, {
-      "name": "code"
-      ,"title": "代码修饰"
-    }, {
-      "name": "layim"
-      ,"title": "即时聊天"
-      ,"jump": "senior/im/"
-    }]
-  }, {
-    "name": "template"
-    ,"title": "模板"
-    ,"icon": "layui-icon-template"
-    ,"list": [{
-      "name": "user"
-      ,"title": "用户相关"
-      ,"spread": true
-      ,"list": [{
-        "name": "reg"
-        ,"title": "注册"
-        ,"jump": "user/reg"
-      },{
-        "name": "login"
-        ,"title": "登入"
-        ,"jump": "user/login"
-      },{
-        "name": "forget"
-        ,"title": "忘记密码"
-        ,"jump": "user/forget"
-      }]
-    }, {
-      "name": "tips"
-      ,"title": "提示页面"
-      ,"spread": true
-      ,"list": [{
-        "name": "404"
-        ,"title": "404"
-      },{
-        "name": "error"
-        ,"title": "错误提示"
-      }]
-    }, {
-      "name": ""
-      ,"title": "内嵌页面"
-      ,"spread": true
-      ,"list": [{
-        "name": ""
-        ,"title": "百度一下"
-        ,"jump": "/iframe/link/baidu"
-      }, {
-        "name": ""
-        ,"title": "layui官网"
-        ,"jump": "/iframe/link/layui"
-      }, {
-        "name": ""
-        ,"title": "layuiAdmin官网"
-        ,"jump": "/iframe/link/layuiAdmin"
-      }]
-    }]
-  }, {
-    "name": "app"
-    ,"title": "应用"
-    ,"icon": "layui-icon-app"
-    ,"list": [{
-      "name": "message"
-      ,"title": "消息中心"
-    }]
-  }, {
-    "name": "senior"
-    ,"title": "高级"
-    ,"icon": "layui-icon-senior"
-    ,"list": [{
-      "name": "im"
-      ,"title": "通讯系统"
-    }]
-  }, {
-    "name": "user"
-    ,"title": "用户"
-    ,"icon": "layui-icon-user"
-    ,"list": [{
-      "name": "user"
-      ,"title": "用户"
-      ,"spread": true
-      ,"list": [{
-        "name": "list"
-        ,"title": "用户列表"
-      }]
-    },{
-      "name": "administrators"
-      ,"title": "后台管理组"
-      ,"spread": true
-      ,"list": [{
-        "name": "list"
-        ,"title": "管理员列表"
-      },{
-        "name": "role"
-        ,"title": "角色管理"
-      }]
-    }]
-  }, {
-    "name": "set"
-    ,"title": "设置"
-    ,"icon": "layui-icon-set"
-    ,"list": [{
-      "name": "base"
-      ,"title": "基本设置"
-      ,"spread": true
-      ,"list": [{
-        "name": "website"
-        ,"title": "系统设置"
-      },{
-        "name": "email"
-        ,"title": "邮件服务"
-      }]
-    },{
-      "name": "security"
-      ,"title": "安全设置"
-    }]
-  }, {
-    "name": "get"
-    ,"title": "授权"
-    ,"icon": "layui-icon-auz"
-    ,"jump": "system/get"
-  }]
-}

wwwroot/layuiadmin/json/menu1.js

@@ -1,271 +0,0 @@
-{
-  "code": 0
-  ,"msg": ""
-  ,"data": [{
-    "name": "component"
-    ,"title": "组件"
-    ,"icon": "layui-icon-component"
-    ,"list": [{
-      "name": "grid"
-      ,"title": "栅格"
-      ,"list": [{
-        "name": "list"
-        ,"title": "等比例列表排列"
-      },{
-        "name": "mobile"
-        ,"title": "按移动端排列"
-      },{
-        "name": "mobile-pc"
-        ,"title": "移动桌面端组合"
-      },{
-        "name": "all"
-        ,"title": "全端复杂组合"
-      },{
-        "name": "stack"
-        ,"title": "低于桌面堆叠排列"
-      },{
-        "name": "speed-dial"
-        ,"title": "九宫格"
-      }]
-    }, {
-      "name": "button"
-      ,"title": "按钮"
-    }, {
-      "name": "form"
-      ,"title": "表单"
-      ,"list": [{
-        "name": "element"
-        ,"title": "表单元素"
-      },{
-        "name": "group"
-        ,"title": "表单组合"
-      }]
-    }, {
-      "name": "nav"
-      ,"title": "导航"
-    }, {
-      "name": "tabs"
-      ,"title": "选项卡"
-    }, {
-      "name": "progress"
-      ,"title": "进度条"
-    }, {
-      "name": "panel"
-      ,"title": "面板"
-    }, {
-      "name": "badge"
-      ,"title": "徽章"
-    }, {
-      "name": "timeline"
-      ,"title": "时间线"
-    }, {
-      "name": "anim"
-      ,"title": "动画"
-    }, {
-      "name": "auxiliar"
-      ,"title": "辅助"
-    }, {
-      "name": "layer"
-      ,"title": "通用弹层"
-      ,"list": [{
-        "name": "list"
-        ,"title": "功能演示"
-      },{
-        "name": "special-demo"
-        ,"title": "特殊示例"
-      },{
-        "name": "theme"
-        ,"title": "风格定制"
-      }]
-    }, {
-      "name": "laydate"
-      ,"title": "日期时间"
-    }, {
-      "name": "table"
-      ,"title": "表格"
-    }, {
-      "name": "laypage"
-      ,"title": "分页"
-    }, {
-      "name": "upload"
-      ,"title": "上传"
-    }, {
-      "name": "carousel"
-      ,"title": "轮播"
-    }, {
-      "name": "laytpl"
-      ,"title": "模板引擎"
-    }, {
-      "name": "flow"
-      ,"title": "流加载"
-    }, {
-      "name": "util"
-      ,"title": "工具"
-    }, {
-      "name": "code"
-      ,"title": "代码修饰"
-    }, {
-      "name": "layim"
-      ,"title": "即时聊天"
-      ,"jump": "senior/im/chat"
-    }]
-  }, {
-    "name": "template"
-    ,"title": "模板"
-    ,"icon": "layui-icon-template"
-    ,"list": [{
-      "name": "user"
-      ,"title": "用户相关"
-      ,"spread": true
-      ,"list": [{
-        "name": "reg"
-        ,"title": "注册"
-        ,"jump": "user/reg"
-      },{
-        "name": "login"
-        ,"title": "登入"
-        ,"jump": "user/login"
-      },{
-        "name": "forget"
-        ,"title": "忘记密码"
-        ,"jump": "user/forget"
-      }]
-    }, {
-      "name": "tips"
-      ,"title": "提示页面"
-      ,"spread": true
-      ,"list": [{
-        "name": "404"
-        ,"title": "404"
-      },{
-        "name": "error"
-        ,"title": "错误提示"
-      }]
-    }]
-  }, {
-    "name": "app"
-    ,"title": "应用"
-    ,"icon": "layui-icon-app"
-    ,"list": [{
-      "name": "message"
-      ,"title": "消息中心"
-    },{
-      "name": "content"
-      ,"title": "内容系统"
-      ,"spread": true
-      ,"list": [{
-        "name": "list"
-        ,"title": "所有文章"
-      },{
-        "name": "comment"
-        ,"title": "评论管理"
-      },{
-        "name": "tags"
-        ,"title": "标签管理"
-      }]
-    },{
-      "name": "forum"
-      ,"title": "社区系统"
-      ,"spread": true
-      ,"list": [{
-        "name": "list"
-        ,"title": "全部帖子"
-      },{
-        "name": "replys"
-        ,"title": "所有回帖"
-      }]
-    },{
-      "name": "mall"
-      ,"title": "商城管理"
-      ,"spread": true
-      ,"list": [{
-        "name": "list"
-        ,"title": "商品列表"
-      },{
-        "name": "category"
-        ,"title": "分类管理"
-      },{
-        "name": "specs"
-        ,"title": "规格管理"
-      }]
-    }]
-  }, {
-    "name": "senior"
-    ,"title": "高级"
-    ,"icon": "layui-icon-senior"
-    ,"list": [{
-      "name": "im"
-      ,"title": "通讯系统"
-      ,"spread": true
-      ,"list": [{
-        "name": "chat"
-        ,"title": "社交聊天"
-      },{
-        "name": "kefu"
-        ,"title": "客服系统"
-      }]
-    },{
-      "name": "echarts"
-      ,"title": "Echarts 集成"
-      ,"spread": true
-      ,"list": [{
-        "name": "line"
-        ,"title": "折线图"
-      },{
-        "name": "bar"
-        ,"title": "柱状图"
-      },{
-        "name": "map"
-        ,"title": "地图"
-      }]
-    }]
-  }, {
-    "name": "user"
-    ,"title": "用户"
-    ,"icon": "layui-icon-user"
-    ,"list": [{
-      "name": "user"
-      ,"title": "用户"
-      ,"spread": true
-      ,"list": [{
-        "name": "list"
-        ,"title": "用户列表"
-      }]
-    },{
-      "name": "administrators"
-      ,"title": "后台管理组"
-      ,"spread": true
-      ,"list": [{
-        "name": "list"
-        ,"title": "管理员列表"
-      },{
-        "name": "role"
-        ,"title": "角色管理"
-      }]
-    }]
-  }, {
-    "name": "set"
-    ,"title": "设置"
-    ,"icon": "layui-icon-set"
-    ,"list": [{
-      "name": "base"
-      ,"title": "基本设置"
-      ,"spread": true
-      ,"list": [{
-        "name": "website"
-        ,"title": "系统设置"
-      },{
-        "name": "email"
-        ,"title": "邮件服务"
-      }]
-    },{
-      "name": "security"
-      ,"title": "安全设置"
-    }]
-  }, {
-    "name": "get"
-    ,"title": "授权"
-    ,"icon": "layui-icon-auz"
-    ,"jump": "system/get"
-  }]
-}

wwwroot/layuiadmin/json/message/all.js

@@ -1,46 +0,0 @@
-{
-  "code": 0
-  ,"msg": ""
-  ,"count": 60
-  ,"data": [{
-    "id": 123
-    ,"title": "你好新朋友，感谢使用 layuiAdmin"
-    ,"time": 1510363800000
-  }, {
-    "id": 111
-    ,"title": "贤心发来了一段私信"
-    ,"time": 1510212370000
-  }, {
-    "id": 111
-    ,"title": "贤心发来了一段私信"
-    ,"time": 1510212370000
-  }, {
-    "id": 111
-    ,"title": "贤心发来了一段私信"
-    ,"time": 1510212370000
-  }, {
-    "id": 111
-    ,"title": "贤心发来了一段私信"
-    ,"time": 1510212370000
-  }, {
-    "id": 111
-    ,"title": "贤心发来了一段私信"
-    ,"time": 1510212370000
-  }, {
-    "id": 111
-    ,"title": "贤心发来了一段私信"
-    ,"time": 1510212370000
-  }, {
-    "id": 111
-    ,"title": "贤心发来了一段私信"
-    ,"time": 1510212370000
-  }, {
-    "id": 111
-    ,"title": "贤心发来了一段私信"
-    ,"time": 1510212370000
-  }, {
-    "id": 111
-    ,"title": "贤心发来了一段私信"
-    ,"time": 1507447570000
-  }]
-}

wwwroot/layuiadmin/json/message/detail.js

@@ -1,10 +0,0 @@
-{
-  "code": 0
-  ,"msg": ""
-  ,"data": {
-    "id": 111
-    ,"title": "你好新朋友，感谢使用 layuiAdmin"
-    ,"content": "<p>一直以来，layui 秉承无偿开源的初心，虔诚致力于服务各层次前后端 Web 开发者，在商业横飞的当今时代，这一信念从未动摇。即便身单力薄，仍然重拾决心，埋头造轮，以尽可能地填补产品本身的缺口。在过去的一段的时间，我一直在寻求持久之道，已维持你眼前所见的一切。而 layuiAdmin 是我们尝试解决的手段之一。我相信真正有爱于 layui 生态的你，定然不会错过这一拥抱吧。</p><p>子曰：君子不用防，小人防不住。请务必通过官网正规渠道，获得 <a href=\"http://www.layui.com/admin/\" target=\"_blank\">layuiAdmin</a>！</p><p>—— 贤心（<a href=\"http://www.layui.com/\" target=\"_blank\">layui.com</a>）</p>"
-    ,"time": 1510363800000
-  }
-}

wwwroot/layuiadmin/json/message/direct.js

@@ -1,46 +0,0 @@
-{
-  "code": 0
-  ,"msg": ""
-  ,"count": 60
-  ,"data": [{
-    "id": 123
-    ,"title": "贤心发来了一段私信"
-    ,"time": 1510363800000
-  }, {
-    "id": 111
-    ,"title": "贤心发来了一段私信"
-    ,"time": 1510212370000
-  }, {
-    "id": 111
-    ,"title": "贤心发来了一段私信"
-    ,"time": 1510212370000
-  }, {
-    "id": 111
-    ,"title": "贤心发来了一段私信"
-    ,"time": 1510212370000
-  }, {
-    "id": 111
-    ,"title": "贤心发来了一段私信"
-    ,"time": 1510212370000
-  }, {
-    "id": 111
-    ,"title": "贤心发来了一段私信"
-    ,"time": 1510212370000
-  }, {
-    "id": 111
-    ,"title": "贤心发来了一段私信"
-    ,"time": 1510212370000
-  }, {
-    "id": 111
-    ,"title": "贤心发来了一段私信"
-    ,"time": 1510212370000
-  }, {
-    "id": 111
-    ,"title": "贤心发来了一段私信"
-    ,"time": 1510212370000
-  }, {
-    "id": 111
-    ,"title": "贤心发来了一段私信"
-    ,"time": 1507447570000
-  }]
-}

wwwroot/layuiadmin/json/message/new.js

@@ -1,7 +0,0 @@
-{
-  "code": 0
-  ,"msg": ""
-  ,"data": {
-    "newmsg": 3
-  }
-}

wwwroot/layuiadmin/json/message/notice.js

@@ -1,46 +0,0 @@
-{
-  "code": 0
-  ,"msg": ""
-  ,"count": 60
-  ,"data": [{
-    "id": 123
-    ,"title": "你好新朋友，感谢使用 layuiAdmin"
-    ,"time": 1510363800000
-  }, {
-    "id": 111
-    ,"title": "你好新朋友，感谢使用 layuiAdmin"
-    ,"time": 1510212370000
-  }, {
-    "id": 111
-    ,"title": "你好新朋友，感谢使用 layuiAdmin"
-    ,"time": 1510212370000
-  }, {
-    "id": 111
-    ,"title": "你好新朋友，感谢使用 layuiAdmin"
-    ,"time": 1510212370000
-  }, {
-    "id": 111
-    ,"title": "你好新朋友，感谢使用 layuiAdmin"
-    ,"time": 1510212370000
-  }, {
-    "id": 111
-    ,"title": "你好新朋友，感谢使用 layuiAdmin"
-    ,"time": 1510212370000
-  }, {
-    "id": 111
-    ,"title": "你好新朋友，感谢使用 layuiAdmin"
-    ,"time": 1510212370000
-  }, {
-    "id": 111
-    ,"title": "你好新朋友，感谢使用 layuiAdmin"
-    ,"time": 1510212370000
-  }, {
-    "id": 111
-    ,"title": "你好新朋友，感谢使用 layuiAdmin"
-    ,"time": 1510212370000
-  }, {
-    "id": 111
-    ,"title": "你好新朋友，感谢使用 layuiAdmin"
-    ,"time": 1507447570000
-  }]
-}

wwwroot/layuiadmin/json/table/demo.js

@@ -1,96 +0,0 @@
-
-{
-  "code": 0
-  ,"msg": ""
-  ,"count": 3000000
-  ,"data": [{
-    "id": "10001"
-    ,"username": "杜甫"
-    ,"email": "xianxin@layui.com"
-    ,"sex": "男"
-    ,"city": "浙江杭州"
-    ,"sign": "点击此处，显示更多。当内容超出时，点击单元格会自动显示更多内容。"
-    ,"experience": "116"
-    ,"ip": "192.168.0.8"
-    ,"logins": "108"
-    ,"joinTime": "2016-10-14"
-  }, {
-    "id": "10002"
-    ,"username": "李白"
-    ,"email": "xianxin@layui.com"
-    ,"sex": "男"
-    ,"city": "浙江杭州"
-    ,"sign": "君不见，黄河之水天上来，奔流到海不复回。 君不见，高堂明镜悲白发，朝如青丝暮成雪。 人生得意须尽欢，莫使金樽空对月。 天生我材必有用，千金散尽还复来。 烹羊宰牛且为乐，会须一饮三百杯。 岑夫子，丹丘生，将进酒，杯莫停。 与君歌一曲，请君为我倾耳听。(倾耳听 一作：侧耳听) 钟鼓馔玉不足贵，但愿长醉不复醒。(不足贵 一作：何足贵；不复醒 一作：不愿醒/不用醒) 古来圣贤皆寂寞，惟有饮者留其名。(古来 一作：自古；惟 通：唯) 陈王昔时宴平乐，斗酒十千恣欢谑。 主人何为言少钱，径须沽取对君酌。 五花马，千金裘，呼儿将出换美酒，与尔同销万古愁。"
-    ,"experience": "12"
-    ,"ip": "192.168.0.8"
-    ,"logins": "106"
-    ,"joinTime": "2016-10-14"
-    ,"LAY_CHECKED": true
-  }, {
-    "id": "10003"
-    ,"username": "王勃"
-    ,"email": "xianxin@layui.com"
-    ,"sex": "男"
-    ,"city": "浙江杭州"
-    ,"sign": "人生恰似一场修行"
-    ,"experience": "65"
-    ,"ip": "192.168.0.8"
-    ,"logins": "106"
-    ,"joinTime": "2016-10-14"
-  }, {
-    "id": "10004"
-    ,"username": "李清照"
-    ,"email": "xianxin@layui.com"
-    ,"sex": "女"
-    ,"city": "浙江杭州"
-    ,"sign": "人生恰似一场修行"
-    ,"experience": "666"
-    ,"ip": "192.168.0.8"
-    ,"logins": "106"
-    ,"joinTime": "2016-10-14"
-  }, {
-    "id": "10005"
-    ,"username": "冰心"
-    ,"email": "xianxin@layui.com"
-    ,"sex": "女"
-    ,"city": "浙江杭州"
-    ,"sign": "人生恰似一场修行"
-    ,"experience": "86"
-    ,"ip": "192.168.0.8"
-    ,"logins": "106"
-    ,"joinTime": "2016-10-14"
-  }, {
-    "id": "10006"
-    ,"username": "贤心"
-    ,"email": "xianxin@layui.com"
-    ,"sex": "男"
-    ,"city": "浙江杭州"
-    ,"sign": "人生恰似一场修行"
-    ,"experience": "12"
-    ,"ip": "192.168.0.8"
-    ,"logins": "106"
-    ,"joinTime": "2016-10-14"
-  }, {
-    "id": "10007"
-    ,"username": "贤心"
-    ,"email": "xianxin@layui.com"
-    ,"sex": "男"
-    ,"city": "浙江杭州"
-    ,"sign": "人生恰似一场修行"
-    ,"experience": "16"
-    ,"ip": "192.168.0.8"
-    ,"logins": "106"
-    ,"joinTime": "2016-10-14"
-  }, {
-    "id": "10008"
-    ,"username": "贤心"
-    ,"email": "xianxin@layui.com"
-    ,"sex": "男"
-    ,"city": "浙江杭州"
-    ,"sign": "人生恰似一场修行"
-    ,"experience": "106"
-    ,"ip": "192.168.0.8"
-    ,"logins": "106"
-    ,"joinTime": "2016-10-14"
-  }]
-}  

wwwroot/layuiadmin/json/table/demo2.js

@@ -1,61 +0,0 @@
-
-{
-  "code": 0
-  ,"msg": ""
-  ,"count": 66
-  ,"data": [{
-    "username": "张小三"
-    ,"amount": 18
-    ,"province": "浙江"
-    ,"city": "杭州"
-    ,"zone": "西湖区"
-    ,"street": "西溪街道"
-    ,"address": "西溪花园"
-    ,"house": "30栋1单元"
-  }, {
-    "username": "李小四"
-    ,"amount": 39
-    ,"province": "江苏"
-    ,"city": "苏州"
-    ,"zone": "姑苏区"
-    ,"street": "丝绸路"
-    ,"address": "天墅之城"
-    ,"house": "9幢2单元"
-  }, {
-    "username": "王小五"
-    ,"amount": 8
-    ,"province": "江西"
-    ,"city": "南昌"
-    ,"zone": "青山湖区"
-    ,"street": "艾溪湖办事处"
-    ,"address": "中兴和园"
-    ,"house": "1幢3单元"
-  }, {
-    "username": "赵小六"
-    ,"amount": 16
-    ,"province": "福建"
-    ,"city": "泉州"
-    ,"zone": "丰泽区"
-    ,"street": "南洋街道"
-    ,"address": "南洋村"
-    ,"house": "6幢1单元"
-  }, {
-    "username": "孙小七"
-    ,"amount": 12
-    ,"province": "湖北"
-    ,"city": "武汉"
-    ,"zone": "武昌区"
-    ,"street": "武昌大道"
-    ,"address": "两湖花园"
-    ,"house": "16幢2单元"
-  }, {
-    "username": "周小八"
-    ,"amount": 11
-    ,"province": "安徽"
-    ,"city": "黄山"
-    ,"zone": "黄山区"
-    ,"street": "汤口镇"
-    ,"address": "温泉村"
-    ,"house": "21号"
-  }]
-}  

wwwroot/layuiadmin/json/table/user.js

@@ -1,2 +0,0 @@
-
-{"code":0,"msg":"","count":1000,"data":[{"id":10000,"username":"user-0","sex":"女","city":"城市-0","sign":"签名-0","experience":255,"logins":24,"wealth":82830700,"classify":"作家","score":57},{"id":10001,"username":"user-1","sex":"男","city":"城市-1","sign":"签名-1","experience":884,"logins":58,"wealth":64928690,"classify":"词人","score":27},{"id":10002,"username":"user-2","sex":"女","city":"城市-2","sign":"签名-2","experience":650,"logins":77,"wealth":6298078,"classify":"酱油","score":31},{"id":10003,"username":"user-3","sex":"女","city":"城市-3","sign":"签名-3","experience":362,"logins":157,"wealth":37117017,"classify":"诗人","score":68},{"id":10004,"username":"user-4","sex":"男","city":"城市-4","sign":"签名-4","experience":807,"logins":51,"wealth":76263262,"classify":"作家","score":6},{"id":10005,"username":"user-5","sex":"女","city":"城市-5","sign":"签名-5","experience":173,"logins":68,"wealth":60344147,"classify":"作家","score":87},{"id":10006,"username":"user-6","sex":"女","city":"城市-6","sign":"签名-6","experience":982,"logins":37,"wealth":57768166,"classify":"作家","score":34},{"id":10007,"username":"user-7","sex":"男","city":"城市-7","sign":"签名-7","experience":727,"logins":150,"wealth":82030578,"classify":"作家","score":28},{"id":10008,"username":"user-8","sex":"男","city":"城市-8","sign":"签名-8","experience":951,"logins":133,"wealth":16503371,"classify":"词人","score":14},{"id":10009,"username":"user-9","sex":"女","city":"城市-9","sign":"签名-9","experience":484,"logins":25,"wealth":86801934,"classify":"词人","score":75}]}

wwwroot/layuiadmin/json/upload/demo.js

@@ -1,7 +0,0 @@
-{
-  "code": 0,
-  "msg": "",
-  "data": {
-    "src": "https://wx2.sinaimg.cn/mw690/5db11ff4gy1fmx4kec5bvj20eb0h3mxh.jpg"
-  }
-}

wwwroot/layuiadmin/json/user/forget.js

@@ -1,7 +0,0 @@
-{
-  "code": 0
-  ,"msg": "注册成功"
-  ,"data": {
-    
-  }
-}

wwwroot/layuiadmin/json/user/login.js

@@ -1,7 +0,0 @@
-{
-  "code": 0
-  ,"msg": "登入成功"
-  ,"data": {
-    "access_token": "c262e61cd13ad99fc650e6908c7e5e65b63d2f32185ecfed6b801ee3fbdd5c0a"
-  }
-}

wwwroot/layuiadmin/json/user/logout.js

@@ -1,5 +0,0 @@
-{
-  "code": 0
-  ,"msg": "退出成功"
-  ,"data": null
-}

wwwroot/layuiadmin/json/user/reg.js

@@ -1,7 +0,0 @@
-{
-  "code": 0
-  ,"msg": "注册成功"
-  ,"data": {
-    
-  }
-}

wwwroot/layuiadmin/json/user/resetpass.js

@@ -1,7 +0,0 @@
-{
-  "code": 0
-  ,"msg": "注册成功"
-  ,"data": {
-    
-  }
-}

wwwroot/layuiadmin/json/user/session.js

@@ -1,9 +0,0 @@
-{
-  "code": 0
-  ,"msg": ""
-  ,"data": {
-    "username": "贤心"
-    ,"sex": "男"
-    ,"role": 1
-  }
-}

wwwroot/layuiadmin/json/user/sms.js

@@ -1,7 +0,0 @@
-{
-  "code": 0
-  ,"msg": "注册成功"
-  ,"data": {
-    
-  }
-}

wwwroot/layuiadmin/json/useradmin/mangadmin.js

@@ -1,78 +0,0 @@
-{
-  "code": 0
-  ,"msg": ""
-  ,"count": "100"
-  ,"data": [{
-    "id": "1001"
-    ,"loginname": "admin"
-    ,"telphone": "11111111111"
-    ,"email": "111@qq.com"
-    ,"role": "超级管理员"
-    ,"jointime": "20150217"
-    ,"check": true
-  },{
-    "id": "1002"
-    ,"loginname": "common-1"
-    ,"telphone": "22222222222"
-    ,"email": "222@qq.com"
-    ,"role": "管理员"
-    ,"jointime": "20160217"
-    ,"check": false
-  },{
-    "id": "1003"
-    ,"loginname": "common-2"
-    ,"telphone": "33333333333"
-    ,"email": "333@qq.com"
-    ,"role": "管理员"
-    ,"jointime": "20161012"
-    ,"check": false
-  },{
-    "id": "1004"
-    ,"loginname": "common-3"
-    ,"telphone": "44444444444"
-    ,"email": "444@qq.com"
-    ,"role": "管理员"
-    ,"jointime": "20170518"
-    ,"check": true
-  },{
-    "id": "1005"
-    ,"loginname": "common-4"
-    ,"telphone": "55555555555"
-    ,"email": "555@qq.com"
-    ,"role": "管理员"
-    ,"jointime": "20180101"
-    ,"check": false
-  },{
-    "id": "1006"
-    ,"loginname": "common-5"
-    ,"telphone": "66666666666"
-    ,"email": "666@qq.com"
-    ,"role": "管理员"
-    ,"jointime": "20160217"
-    ,"check": false
-  },{
-    "id": "1007"
-    ,"loginname": "common-6"
-    ,"telphone": "77777777777"
-    ,"email": "777@qq.com"
-    ,"role": "管理员"
-    ,"jointime": "20161012"
-    ,"check": false
-  },{
-    "id": "1008"
-    ,"loginname": "common-7"
-    ,"telphone": "88888888888"
-    ,"email": "888@qq.com"
-    ,"role": "管理员"
-    ,"jointime": "20170518"
-    ,"check": true
-  },{
-    "id": "1009"
-    ,"loginname": "common-8"
-    ,"telphone": "99999999999"
-    ,"email": "999@qq.com"
-    ,"role": "管理员"
-    ,"jointime": "20180101"
-    ,"check": false
-  }]
-}

wwwroot/layuiadmin/json/useradmin/role.js

@@ -1,54 +0,0 @@
-{
-  "code": 0
-  ,"msg": ""
-  ,"count": "100"
-  ,"data": [{
-    "id": "1"
-    ,"rolename": "超级管理员"
-    ,"limits": "管理所有的管理员"
-    ,"descr": "拥有至高无上的权利"
-    ,"check": true
-  },{
-    "id": "2"
-    ,"rolename": "管理员"
-    ,"limits": "所有列表的管理"
-    ,"descr": "事情很多，权力很大"
-    ,"check": true
-  },{
-    "id": "3"
-    ,"rolename": "文章撰写员"
-    ,"limits": "负责文章的编写"
-    ,"descr": "文采第一的人才集合"
-    ,"check": false
-  },{
-    "id": "4"
-    ,"rolename": "纠错员"
-    ,"limits": "负责文章内容的修改"
-    ,"descr": "暂无"
-    ,"check": false
-  },{
-    "id": "5"
-    ,"rolename": "统计人员"
-    ,"limits": "对数据进行统计"
-    ,"descr": "暂无"
-    ,"check": false
-  },{
-    "id": "6"
-    ,"rolename": "评估员"
-    ,"limits": "对统计数据进行评估"
-    ,"descr": "及时捕捉市场发展动态"
-    ,"check": false
-  },{
-    "id": "7"
-    ,"rolename": "采购员"
-    ,"limits": "负责员工的伙食"
-    ,"descr": "暂无"
-    ,"check": false
-  },{
-    "id": "8"
-    ,"rolename": "推销员"
-    ,"limits": "介绍销售公司产品"
-    ,"descr": "暂无"
-    ,"check": false
-  }]
-}

wwwroot/layuiadmin/json/useradmin/webuser.js

@@ -1,143 +0,0 @@
-{
-  "code": 0
-  ,"msg": ""
-  ,"count": "100"
-  ,"data": [{
-    "id": "001"
-    ,"username": "用户-1"
-    ,"avatar": "https://wx4.sinaimg.cn/mw1024/5db11ff4gy1fmx4keaw9pj20dw08caa4.jpg"
-    ,"phone": 12345678901
-    ,"email": "11111@qq.com"
-    ,"sex": "男"
-    ,"ip": "1111111"
-    ,"jointime": 20171204
-  },{
-    "id": "002"
-    ,"username": "用户-2"
-    ,"avatar": "https://wx4.sinaimg.cn/mw1024/5db11ff4gy1fmx4keaw9pj20dw08caa4.jpg"
-    ,"phone": 12345678901
-    ,"email": "11111@qq.com"
-    ,"sex": "男"
-    ,"ip": "1111111"
-    ,"jointime": 20171204
-  },{
-    "id": "003"
-    ,"username": "用户-3"
-    ,"avatar": "https://wx2.sinaimg.cn/mw690/5db11ff4gy1fmx4kec5bvj20eb0h3mxh.jpg"
-    ,"phone": 12345678901
-    ,"email": "11111@qq.com"
-    ,"sex": "女"
-    ,"ip": "1111111"
-    ,"jointime": 20171011
-    ,"LAY_CHECKED": true
-  },{
-    "id": "004"
-    ,"username": "用户-4"
-    ,"avatar": "https://wx4.sinaimg.cn/mw1024/5db11ff4gy1fmx4keaw9pj20dw08caa4.jpg"
-    ,"phone": 12345678901
-    ,"email": "11111@qq.com"
-    ,"sex": "男"
-    ,"ip": "1111111"
-    ,"jointime": 20160505
-  },{
-    "id": "005"
-    ,"username": "用户-5"
-    ,"avatar": "https://wx2.sinaimg.cn/mw690/5db11ff4gy1fmx4kec5bvj20eb0h3mxh.jpg"
-    ,"phone": 12345678901
-    ,"email": "11111@qq.com"
-    ,"sex": "男"
-    ,"ip": "1111111"
-    ,"jointime": 20171204
-  },{
-   "id": "006"
-    ,"username": "用户-6"
-    ,"avatar": "https://wx2.sinaimg.cn/mw690/5db11ff4gy1fmx4kec5bvj20eb0h3mxh.jpg"
-    ,"phone": 12345678901
-    ,"email": "11111@qq.com"
-    ,"sex": "男"
-    ,"ip": "1111111"
-    ,"jointime": 20171204
-  },{
-    "id": "007"
-    ,"username": "用户-7"
-    ,"avatar": "https://wx3.sinaimg.cn/mw690/5db11ff4gy1fmx4keca8ag208g06iglw.gif"
-    ,"phone": 12345678901
-    ,"email": "11111@qq.com"
-    ,"sex": "男"
-    ,"ip": "1111111"
-    ,"jointime": 20180210
-  },{
-    "id": "008"
-    ,"username": "用户-8"
-    ,"avatar": "https://wx2.sinaimg.cn/mw690/5db11ff4gy1fmx4kec5bvj20eb0h3mxh.jpg"
-    ,"phone": 12345678901
-    ,"email": "11111@qq.com"
-    ,"sex": "女"
-    ,"ip": "1111111"
-    ,"jointime": 20171204
-  },{
-   "id": "009"
-    ,"username": "用户-9"
-    ,"avatar": "https://wx2.sinaimg.cn/mw690/5db11ff4gy1fmx4kec5bvj20eb0h3mxh.jpg"
-    ,"phone": 12345678901
-    ,"email": "11111@qq.com"
-    ,"sex": "女"
-    ,"ip": "1111111"
-    ,"jointime": 20171204
-  },{
-    "id": "010"
-    ,"username": "用户-10"
-    ,"avatar": "https://wx4.sinaimg.cn/mw1024/5db11ff4gy1fmx4keaw9pj20dw08caa4.jpg"
-    ,"phone": 12345678901
-    ,"email": "11111@qq.com"
-    ,"sex": "男"
-    ,"ip": "1111111"
-    ,"jointime": 20170719
-  },{
-    "id": "011"
-    ,"username": "用户-11"
-    ,"avatar": "https://wx2.sinaimg.cn/mw690/5db11ff4gy1fmx4kec5bvj20eb0h3mxh.jpg"
-    ,"phone": 12345678901
-    ,"email": "11111@qq.com"
-    ,"sex": "男"
-    ,"ip": "1111111"
-    ,"jointime": 20171204
-  },{
-    "id": "012"
-    ,"username": "用户-12"
-    ,"avatar": "https://wx2.sinaimg.cn/mw690/5db11ff4gy1fmx4kec5bvj20eb0h3mxh.jpg"
-    ,"phone": 12345678901
-    ,"email": "11111@qq.com"
-    ,"sex": "女"
-    ,"ip": "1111111"
-    ,"jointime": 20171204
-  },{
-    "id": "013"
-    ,"username": "用户-13"
-    ,"avatar": "https://wx2.sinaimg.cn/mw690/5db11ff4gy1fmx4kec5bvj20eb0h3mxh.jpg"
-    ,"phone": 12345678901
-    ,"email": "11111@qq.com"
-    ,"sex": "女"
-    ,"ip": "1111111"
-    ,"jointime": 20171204
-    ,"LAY_CHECKED": true
-  },{
-    "id": "014"
-    ,"username": "用户-14"
-    ,"avatar": "https://wx3.sinaimg.cn/mw690/5db11ff4gy1fmx4keca8ag208g06iglw.gif"
-    ,"phone": 12345678901
-    ,"email": "11111@qq.com"
-    ,"sex": "男"
-    ,"ip": "1111111"
-    ,"jointime": 20171204
-  },{
-    "id": "015"
-    ,"username": "用户-15"
-    ,"avatar": "https://wx2.sinaimg.cn/mw690/5db11ff4gy1fmx4kec5bvj20eb0h3mxh.jpg"
-    ,"phone": 12345678901
-    ,"email": "11111@qq.com"
-    ,"sex": "男"
-    ,"ip": "1111111"
-    ,"jointime": 20171204
-  }]
-}

wwwroot/layuiadmin/json/workorder/demo.js

@@ -1,78 +0,0 @@
-{
-  "code": 0
-  ,"msg": ""
-  ,"count": "100"
-  ,"data": [{
-    "orderid": 111
-    ,"title": "移动支付踏入马来西亚，聚合支付紧随其后"
-    ,"attr": "公告"
-    ,"progress": "25%"
-    ,"submit": "贤心"
-    ,"accept": "员工-1"
-    ,"state": "处理中"
-  },{
-    "orderid": 222
-    ,"title": "凡科拖拽式免费建站神器，享双重优惠！"
-    ,"attr": "讨论"
-    ,"progress": "100%"
-    ,"submit": "猫吃"
-    ,"accept": "员工-1"
-    ,"state": "已处理"
-  },{
-    "orderid": 333
-    ,"title": "看着别人的老板给员工送汽车有感"
-    ,"attr": "分享"
-    ,"progress": "0%"
-    ,"submit": "纸飞机"
-    ,"accept": ""
-    ,"state": "未分配"
-  },{
-    "orderid": 444
-    ,"title": "DISCUZ的云平台应该彻底完了"
-    ,"attr": "提问"
-    ,"progress": "0%"
-    ,"submit": "纸飞机"
-    ,"accept": ""
-    ,"state": "未分配"
-  },{
-    "orderid": 555
-    ,"title": "现在个人网站还有必要长期坚持下去吗？"
-    ,"attr": "提问"
-    ,"progress": "50%"
-    ,"submit": "纸飞机"
-    ,"accept": "员工-2"
-    ,"state": "处理中"
-  },{
-    "orderid": 666
-    ,"title": "向北京公安局投诉了京东商城"
-    ,"attr": "公告"
-    ,"progress": "25%"
-    ,"submit": "纸飞机"
-    ,"accept": "员工-3"
-    ,"state": "处理中"
-  },{
-    "orderid": 777
-    ,"title": "游戏 网页美工，一个月多少工资才正常？"
-    ,"attr": "提问"
-    ,"progress": "100%"
-    ,"submit": "纸飞机"
-    ,"accept": "员工-1"
-    ,"state": "已处理"
-  },{
-    "orderid": 888
-    ,"title": "几年没来了，蓝色理想帖子这么少了啊"
-    ,"attr": "提问"
-    ,"progress": "0%"
-    ,"submit": "纸飞机"
-    ,"accept": ""
-    ,"state": "未分配"
-  },{
-    "orderid": 999
-    ,"title": "我的天，求推荐靠谱的学习网站"
-    ,"attr": "提问"
-    ,"progress": "50%"
-    ,"submit": "纸飞机"
-    ,"accept": "员工-2"
-    ,"state": "处理中"
-  }]
-}

wwwroot/layuiadmin/json/说明.txt

@@ -1,3 +0,0 @@
-
-注意：这里是模拟的数据。
-实际应用时，请在模板文件（.html）中的 lay-url="" 和其它相关接口的 url 设置成你真实的接口地址