Merge branch 'feature-dgy-后台优化' into feature-dgy-机具回收

AppStart/ExcelHelper.cs

@@ -839,6 +839,7 @@ namespace MySystem
                                                         machine.IsPurchase = 0;
                                                         machine.LeaderUserId = 0;
                                                         machine.PreUserId = 0;
+                                                        PublicFunction.ClearPosHistory(db, SnNo); //清除机具历史记录
                                                         db.SaveChanges();
                                                         if (!storeData.ContainsKey(storefor.StoreId + "_" + BrandId))
                                                         {
@@ -1140,7 +1141,7 @@ namespace MySystem
                                                 {
                                                     UserAccount account = db.UserAccount.FirstOrDefault(m => m.Id == edit.UserId);
                                                     if (account != null)
-                                                    {
+                                                    {                                                        
                                                         account.QueryCount = 1;
                                                         decimal TradeAmount = edit.TradeAmount;
                                                         decimal BeforeTotalAmount = account.TotalAmount; //变更前总金额
@@ -1206,31 +1207,38 @@ namespace MySystem
                                                     if (account != null)
                                                     {
                                                         decimal TradeAmount = edit.TradeAmount;
-                                                        decimal BeforeTotalAmount = account.TotalAmount; //变更前总金额
-                                                        decimal BeforeFreezeAmount = account.FreezeAmount; //变更前冻结金额
-                                                        decimal BeforeBalanceAmount = account.BalanceAmount; //变更前余额
-                                                        account.BalanceAmount += TradeAmount;
-                                                        account.FreezeAmount -= TradeAmount;
-                                                        decimal AfterTotalAmount = account.TotalAmount; //变更后总金额
-                                                        decimal AfterFreezeAmount = account.FreezeAmount; //变更后冻结金额
-                                                        decimal AfterBalanceAmount = account.BalanceAmount; //变更后余额
-                                                        db.UserAccountRecord.Add(new UserAccountRecord()
+                                                        if(account.FreezeAmount < TradeAmount)
                                                         {
-                                                            CreateDate = DateTime.Now,
-                                                            UpdateDate = DateTime.Now,
-                                                            UserId = edit.UserId, //创客
-                                                            ChangeType = 6, //变动类型
-                                                            ProductType = 99, //产品类型
-                                                            ChangeAmount = TradeAmount, //变更金额
-                                                            BeforeTotalAmount = BeforeTotalAmount, //变更前总金额
-                                                            AfterTotalAmount = AfterTotalAmount, //变更后总金额
-                                                            BeforeFreezeAmount = BeforeFreezeAmount, //变更前冻结金额
-                                                            AfterFreezeAmount = AfterFreezeAmount, //变更后冻结金额
-                                                            BeforeBalanceAmount = BeforeBalanceAmount, //变更前余额
-                                                            AfterBalanceAmount = AfterBalanceAmount, //变更后余额
-                                                        });
-                                                        db.SaveChanges();
-                                                        RedisDbconn.Instance.Set("UserAccount:" + edit.UserId, account);
+                                                            RedisDbconn.Instance.AddList("ErrList" + checkKey, "提现记录单号为" + CashOrderNo + "的创客冻结金额异常");
+                                                        }
+                                                        else
+                                                        {
+                                                            decimal BeforeTotalAmount = account.TotalAmount; //变更前总金额
+                                                            decimal BeforeFreezeAmount = account.FreezeAmount; //变更前冻结金额
+                                                            decimal BeforeBalanceAmount = account.BalanceAmount; //变更前余额
+                                                            account.BalanceAmount += TradeAmount;
+                                                            account.FreezeAmount -= TradeAmount;
+                                                            decimal AfterTotalAmount = account.TotalAmount; //变更后总金额
+                                                            decimal AfterFreezeAmount = account.FreezeAmount; //变更后冻结金额
+                                                            decimal AfterBalanceAmount = account.BalanceAmount; //变更后余额
+                                                            db.UserAccountRecord.Add(new UserAccountRecord()
+                                                            {
+                                                                CreateDate = DateTime.Now,
+                                                                UpdateDate = DateTime.Now,
+                                                                UserId = edit.UserId, //创客
+                                                                ChangeType = 6, //变动类型
+                                                                ProductType = 99, //产品类型
+                                                                ChangeAmount = TradeAmount, //变更金额
+                                                                BeforeTotalAmount = BeforeTotalAmount, //变更前总金额
+                                                                AfterTotalAmount = AfterTotalAmount, //变更后总金额
+                                                                BeforeFreezeAmount = BeforeFreezeAmount, //变更前冻结金额
+                                                                AfterFreezeAmount = AfterFreezeAmount, //变更后冻结金额
+                                                                BeforeBalanceAmount = BeforeBalanceAmount, //变更前余额
+                                                                AfterBalanceAmount = AfterBalanceAmount, //变更后余额
+                                                            });
+                                                            db.SaveChanges();
+                                                            RedisDbconn.Instance.Set("UserAccount:" + edit.UserId, account);
+                                                        }
                                                     }
                                                 }
                                                 db.SaveChanges();

AppStart/OpExcelHelper.cs

@@ -183,31 +183,39 @@ namespace MySystem
                                                     if (account != null)
                                                     {
                                                         decimal TradeAmount = edit.TradeAmount;
-                                                        decimal BeforeTotalAmount = account.TotalAmount; //变更前总金额
-                                                        decimal BeforeFreezeAmount = account.FreezeAmount; //变更前冻结金额
-                                                        decimal BeforeBalanceAmount = account.BalanceAmount; //变更前余额
-                                                        account.BalanceAmount += TradeAmount;
-                                                        account.FreezeAmount -= TradeAmount;
-                                                        decimal AfterTotalAmount = account.TotalAmount; //变更后总金额
-                                                        decimal AfterFreezeAmount = account.FreezeAmount; //变更后冻结金额
-                                                        decimal AfterBalanceAmount = account.BalanceAmount; //变更后余额
-                                                        db.UserAccountRecord.Add(new UserAccountRecord()
+                                                        if(account.FreezeAmount < TradeAmount)
                                                         {
-                                                            CreateDate = DateTime.Now,
-                                                            UpdateDate = DateTime.Now,
-                                                            UserId = edit.UserId, //创客
-                                                            ChangeType = 6, //变动类型
-                                                            ProductType = 99, //产品类型
-                                                            ChangeAmount = TradeAmount, //变更金额
-                                                            BeforeTotalAmount = BeforeTotalAmount, //变更前总金额
-                                                            AfterTotalAmount = AfterTotalAmount, //变更后总金额
-                                                            BeforeFreezeAmount = BeforeFreezeAmount, //变更前冻结金额
-                                                            AfterFreezeAmount = AfterFreezeAmount, //变更后冻结金额
-                                                            BeforeBalanceAmount = BeforeBalanceAmount, //变更前余额
-                                                            AfterBalanceAmount = AfterBalanceAmount, //变更后余额
-                                                        });
-                                                        db.SaveChanges();
-                                                        RedisDbconn.Instance.Set("OpUserAccount:" + edit.UserId, account);
+                                                            // TODO: 需要返回错误提示消息
+                                                            // RedisDbconn.Instance.AddList("ErrList" + checkKey, "提现记录单号为" + CashOrderNo + "的创客冻结金额异常");
+                                                        }
+                                                        else
+                                                        {
+                                                            decimal BeforeTotalAmount = account.TotalAmount; //变更前总金额
+                                                            decimal BeforeFreezeAmount = account.FreezeAmount; //变更前冻结金额
+                                                            decimal BeforeBalanceAmount = account.BalanceAmount; //变更前余额
+                                                            account.BalanceAmount += TradeAmount;
+                                                            account.FreezeAmount -= TradeAmount;
+                                                            decimal AfterTotalAmount = account.TotalAmount; //变更后总金额
+                                                            decimal AfterFreezeAmount = account.FreezeAmount; //变更后冻结金额
+                                                            decimal AfterBalanceAmount = account.BalanceAmount; //变更后余额
+                                                            db.UserAccountRecord.Add(new UserAccountRecord()
+                                                            {
+                                                                CreateDate = DateTime.Now,
+                                                                UpdateDate = DateTime.Now,
+                                                                UserId = edit.UserId, //创客
+                                                                ChangeType = 6, //变动类型
+                                                                ProductType = 99, //产品类型
+                                                                ChangeAmount = TradeAmount, //变更金额
+                                                                BeforeTotalAmount = BeforeTotalAmount, //变更前总金额
+                                                                AfterTotalAmount = AfterTotalAmount, //变更后总金额
+                                                                BeforeFreezeAmount = BeforeFreezeAmount, //变更前冻结金额
+                                                                AfterFreezeAmount = AfterFreezeAmount, //变更后冻结金额
+                                                                BeforeBalanceAmount = BeforeBalanceAmount, //变更前余额
+                                                                AfterBalanceAmount = AfterBalanceAmount, //变更后余额
+                                                            });
+                                                            db.SaveChanges();
+                                                            RedisDbconn.Instance.Set("OpUserAccount:" + edit.UserId, account);
+                                                        }
                                                     }
                                                 }
                                                 db.SaveChanges();

AppStart/PublicFunction.cs

@@ -439,6 +439,27 @@ namespace MySystem
 
         #endregion
 
+        #region 退回仓库，清除历史记录
+
+        public static void ClearPosHistory(WebCMSEntities db, string PosSn)
+        {
+            PreSendStockDetail prepos = db.PreSendStockDetail.FirstOrDefault(m => m.SnNo == PosSn && m.Status == 1);
+            if(prepos != null)
+            {
+                prepos.Status = -1;
+                prepos.ApplyFlag = 0;
+                // db.SaveChanges();
+            }
+            MachineApply apply = db.MachineApply.FirstOrDefault(m => m.SwapSnExpand.Contains(PosSn));
+            if(apply != null)
+            {
+                apply.SwapSnExpand = apply.SwapSnExpand.Replace(PosSn, PosSn.Substring(0, 3) + "d" + PosSn.Substring(4));
+                // db.SaveChanges();
+            }
+        }
+
+        #endregion
+
 
 
         #region 测试创客Id

Areas/Admin/Controllers/BsServer/AdvertismentController.cs

@@ -107,6 +107,7 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("PicPath", data.PicPath); //图片
             Fields.Add("Contents", data.Contents); //内容
             Fields.Add("Url", data.Url); //链接地址
+            Fields.Add("SeoTitle", data.SeoTitle); //参数
             Fields.Add("Status", 1);
 
             int Id = new AdminContentOther(_accessor.HttpContext, PublicFunction.BsTables).Add("Advertisment", Fields, 0);
@@ -154,6 +155,7 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("PicPath", data.PicPath); //图片
             Fields.Add("Contents", data.Contents); //内容
             Fields.Add("Url", data.Url); //链接地址
+            Fields.Add("SeoTitle", data.SeoTitle); //参数
 
             new AdminContentOther(_accessor.HttpContext, PublicFunction.BsTables).Edit("Advertisment", Fields, data.Id);
             AddSysLog(data.Id.ToString(), "Advertisment", "update");

Areas/Admin/Controllers/BsServer/MsgPlacardController.cs

@@ -164,16 +164,6 @@ namespace MySystem.Areas.Admin.Controllers
             AddSysLog(Id.ToString(), "MsgPlacard", "add");
             db.SaveChanges();
 
-            SetRedis(Id, true);
-
-            List<int> uids = db.Users.Select(m => m.Id).ToList();
-            foreach (int uid in uids)
-            {
-                MsgNotRead msg = RedisDbconn.Instance.Get<MsgNotRead>("MsgNotRead:" + uid) ?? new MsgNotRead();
-                msg.PlacardCount += 1;
-                RedisDbconn.Instance.Set("MsgNotRead:" + uid, msg);
-            }
-
             return "success";
         }
 

Areas/Admin/Controllers/MainServer/MerchantDepositReturnsController.cs

@@ -87,13 +87,15 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["MerchantIdMerRealName"] = merchantid_PosMerchantInfo.MerRealName;
                 dic["MerchantIdMerchantMobile"] = merchantid_PosMerchantInfo.MerchantMobile;
                 dic["MerchantIdMerIdcardNo"] = merchantid_PosMerchantInfo.MerIdcardNo;
+                dic["MerchantIdKqSnNo"] = merchantid_PosMerchantInfo.KqSnNo;
                 dic.Remove("MerchantId");
                 int Status = int.Parse(dic["Status"].ToString());
                 if (Status == 0) dic["StatusName"] = "待处理";
                 if (Status == 1) dic["StatusName"] = "成功";
                 if (Status == 2) dic["StatusName"] = "失败";
-                if (Status == 4) dic["StatusName"] = "通过";
-                if (Status == 5) dic["StatusName"] = "未通过";
+                // if (Status == 4) dic["StatusName"] = "通过";
+                // if (Status == 5) dic["StatusName"] = "未通过";
+                dic["BrandId"] = RelationClass.GetKqProductBrandInfo(int.Parse(merchantid_PosMerchantInfo.BrandId.ToString()));
                 //创客
                 int UserId = int.Parse(function.CheckInt(dic["UserId"].ToString()));
                 Users userid_Users = db.Users.FirstOrDefault(m => m.Id == UserId) ?? new Users();
@@ -181,6 +183,7 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["MerchantIdMerRealName"] = merchantid_PosMerchantInfo.MerRealName;
                 dic["MerchantIdMerchantMobile"] = merchantid_PosMerchantInfo.MerchantMobile;
                 dic["MerchantIdMerIdcardNo"] = merchantid_PosMerchantInfo.MerIdcardNo;
+                dic["MerchantIdKqSnNo"] = merchantid_PosMerchantInfo.KqSnNo;
                 dic.Remove("MerchantId");
                 int Status = int.Parse(dic["Status"].ToString());
                 if (Status == 0) dic["StatusName"] = "待处理";
@@ -188,6 +191,7 @@ namespace MySystem.Areas.Admin.Controllers
                 if (Status == 2) dic["StatusName"] = "失败";
                 if (Status == 4) dic["StatusName"] = "通过";
                 if (Status == 5) dic["StatusName"] = "未通过";
+                dic["BrandId"] = RelationClass.GetKqProductBrandInfo(int.Parse(merchantid_PosMerchantInfo.BrandId.ToString()));
                 //创客
                 int UserId = int.Parse(function.CheckInt(dic["UserId"].ToString()));
                 Users userid_Users = db.Users.FirstOrDefault(m => m.Id == UserId) ?? new Users();
@@ -386,7 +390,7 @@ namespace MySystem.Areas.Admin.Controllers
         }
         #endregion
 
-        #region 导入数据
+        #region 首台导入数据
         /// <summary>
         /// 导入数据
         /// </summary>
@@ -399,28 +403,66 @@ namespace MySystem.Areas.Admin.Controllers
             for (int i = 1; i < list.Count; i++)
             {
                 JsonData dr = list[i];
-                string SeoDescription = dr[0].ToString(); // 退押订单编号
-                int Status = int.Parse(dr[1].ToString()); // 审核结果
-                var merchantDepositReturns = db.MerchantDepositReturns.FirstOrDefault(m => m.SeoDescription == SeoDescription && m.Status == 0) ?? new MerchantDepositReturns();
-                if (true)
+                string PosSn = dr[0].ToString(); // 退押机具Sn
+                int Status = int.Parse(dr[1].ToString()); // 结果
+                string SeoDescription = dr[2].ToString(); // 备注
+                var pos = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == PosSn) ?? new PosMachinesTwo();
+                var merchantDepositReturns = db.MerchantDepositReturns.FirstOrDefault(m => m.MerchantId == pos.BindMerchantId && m.Status == 0) ?? new MerchantDepositReturns();
+                if (merchantDepositReturns.Id == 0)
                 {
-                    merchantDepositReturns.Id = 0;
-                    error += "以下操作失败" + SeoDescription + ',' + "该订单未找到或不符合规则" + '\n';
+                    error += "以下操作失败,机具" + PosSn + ',' + "对应的退押订单" + merchantDepositReturns.SeoKeyword + "该订单未找到或不符合规则" + '\n';
                 }
-                if (Status == 1)
+                //失败
+                if (Status == 2)
                 {
-                    Status = 4;
+                    var posm = db.PosMerchantInfo.FirstOrDefault(m => m.Id == merchantDepositReturns.MerchantId) ?? new PosMerchantInfo();
+                    posm.StandardStatus = 101;
                 }
-                else if (Status == 2)
+                merchantDepositReturns.Status = Status;
+                merchantDepositReturns.UpdateDate = DateTime.Now;
+                merchantDepositReturns.SeoDescription = SeoDescription;
+                merchantDepositReturns.SeoTitle = SysUserName + "-" + SysRealName;
+            }
+            if (!string.IsNullOrEmpty(error))
+            {
+                return "Warning|" + error;
+            }
+            db.SaveChanges();
+            return "success";
+        }
+        #endregion
+
+        #region 非首台导入数据
+        /// <summary>
+        /// 导入数据
+        /// </summary>
+        /// <param name="ExcelData"></param>
+        public string Imports(string ExcelData)
+        {
+            ExcelData = HttpUtility.UrlDecode(ExcelData);
+            JsonData list = JsonMapper.ToObject(ExcelData);
+            string error = "";
+            for (int i = 1; i < list.Count; i++)
+            {
+                JsonData dr = list[i];
+                string PosSn = dr[0].ToString(); // 退押机具Sn
+                int Status = int.Parse(dr[1].ToString()); // 结果
+                string SeoDescription = dr[2].ToString(); // 备注
+                var pos = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == PosSn) ?? new PosMachinesTwo();
+                var merchantDepositReturns = db.MerchantDepositReturns.FirstOrDefault(m => m.MerchantId == pos.BindMerchantId && m.Status == 0) ?? new MerchantDepositReturns();
+                if (merchantDepositReturns.Id == 0)
                 {
-                    Status = 5;
+                    error += "以下操作失败,机具" + PosSn + ',' + "对应的退押订单" + merchantDepositReturns.SeoKeyword + "该订单未找到或不符合规则" + '\n';
                 }
-                else
+                //失败
+                if (Status == 2)
                 {
-                    Status = 0;
+                    var posm = db.PosMerchantInfo.FirstOrDefault(m => m.Id == merchantDepositReturns.MerchantId) ?? new PosMerchantInfo();
+                    posm.StandardStatus = 101;
                 }
                 merchantDepositReturns.Status = Status;
                 merchantDepositReturns.UpdateDate = DateTime.Now;
+                merchantDepositReturns.SeoDescription = SeoDescription;
                 merchantDepositReturns.SeoTitle = SysUserName + "-" + SysRealName;
             }
             if (!string.IsNullOrEmpty(error))
@@ -449,7 +491,10 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 int id = int.Parse(subid);
                 var merchantDepositReturns = db.MerchantDepositReturns.FirstOrDefault(m => m.Id == id && m.Status == 4) ?? new MerchantDepositReturns();
-                Ids += Id + ",";
+                if (merchantDepositReturns.Id > 0)
+                {
+                    Ids += subid + ",";
+                }
             }
             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 + "'");
@@ -460,7 +505,7 @@ namespace MySystem.Areas.Admin.Controllers
 
         #endregion
 
-        #region 导出Excel
+        #region 首台导出Excel
 
         /// <summary>
         /// 导出Excel
@@ -470,9 +515,9 @@ namespace MySystem.Areas.Admin.Controllers
         {
             Dictionary<string, string> Fields = new Dictionary<string, string>();
             Fields.Add("AlipayAccountNo", "1"); //支付宝账号
-            Fields.Add("OrderNo", "1"); //退押订单号
+            Fields.Add("SeoKeyword", "1"); //退押订单号
 
-            string condition = " and Status>-1";
+            string condition = " and Status>-1 and QueryCount=1";
 
             //提现状态
             if (!string.IsNullOrEmpty(StatusSelect))
@@ -489,39 +534,41 @@ namespace MySystem.Areas.Admin.Controllers
             }
 
 
-            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("MerchantDepositReturns", Fields, "Id desc", "0", 1, 20000, condition, "Id,MerchantId,AlipayAccountNo,ReturnAmount,UserId", false);
+            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("MerchantDepositReturns", Fields, "Id desc", "0", 1, 20000, condition, "MerchantId,SeoKeyword,CreateDate,SeoDescription,AlipayAccountNo", false);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             foreach (Dictionary<string, object> dic in diclist)
             {
                 //商户
                 int MerchantId = int.Parse(function.CheckInt(dic["MerchantId"].ToString()));
+                var merchantDepositReturns = db.MerchantDepositReturns.FirstOrDefault(m => m.MerchantId == MerchantId) ?? new MerchantDepositReturns();
                 PosMerchantInfo merchantid_PosMerchantInfo = db.PosMerchantInfo.FirstOrDefault(m => m.Id == MerchantId) ?? new PosMerchantInfo();
                 dic["MerchantIdMerRealName"] = merchantid_PosMerchantInfo.MerRealName;
-                dic["MerchantIdMerchantMobile"] = merchantid_PosMerchantInfo.MerchantMobile;
-                dic["MerchantIdMerIdcardNo"] = merchantid_PosMerchantInfo.MerIdcardNo;
+                // dic["MerchantIdMerchantMobile"] = merchantid_PosMerchantInfo.MerchantMobile;
+                // dic["MerchantIdMerIdcardNo"] = merchantid_PosMerchantInfo.MerIdcardNo;
                 dic.Remove("MerchantId");
-                // dic["StatusName"] = dic["Status"].ToString() == "1" ? "正常" : "关闭";
-                //创客
-                int UserId = int.Parse(function.CheckInt(dic["UserId"].ToString()));
-                Users userid_Users = db.Users.FirstOrDefault(m => m.Id == UserId) ?? new Users();
-                dic["UserIdRealName"] = userid_Users.RealName;
-                dic["UserIdMakerCode"] = userid_Users.MakerCode;
-                dic.Remove("UserId");
-
+                dic["PosSn"] = merchantid_PosMerchantInfo.KqSnNo;
+                dic["BrandId"] = RelationClass.GetKqProductBrandInfo(int.Parse(merchantid_PosMerchantInfo.BrandId.ToString()));
+                // 实际返还金额
+                decimal amt = decimal.Parse(merchantDepositReturns.ReturnAmount.ToString());
+                dic["ReturnAmount"] = (amt * 0.92M).ToString("f2");
             }
 
             Dictionary<string, object> result = new Dictionary<string, object>();
-            result.Add("Status", "0");
+            // result.Add("Status", "0");
             result.Add("Info", "Excel报表-" + DateTime.Now.ToString("yyyy-MM-ddTHH:mm:ss") + ".xlsx");
             result.Add("Obj", diclist);
             Dictionary<string, object> ReturnFields = new Dictionary<string, object>();
-            ReturnFields.Add("Id", "记录ID");
-            // ReturnFields.Add("MerchantIdMerRealName", "商户真实姓名");
+            // ReturnFields.Add("Id", "记录ID");
+            ReturnFields.Add("CreateDate", "申请提现时间");
+            ReturnFields.Add("MerchantIdMerRealName", "商户真实姓名");
+            ReturnFields.Add("BrandId", "机具品牌");
+            ReturnFields.Add("PosSn", "机具Sn");
             // ReturnFields.Add("MerchantIdMerchantMobile", "商户手机号");
             // ReturnFields.Add("MerchantIdMerIdcardNo", "商户身份证号");
-            ReturnFields.Add("SeoDescription", "退押订单号");
+            ReturnFields.Add("SeoKeyword", "退押订单号");
             ReturnFields.Add("AlipayAccountNo", "支付宝账号");
-            ReturnFields.Add("ReturnAmount", "返还金额");
+            ReturnFields.Add("ReturnAmount", "实际返还金额");
+            ReturnFields.Add("SeoDescription", "备注");
             // ReturnFields.Add("UserIdRealName", "创客真实姓名");
             // ReturnFields.Add("UserIdMakerCode", "创客编号");
 
@@ -532,5 +579,81 @@ namespace MySystem.Areas.Admin.Controllers
 
         #endregion
 
+
+        #region 非首台导出Excel
+
+        /// <summary>
+        /// 导出Excel
+        /// </summary>
+        /// <returns></returns>
+        public JsonResult ExportExcels(MerchantDepositReturns data, string StatusSelect, string CreateDateData)
+        {
+            Dictionary<string, string> Fields = new Dictionary<string, string>();
+            Fields.Add("AlipayAccountNo", "1"); //支付宝账号
+            Fields.Add("SeoKeyword", "1"); //退押订单号
+
+            string condition = " and Status>-1 and QueryCount=0";
+
+            //提现状态
+            if (!string.IsNullOrEmpty(StatusSelect))
+            {
+                condition += " and Status=" + StatusSelect;
+            }
+            //创建时间
+            if (!string.IsNullOrEmpty(CreateDateData))
+            {
+                string[] datelist = CreateDateData.Split(new string[] { " - " }, StringSplitOptions.None);
+                string start = datelist[0];
+                string end = datelist[1];
+                condition += " and CreateDate>='" + start + " 00:00:00' and CreateDate<='" + end + " 23:59:59'";
+            }
+
+
+            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("MerchantDepositReturns", Fields, "Id desc", "0", 1, 20000, condition, "MerchantId,CreateDate,SeoKeyword,SeoDescription,AlipayAccountNo", false);
+            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
+            foreach (Dictionary<string, object> dic in diclist)
+            {
+                //商户
+                int MerchantId = int.Parse(function.CheckInt(dic["MerchantId"].ToString()));
+                var merchantDepositReturns = db.MerchantDepositReturns.FirstOrDefault(m => m.MerchantId == MerchantId) ?? new MerchantDepositReturns();
+                PosMerchantInfo merchantid_PosMerchantInfo = db.PosMerchantInfo.FirstOrDefault(m => m.Id == MerchantId) ?? new PosMerchantInfo();
+                dic["MerchantIdMerRealName"] = merchantid_PosMerchantInfo.MerRealName;
+                // dic["MerchantIdMerchantMobile"] = merchantid_PosMerchantInfo.MerchantMobile;
+                // dic["MerchantIdMerIdcardNo"] = merchantid_PosMerchantInfo.MerIdcardNo;
+                dic.Remove("MerchantId");
+                dic["PosSn"] = merchantid_PosMerchantInfo.KqSnNo;
+                dic["BrandId"] = RelationClass.GetKqProductBrandInfo(int.Parse(merchantid_PosMerchantInfo.BrandId.ToString()));
+                // 实际返还金额
+                decimal amt = decimal.Parse(merchantDepositReturns.ReturnAmount.ToString());
+                dic["ReturnAmount"] = (amt * 0.92M).ToString("f2");
+
+            }
+
+            Dictionary<string, object> result = new Dictionary<string, object>();
+            // result.Add("Status", "0");
+            result.Add("Info", "Excel报表-" + DateTime.Now.ToString("yyyy-MM-ddTHH:mm:ss") + ".xlsx");
+            result.Add("Obj", diclist);
+            Dictionary<string, object> ReturnFields = new Dictionary<string, object>();
+            // ReturnFields.Add("Id", "记录ID");
+            ReturnFields.Add("CreateDate", "申请提现时间");
+            ReturnFields.Add("MerchantIdMerRealName", "商户真实姓名");
+            ReturnFields.Add("BrandId", "机具品牌");
+            ReturnFields.Add("PosSn", "机具Sn");
+            // ReturnFields.Add("MerchantIdMerchantMobile", "商户手机号");
+            // ReturnFields.Add("MerchantIdMerIdcardNo", "商户身份证号");
+            ReturnFields.Add("SeoKeyword", "退押订单号");
+            ReturnFields.Add("AlipayAccountNo", "支付宝账号");
+            ReturnFields.Add("ReturnAmount", "实际返还金额");
+            ReturnFields.Add("SeoDescription", "备注");
+            // ReturnFields.Add("UserIdRealName", "创客真实姓名");
+            // ReturnFields.Add("UserIdMakerCode", "创客编号");
+
+            result.Add("Fields", ReturnFields);
+            AddSysLog("0", "MerchantDepositReturnsn", "ExportExcel");
+            return Json(result);
+        }
+
+        #endregion
+
     }
 }

Areas/Admin/Controllers/MainServer/PosMachinesTwoChangeController.cs

@@ -59,7 +59,7 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("PosSn", "1"); //SN编号
             Fields.Add("BrandId", "0"); //品牌
 
-            string condition = " and Status>-1 AND BindingState = 1 AND DATE_SUB(CURDATE(), INTERVAL 120 DAY) >= date(BindingTime) and UpFeeFlag=1 and DownFeeFlag=0 and SeoDescription!='设置成功'";
+            string condition = " and Status>-1 AND BindingState = 1 AND DATE_SUB(CURDATE(), INTERVAL 120 DAY) >= date(BindingTime) and UpFeeFlag=1 and DownFeeFlag=0 and (SeoDescription!='设置成功' or SeoDescription is null or SeoDescription='')";
             //绑定状态
             if (!string.IsNullOrEmpty(BindingStateSelect))
             {

Areas/Admin/Controllers/MainServer/StoreHouseController.cs

@@ -308,6 +308,7 @@ namespace MySystem.Areas.Admin.Controllers
                     {
                         return "您输入的仓库归属创客编号不存在，请重新输入正确的仓库归属创客编号";
                     }
+                    
                     Fields.Add("UserId", user.UserId); //仓库归属人
                     Fields.Add("Areas", data.Areas); //所属地区
                     Fields.Add("Address", data.Address); //仓库地址
@@ -336,6 +337,8 @@ namespace MySystem.Areas.Admin.Controllers
                     }
 
                     int Id = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Add("StoreHouse", Fields, 0);
+                    int StoreId = Id;
+                    var StoreNos = "";
                     //添加分仓创建时间
                     var users = db.Users.FirstOrDefault(m => m.Id == user.UserId) ?? new Users();
                     if (users.Id > 0)
@@ -356,6 +359,7 @@ namespace MySystem.Areas.Admin.Controllers
                         }
                         No = "S" + No;
                         edit.StoreNo = No;
+                        StoreNos = No;
                         db.StoreForCode.Add(new StoreForCode()
                         {
                             Code = No,
@@ -391,10 +395,35 @@ namespace MySystem.Areas.Admin.Controllers
                         account.FixedAmount = 20000;
                         account.ValidAmount = 20000;
                     }
-
+                    var check = db.StoreHouse.Any(m => m.Status > 0 && m.Sort == 0 && m.OpId > 0 && m.UserId == user.UserId);
+                    var OpId = 0;
+                    if (check)
+                    {
+                        var store = db.StoreHouse.FirstOrDefault(m => m.Status > 0 && m.Sort == 0 && m.OpId > 0 && m.UserId == user.UserId);
+                        OpId = store.OpId;
+                        edit.OpId = OpId;
+                        var sysAdmin = opdb.SysAdmin.FirstOrDefault(m => m.Sort == m.Id && m.UserId == OpId) ?? new OpModels.SysAdmin();
+                        sysAdmin.StoreCount += 1;
+                        var query = opdb.StoreForOperate.FirstOrDefault(m => m.OpId == sysAdmin.UserId && m.StoreId == StoreId && m.Sort == 0 && m.QueryCount == user.UserId && m.Status == 0);
+                        if (query == null)
+                        {
+                            query = opdb.StoreForOperate.Add(new OpModels.StoreForOperate()
+                            {
+                                CreateDate = DateTime.Now, //创建时间
+                                CreateMan = SysUserName + "_" + SysRealName,
+                                QueryCount = user.UserId,//分仓所属人Id
+                                SeoTitle = user.MakerCode,
+                                SeoKeyword = StoreNos,
+                                SeoDescription = data.StoreName,
+                                OpId = sysAdmin.UserId,
+                                StoreId = StoreId,
+                            }).Entity;
+                        }
+                    }
                     RedisDbconn.Instance.Set("StoreForName:" + data.StoreName, Id);
                     AddSysLog(data.Id.ToString(), "StoreHouse", "add");
                     db.SaveChanges();
+                    opdb.SaveChanges();
 
                     SetRedis(Id, user.UserId);
                 }
@@ -457,12 +486,18 @@ namespace MySystem.Areas.Admin.Controllers
                 return "您输入的仓库负责人编号不存在，请重新输入正确的仓库负责人编号";
             }
             var store = db.StoreHouse.Where(m => m.Sort == 0 && m.Status == 1 && m.UserId == user.UserId).ToList();
-            var userAccount = db.UserAccount.FirstOrDefault(m => m.Id == user.UserId) ?? new UserAccount();
-            if (userAccount.Id > 0)
+            UserAccount userAccount = db.UserAccount.FirstOrDefault(m => m.Id == user.UserId);
+            if (userAccount == null)
             {
-                userAccount.StoreDeposit = data.Deposit;
+                userAccount = db.UserAccount.Add(new UserAccount()
+                {
+                    Id = user.UserId,
+                    UserId = user.UserId,
+                }).Entity;
                 db.SaveChanges();
             }
+            userAccount.StoreDeposit = data.Deposit;
+            db.SaveChanges();
             RedisDbconn.Instance.AddList("ResetStoreReserveQueue", user.UserId.ToString());
             decimal olddeposit = 0;//旧押金
             decimal newdeposit = 0;//新押金
@@ -608,6 +643,8 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("Status", 1);
 
             int Id = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Add("StoreHouse", Fields, 0);
+            int StoreId = Id;
+            var StoreNos = "";
             //添加分仓创建时间
             var users = db.Users.FirstOrDefault(m => m.Id == user.UserId) ?? new Users();
             if (users.Id > 0)
@@ -628,6 +665,7 @@ namespace MySystem.Areas.Admin.Controllers
                 }
                 No = "S" + No;
                 edit.StoreNo = No;
+                StoreNos = No;
                 db.StoreForCode.Add(new StoreForCode()
                 {
                     Code = No,
@@ -648,10 +686,35 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 storeForName.StoreId = Id;
             }
+            var check = db.StoreHouse.Any(m => m.Status > 0 && m.Sort == 0 && m.OpId > 0 && m.UserId == user.UserId);
+            var OpId = 0;
+            if (check)
+            {
+                var store = db.StoreHouse.FirstOrDefault(m => m.Status > 0 && m.Sort == 0 && m.OpId > 0 && m.UserId == user.UserId);
+                OpId = store.OpId;
+                edit.OpId = OpId;
+                var sysAdmin = opdb.SysAdmin.FirstOrDefault(m => m.Sort == m.Id && m.UserId == OpId) ?? new OpModels.SysAdmin();
+                sysAdmin.StoreCount += 1;
+                var query = opdb.StoreForOperate.FirstOrDefault(m => m.OpId == sysAdmin.UserId && m.StoreId == StoreId && m.Sort == 0 && m.QueryCount == user.UserId && m.Status == 0);
+                if (query == null)
+                {
+                    query = opdb.StoreForOperate.Add(new OpModels.StoreForOperate()
+                    {
+                        CreateDate = DateTime.Now, //创建时间
+                        CreateMan = SysUserName + "_" + SysRealName,
+                        QueryCount = user.UserId,//分仓所属人Id
+                        SeoTitle = user.MakerCode,
+                        SeoKeyword = StoreNos,
+                        SeoDescription = data.StoreName,
+                        OpId = sysAdmin.UserId,
+                        StoreId = StoreId,
+                    }).Entity;
+                }
+            }
             RedisDbconn.Instance.Set("StoreForName:" + data.StoreName, Id);
             AddSysLog(data.Id.ToString(), "StoreHouse", "add");
             db.SaveChanges();
-
+            opdb.SaveChanges();
             SetRedis(Id, user.UserId);
             return "success";
         }
@@ -931,6 +994,7 @@ namespace MySystem.Areas.Admin.Controllers
                                 db.StoreChangeHistory.Add(new StoreChangeHistory()
                                 {
                                     CreateDate = DateTime.Now,
+                                    CreateMan = SysUserName,
                                     UserId = user.Id, //创客
                                     FromUserId = user.Id,//来源创客
                                     ToUserId = toStore.UserId,//接收创客
@@ -1005,6 +1069,7 @@ namespace MySystem.Areas.Admin.Controllers
                                 toStore.LaveNum += 1;
                                 fromStore.TotalNum -= 1;
                                 fromStore.LaveNum -= 1;
+                                PublicFunction.ClearPosHistory(db, posInfo.PosSn); //清除机具历史记录
                                 db.SaveChanges();
                             }
                             else
@@ -1034,6 +1099,7 @@ namespace MySystem.Areas.Admin.Controllers
                                 db.StoreChangeHistory.Add(new StoreChangeHistory()
                                 {
                                     CreateDate = DateTime.Now,
+                                    CreateMan = SysUserName,
                                     UserId = user.Id, //创客
                                     FromUserId = user.Id,//来源创客
                                     ToUserId = toStore.UserId,//接收创客
@@ -1090,6 +1156,7 @@ namespace MySystem.Areas.Admin.Controllers
                                 fuserMachineData.UnBindCount -= 1;
                                 toStore.LaveNum += 1;
                                 toStore.TotalNum += 1;
+                                PublicFunction.ClearPosHistory(db, posInfo.PosSn); //清除机具历史记录
                                 db.SaveChanges();
                             }
                             db.SaveChanges();

Areas/Admin/Controllers/MainServer/StoreMachineApplyController.cs

@@ -633,7 +633,7 @@ namespace MySystem.Areas.Admin.Controllers
                 if (BrandId == 7) FromStoreId = 1047;
                 if (BrandId == 8) FromStoreId = 4831;
                 if (BrandId == 9) FromStoreId = 4832;
-                tostore = db.StoreHouse.FirstOrDefault(m => m.UserId == apply.UserId && m.BrandId == BrandId.ToString() && m.Status > -1);
+                tostore = db.StoreHouse.FirstOrDefault(m => m.UserId == apply.UserId && m.BrandId == BrandId.ToString() && m.Status > -1 && m.Sort == 0);
                 SendInfo item = sendInfos.FirstOrDefault(m => m.FromStoreId == FromStoreId && m.ToStoreId == tostore.Id && m.BrandId == BrandId);
                 if (item == null)
                 {
@@ -654,7 +654,7 @@ namespace MySystem.Areas.Admin.Controllers
                 apply.SeoDescription = function.CheckString(SnNo) + ',';
 
                 fromstore = db.StoreHouse.FirstOrDefault(m => m.Id == FromStoreId);
-                tostore = db.StoreHouse.FirstOrDefault(m => m.UserId == apply.UserId && m.BrandId == BrandId.ToString() && m.Status > -1);
+                tostore = db.StoreHouse.FirstOrDefault(m => m.UserId == apply.UserId && m.BrandId == BrandId.ToString() && m.Status > -1 && m.Sort == 0);
 
                 MachineForSnNo machinefor = db.MachineForSnNo.FirstOrDefault(m => m.SnNo == SnNo) ?? new MachineForSnNo();
                 PosMachinesTwo machine = db.PosMachinesTwo.FirstOrDefault(m => m.Id == machinefor.SnId && m.BuyUserId == 0 && m.UserId == 0 && m.PreUserId == 0) ?? new PosMachinesTwo();

Areas/Admin/Controllers/MainServer/SysRechargeRecordController.cs

@@ -128,18 +128,21 @@ namespace MySystem.Areas.Admin.Controllers
             string BizAmount31 = "0.00";//活动奖励
             string BizAmount114 = "0.00";//私董会分红
             string BizAmount115 = "0.00";//分仓奖励
-            DataTable dt = OtherMySqlConn.dtable("SELECT SUM(if(BizType=30,Amount,0)),SUM(if(BizType=31,Amount,0)),SUM(if(BizType=114,Amount,0)),SUM(if(BizType=115,Amount,0)) FROM SysRechargeRecord where 1=1 " + condition);
+            string BizAmount126 = "0.00";//机具货款退还
+            DataTable dt = OtherMySqlConn.dtable("SELECT SUM(if(BizType=30,Amount,0)),SUM(if(BizType=31,Amount,0)),SUM(if(BizType=114,Amount,0)),SUM(if(BizType=115,Amount,0)),SUM(if(BizType=126,Amount,0)) FROM SysRechargeRecord where 1=1 " + condition);
             if (dt.Rows.Count > 0)
             {
                 BizAmount30 = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
                 BizAmount31 = decimal.Parse(function.CheckNum(dt.Rows[0][1].ToString())).ToString("f2");
                 BizAmount114 = decimal.Parse(function.CheckNum(dt.Rows[0][2].ToString())).ToString("f2");
                 BizAmount115 = decimal.Parse(function.CheckNum(dt.Rows[0][3].ToString())).ToString("f2");
+                BizAmount126 = decimal.Parse(function.CheckNum(dt.Rows[0][4].ToString())).ToString("f2");
             }
             other.Add("BizAmount30", BizAmount30);
             other.Add("BizAmount31", BizAmount31);
             other.Add("BizAmount114", BizAmount114);
             other.Add("BizAmount115", BizAmount115);
+            other.Add("BizAmount126", BizAmount126);
             obj.Add("other", other);
             return Json(obj);
         }

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -1475,10 +1475,10 @@ namespace MySystem.Areas.Admin.Controllers
                 // {
                 //     return "原机具未绑定";
                 // }
-                PosMachinesTwo newpos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == newForSnNo.SnId);
+                PosMachinesTwo newpos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == newForSnNo.SnId && m.PreUserId == 0);//添加新机是否为预发机判断
                 if (newpos == null)
                 {
-                    return "新机具SN不正确";
+                    return "新机具SN不正确或不满足条件";
                 }
                 oldPosBrand = db.KqProducts.FirstOrDefault(m => m.Id == oldpos.BrandId) ?? new KqProducts();
                 newPosBrand = db.KqProducts.FirstOrDefault(m => m.Id == newpos.BrandId) ?? new KqProducts();
@@ -1532,6 +1532,8 @@ namespace MySystem.Areas.Admin.Controllers
                     forMerNo.SnId = newpos.Id;
                 }
                 merchant.KqSnNo = NewSn;
+                merchant.ActiveStatus = newpos.ActivationState;
+                merchant.MerStandardDate = newpos.ActivationTime;
                 db.MachineChangeDetail.Add(new MachineChangeDetail()
                 {
                     CreateDate = DateTime.Now,
@@ -1651,10 +1653,10 @@ namespace MySystem.Areas.Admin.Controllers
                     {
                         return "您输入的坏机SN不存在或者不在" + MakerCode + "名下";
                     }
-                    PosMachinesTwo newpos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == newForSnNo.SnId && m.BindingState == 0) ?? new PosMachinesTwo();
+                    PosMachinesTwo newpos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == newForSnNo.SnId && m.BindingState == 0 && m.PreUserId == 0) ?? new PosMachinesTwo();
                     if (newpos.Id == 0)
                     {
-                        return "您输入的新机SN不存在";
+                        return "您输入的新机SN不存在或不满足条件";
                     }
                     StoreHouse storeFrom = db.StoreHouse.FirstOrDefault(m => m.Id == storeForCodeFrom.StoreId);
                     if (Convert.ToInt32(storeFrom.BrandId) != Convert.ToInt32(newpos.BrandId))
@@ -1754,6 +1756,7 @@ namespace MySystem.Areas.Admin.Controllers
                     oldpos.BuyUserId = 0;
                     oldpos.UserId = 0;
                     oldpos.Status = -1;
+                    PublicFunction.ClearPosHistory(db, oldpos.PosSn); //清除机具历史记录
                     db.SaveChanges();
 
                     PosMerchantInfo merchant = db.PosMerchantInfo.FirstOrDefault(m => m.Id == newpos.BindMerchantId);
@@ -1859,10 +1862,10 @@ namespace MySystem.Areas.Admin.Controllers
                     {
                         return "您输入的坏机SN不存在或者不在仓库" + StoreCode + "中";
                     }
-                    PosMachinesTwo newpos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == newForSnNo.SnId && m.BindingState == 0) ?? new PosMachinesTwo();
+                    PosMachinesTwo newpos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == newForSnNo.SnId && m.BindingState == 0 && m.PreUserId == 0) ?? new PosMachinesTwo();
                     if (newpos.Id == 0)
                     {
-                        return "您输入的新机SN不存在";
+                        return "您输入的新机SN不存在或不满足条件";
                     }
                     StoreHouse storeFrom = db.StoreHouse.FirstOrDefault(m => m.Id == storeForCodeFrom.StoreId);
                     if (Convert.ToInt32(storeFrom.BrandId) != Convert.ToInt32(oldpos.BrandId))
@@ -1942,6 +1945,7 @@ namespace MySystem.Areas.Admin.Controllers
                     oldpos.BuyUserId = 0;
                     oldpos.UserId = 0;
                     oldpos.Status = -1;
+                    PublicFunction.ClearPosHistory(db, oldpos.PosSn); //清除机具历史记录
                     db.SaveChanges();
 
                     BrokenMachineChange add = db.BrokenMachineChange.Add(new BrokenMachineChange()
@@ -3038,7 +3042,7 @@ namespace MySystem.Areas.Admin.Controllers
             bool check = db.FluxProfitDetail.Any(m => m.MerNo == merchant.KqMerNo);
             if (check)
             {
-                return "开机奖励已发放，请勿重复操作";
+                return "流量费奖励已发放，请勿重复操作";
             }
             SpModels.TradeFluxRecord trade = spdb.TradeFluxRecord.FirstOrDefault(m => m.TradeSnNo == pos.PosSn);
             if (trade != null)
@@ -3794,8 +3798,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 return "请输入商户手机号";
             }
-            // var posMerchant = db.PosMerchantInfo.FirstOrDefault(m => m.MerchantNo == MerchantNo && m.KqSnNo == PosSn && !function.CheckNull(m.MerIdcardNo).Contains("*") && m.MerchantName.StartsWith(MerchantName.Substring(0, 1))) ?? new PosMerchantInfo();
-            var posMerchant = db.PosMerchantInfo.FirstOrDefault(m => m.MerchantNo == MerchantNo && m.KqSnNo == PosSn && m.MerchantName.StartsWith(MerchantName.Substring(0, 1))) ?? new PosMerchantInfo();
+            var posMerchant = db.PosMerchantInfo.FirstOrDefault(m => m.KqMerNo == MerchantNo && m.KqSnNo == PosSn && m.MerchantName.StartsWith(MerchantName.Substring(0, 1))) ?? new PosMerchantInfo();
             var query = "";
             query += "修改前：" + posMerchant.KqSnNo + "," + posMerchant.MerchantNo + "," + posMerchant.MerchantName + "," + posMerchant.MerIdcardNo + "," + posMerchant.MerchantMobile;
             query += "修改后：" + PosSn + "," + MerchantNo + "," + MerchantName + "," + MerIdcardNo + "," + MerchantMobile;
@@ -3861,6 +3864,11 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 userInfo.UpdateDate = DateTime.Now;
                 userInfo.RealName = RealName;
+                userInfo.AuthFlag = 1;
+                if (userInfo.AuthDate == null)
+                {
+                    userInfo.AuthDate = DateTime.Now;
+                }
                 userInfo.CertId = CertId;
                 userInfo.SettleBankCardNo = BackCard;
                 userInfo.SettleBankCardName = BackName;
@@ -4120,6 +4128,7 @@ namespace MySystem.Areas.Admin.Controllers
                 oldpos.SourcePosSn = null;
                 oldpos.BuyUserId = 0;
                 oldpos.UserId = 0;
+                PublicFunction.ClearPosHistory(db, oldpos.PosSn); //清除机具历史记录
             }
             if (!string.IsNullOrEmpty(error))
             {
@@ -4423,6 +4432,7 @@ namespace MySystem.Areas.Admin.Controllers
                     pos.SourcePosSn = null;
                     pos.BuyUserId = 0;
                     pos.UserId = 0;
+                    PublicFunction.ClearPosHistory(db, pos.PosSn); //清除机具历史记录
                 }
                 else
                 {

Areas/Admin/Controllers/OperateServer/StoreHouseOperateController.cs

@@ -798,6 +798,7 @@ namespace MySystem.Areas.Admin.Controllers
                                 toStore.LaveNum += 1;
                                 fromStore.TotalNum -= 1;
                                 fromStore.LaveNum -= 1;
+                                PublicFunction.ClearPosHistory(db, posInfo.PosSn); //清除机具历史记录
                                 db.SaveChanges();
                             }
                             else
@@ -883,6 +884,7 @@ namespace MySystem.Areas.Admin.Controllers
                                 fuserMachineData.UnBindCount -= 1;
                                 toStore.LaveNum += 1;
                                 toStore.TotalNum += 1;
+                                PublicFunction.ClearPosHistory(db, posInfo.PosSn); //清除机具历史记录
                                 db.SaveChanges();
                             }
                             db.SaveChanges();

Areas/Admin/Controllers/SpServer/SpTradeRecordController.cs

@@ -57,6 +57,7 @@ namespace MySystem.Areas.Admin.Controllers
             Dictionary<string, string> Fields = new Dictionary<string, string>();
 
             Fields.Add("MerNo", "1"); //商户编号
+            Fields.Add("MerSnNo", "1"); //机具号
             Fields.Add("ChannelSerial", "1"); //渠道流水号
 
 

Areas/Admin/Controllers/SpServer/TradeFluxRecordController.cs

@@ -57,6 +57,7 @@ namespace MySystem.Areas.Admin.Controllers
             Dictionary<string, string> Fields = new Dictionary<string, string>();
 
             Fields.Add("MerNo", "1"); //商户编号
+            Fields.Add("TradeSnNo", "1"); //终端机身号
             Fields.Add("KqTradeSeq", "1"); //快钱交易流水号
 
 

Areas/Admin/Views/BsServer/Advertisment/Add.cshtml

@@ -75,9 +75,15 @@
                             <input class="layui-input" type="text" id="Url" name="Url" maxlength="max" lay-verify="" autocomplete="off" placeholder="请输入链接地址">
                         </div>
                     </div>
+                    <div class="layui-form-item">
+                        <label class="layui-form-label">参数</label>
+                        <div class="layui-input-block">
+                            <input class="layui-input" type="text" id="SeoTitle" name="SeoTitle" maxlength="max" lay-verify="" autocomplete="off" placeholder="请输入参数">
+                        </div>
+                    </div>
 
                 </div>
-                <div class="layui-tab-item">
+                @* <div class="layui-tab-item">
                     <div class="layui-form-item">
                         <label class="layui-form-label">网页标题</label>
                         <div class="layui-input-block">
@@ -97,7 +103,7 @@
                         </div>
                     </div>
 
-                </div>
+                </div> *@
 
             </div>
         </div>

Areas/Admin/Views/BsServer/Advertisment/Edit.cshtml

@@ -83,9 +83,15 @@
                             <input class="layui-input" type="text" id="Url" name="Url" value="@editData.Url" maxlength="max" lay-verify="" autocomplete="off" placeholder="请输入链接地址">
                         </div>
                     </div>
+                    <div class="layui-form-item">
+                        <label class="layui-form-label">参数</label>
+                        <div class="layui-input-block">
+                            <input class="layui-input" type="text" id="SeoTitle" name="SeoTitle" value="@editData.SeoTitle" maxlength="max" lay-verify="" autocomplete="off" placeholder="请输入参数">
+                        </div>
+                    </div>
 
                 </div>
-                <div class="layui-tab-item">
+                @* <div class="layui-tab-item">
                     <div class="layui-form-item">
                         <label class="layui-form-label">网页标题</label>
                         <div class="layui-input-block">
@@ -105,7 +111,7 @@
                         </div>
                     </div>
 
-                </div>
+                </div> *@
 
             </div>
         </div>

Areas/Admin/Views/BsServer/MsgPersonal/Add.cshtml

@@ -41,8 +41,7 @@
                                 <div class="layui-upload">
                                     <input type="hidden" id="BgPic" name="BgPic" value="">
                                     <button class="layui-btn" type="button" id="BgPicBtn">选择图片</button>
-                                    <div class="layui-inline layui-word-aux">@(new
-                                        MySystem.PublicFunction().GetUploadHint("MsgPersonalBgPic"))</div>
+                                    <div class="layui-inline layui-word-aux">@(new MySystem.PublicFunction().GetUploadHint("MsgPersonalBgPic"))</div>
                                 </div>
                                 <div style="margin-top:10px;" id="BgPicImage">
                                 </div>

Areas/Admin/Views/BsServer/MsgPlacard/Add.cshtml

@@ -1,163 +1,170 @@
 @{
     string RightInfo = ViewBag.RightInfo as string;
     string right = ViewBag.right as string;
-    
+
 }
 <!DOCTYPE html>
 <html>
+
 <head>
     <meta charset="utf-8">
     <title>公告消息(增加)</title>
     <meta name="renderer" content="webkit">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <meta name="viewport"
+        content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
     <link rel="stylesheet" href="/layuiadmin/layui/css/layui.css" media="all">
     <script src="/admin/js/jquery-1.10.1.min.js"></script>
     <script src="/admin/js/LAreaData2.js"></script>
     <style>
-        .layui-form-label{
+        .layui-form-label {
             width: 115px !important;
         }
-        .layui-form-item .layui-input-inline{
+
+        .layui-form-item .layui-input-inline {
             width: 250px !important;
         }
-        .layui-form-item .layui-input-block{
+
+        .layui-form-item .layui-input-block {
             margin-left: 145px !important;
         }
     </style>
 </head>
+
 <body>
 
     <div class="layui-form" lay-filter="layuiadmin-form-useradmin" id="layuiadmin-form-useradmin">
-        
+
         <div class="layui-card">
-          <div class="layui-card-body">
-            <div class="layui-tab" lay-filter="mytabbar">
-                <div class="layui-tab-content mt20">
-                    <div class="layui-tab-item layui-show">
-                        <div class="layui-form-item">
-                            <label class="layui-form-label">展示类型</label>
-                            <div class="layui-input-inline">
-                                <select id="ShowType" name="ShowType" lay-search="">
-                                    <option value="">请选择</option>
-                                    <option value="0">系统消息</option>
-                                    <option value="1">首页弹层提示</option>
-                                </select>
-                            </div>
-                        </div>
-                        <div class="layui-form-item">
-                            <label class="layui-form-label">消息类型</label>
-                            <div class="layui-input-inline">
-                                <select id="MsgType" name="MsgType" lay-search="" lay-filter="MsgType">
-                                    <option value="0">html页面</option>
-                                    <option value="1">指定url</option>
-                                    <option value="2">简单中文描述</option>
-                                </select>
+            <div class="layui-card-body">
+                <div class="layui-tab" lay-filter="mytabbar">
+                    <div class="layui-tab-content mt20">
+                        <div class="layui-tab-item layui-show">
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">展示类型</label>
+                                <div class="layui-input-inline">
+                                    <select id="ShowType" name="ShowType" lay-search="">
+                                        <option value="">请选择</option>
+                                        <option value="0">系统消息</option>
+                                        <option value="1">首页弹层提示</option>
+                                    </select>
+                                </div>
                             </div>
-                        </div>
-                        <div class="layui-form-item">
-                            <label class="layui-form-label">标题</label>
-                            <div class="layui-input-inline">
-                                <input class="layui-input" type="text" id="Title" name="Title" maxlength="50"
-                                    lay-verify="required," autocomplete="off" placeholder="请输入标题">
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">消息类型</label>
+                                <div class="layui-input-inline">
+                                    <select id="MsgType" name="MsgType" lay-search="" lay-filter="MsgType">
+                                        <option value="0">html页面</option>
+                                        <option value="1">指定url</option>
+                                        <option value="2">简单中文描述</option>
+                                    </select>
+                                </div>
                             </div>
-                        </div>
-                        <div class="layui-form-item layui-form-text">
-                            <label class="layui-form-label">推送内容</label>
-                            <div class="layui-input-inline">
-                                <textarea class="layui-textarea" id="Summary" name="Summary" maxlength="500"
-                                    lay-verify="" placeholder="请输入推送内容"></textarea>
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">标题</label>
+                                <div class="layui-input-inline">
+                                    <input class="layui-input" type="text" id="Title" name="Title" maxlength="50"
+                                        lay-verify="required," autocomplete="off" placeholder="请输入标题">
+                                </div>
                             </div>
-                        </div>
-                        <div class="layui-form-item">
-                            <label class="layui-form-label">有效开始时间</label>
-                            <div class="layui-input-inline">
-                                <input class="layui-input" type="text" id="EffectStartDate" name="EffectStartDate"
-                                    lay-verify="" autocomplete="off" placeholder="请输入有效开始时间">
+                            <div class="layui-form-item layui-form-text">
+                                <label class="layui-form-label">简介</label>
+                                <div class="layui-input-block">
+                                    <textarea class="layui-textarea" id="Summary" name="Summary" maxlength="500"
+                                        lay-verify="" placeholder="请输入简介"></textarea>
+                                </div>
                             </div>
-                        </div>
-                        <div class="layui-form-item">
-                            <label class="layui-form-label">有效结束时间</label>
-                            <div class="layui-input-inline">
-                                <input class="layui-input" type="text" id="EffectEndDate" name="EffectEndDate"
-                                    lay-verify="" autocomplete="off" placeholder="请输入有效结束时间">
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">有效开始时间</label>
+                                <div class="layui-input-inline">
+                                    <input class="layui-input" type="text" id="EffectStartDate" name="EffectStartDate"
+                                        lay-verify="" autocomplete="off" placeholder="请输入有效开始时间">
+                                </div>
                             </div>
-                        </div>
-                        <div class="layui-form-item">
-                            <label class="layui-form-label">背景图片</label>
-                            <div class="layui-input-block">
-                                <div class="layui-upload">
-                                    <input type="hidden" id="BgPic" name="BgPic" value="">
-                                    <button class="layui-btn" type="button" id="BgPicBtn">选择图片</button>
-                                    <div class="layui-inline layui-word-aux">@(new MySystem.PublicFunction().GetUploadHint("MsgPlacardBgPic"))</div>
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">有效结束时间</label>
+                                <div class="layui-input-inline">
+                                    <input class="layui-input" type="text" id="EffectEndDate" name="EffectEndDate"
+                                        lay-verify="" autocomplete="off" placeholder="请输入有效结束时间">
                                 </div>
-                                <div style="margin-top:10px;" id="BgPicImage">
+                            </div>
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">背景图片</label>
+                                <div class="layui-input-block">
+                                    <div class="layui-upload">
+                                        <input type="hidden" id="BgPic" name="BgPic" value="">
+                                        <button class="layui-btn" type="button" id="BgPicBtn">选择图片</button>
+                                        <div class="layui-inline layui-word-aux">@(new MySystem.PublicFunction().GetUploadHint("MsgPlacardBgPic"))</div>
+                                    </div>
+                                    <div style="margin-top:10px;" id="BgPicImage">
+                                    </div>
                                 </div>
                             </div>
-                        </div>
-                        <div class="layui-form-item">
-                            <label class="layui-form-label">推送类型</label>
-                            <div class="layui-input-inline">
-                                <select id="PushType" name="PushType" lay-search="" lay-filter="PushType">
-                                    <option value="0">不推送</option>
-                                    <option value="1">立即推送</option>
-                                    <option value="2">定时推送</option>
-                                </select>
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">推送类型</label>
+                                <div class="layui-input-inline">
+                                    <select id="PushType" name="PushType" lay-search="" lay-filter="PushType">
+                                        <option value="0">不推送</option>
+                                        <option value="1">立即推送</option>
+                                        <option value="2">定时推送</option>
+                                    </select>
+                                </div>
                             </div>
-                        </div>
-                        <div class="layui-form-item" id="PushParamDiv" style="display: none;">
-                            <label class="layui-form-label">推送参数</label>
-                            <div class="layui-input-inline">
-                                <input class="layui-input" type="text" id="PushParam" name="PushParam" maxlength="255"
-                                    lay-verify="" autocomplete="off" placeholder="请输入推送参数">
+                            <div class="layui-form-item" id="PushParamDiv" style="display: none;">
+                                <label class="layui-form-label">推送参数</label>
+                                <div class="layui-input-inline">
+                                    <input class="layui-input" type="text" id="PushParam" name="PushParam"
+                                        maxlength="255" lay-verify="" autocomplete="off" placeholder="请输入推送参数">
+                                </div>
                             </div>
-                        </div>
-                        <div class="layui-form-item" id="PushTimeDiv" style="display: none;">
-                            <label class="layui-form-label">推送时间</label>
-                            <div class="layui-input-inline">
-                                <input class="layui-input" type="text" id="PushTime" name="PushTime" lay-verify=""
-                                    autocomplete="off" placeholder="请输入推送时间">
+                            <div class="layui-form-item" id="PushTimeDiv" style="display: none;">
+                                <label class="layui-form-label">推送时间</label>
+                                <div class="layui-input-inline">
+                                    <input class="layui-input" type="text" id="PushTime" name="PushTime" lay-verify=""
+                                        autocomplete="off" placeholder="请输入推送时间">
+                                </div>
                             </div>
-                        </div>
-                        <div class="layui-form-item" id="UrlDiv" style="display: none;">
-                            <label class="layui-form-label">跳转Url</label>
-                            <div class="layui-input-block">
-                                <input class="layui-input" type="text" id="Url" name="Url" maxlength="500" lay-verify=""
-                                    autocomplete="off" placeholder="请输入跳转Url">
+                            <div class="layui-form-item" id="UrlDiv" style="display: none;">
+                                <label class="layui-form-label">跳转Url</label>
+                                <div class="layui-input-block">
+                                    <input class="layui-input" type="text" id="Url" name="Url" maxlength="500"
+                                        lay-verify="" autocomplete="off" placeholder="请输入跳转Url">
+                                </div>
                             </div>
-                        </div>
-                        <div class="layui-form-item layui-form-text" id="ContentDiv">
-                            <label class="layui-form-label">内容</label>
-                            <div class="layui-input-block">
-                                <textarea class="layui-textarea" id="Content" name="Content" placeholder="请输入内容"
-                                    style="width:100%;height:500px;"></textarea>
+                            <div class="layui-form-item layui-form-text" id="ContentDiv">
+                                <label class="layui-form-label">内容</label>
+                                <div class="layui-input-block">
+                                    <textarea class="layui-textarea" id="Content" name="Content" placeholder="请输入内容"
+                                        style="width:100%;height:500px;"></textarea>
+                                </div>
                             </div>
+
                         </div>
 
                     </div>
-
+                </div>
+                <div class="layui-form-item layui-hide">
+                    <input type="button" lay-submit lay-filter="LAY-list-front-submit" id="LAY-list-front-submit"
+                        value="确认">
                 </div>
             </div>
-            <div class="layui-form-item layui-hide">
-                <input type="button" lay-submit lay-filter="LAY-list-front-submit" id="LAY-list-front-submit" value="确认">
-            </div>
-          </div>
         </div>
     </div>
 
     <script src="/layuiadmin/layui/layui.js"></script>
-    <script src="/other/oss/upload-min@(MySystem.OssHelper.Instance.OssStatus ? "-oss" : "").js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
+    <script
+        src="/other/oss/upload-min@(MySystem.OssHelper.Instance.OssStatus ? "-oss" : "").js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
     <script src="/other/mybjq/kindeditor-min.js"></script>
     <script src="/other/mybjq/lang/zh_CN.js"></script>
     <script>
         //内容
- @(Html.Raw(Library.Control.kindeditorVar("Content")))
+        @(Html.Raw(Library.Control.kindeditorVar("Content")))
+
 
-                    
-        //编辑器
-        KindEditor.ready(function (K) {
-            //内容
- @(Html.Raw(Library.Control.kindeditor("Content", 1)))
+            //编辑器
+            KindEditor.ready(function (K) {
+                //内容
+                @(Html.Raw(Library.Control.kindeditor("Content", 1)))
 
         });
 
@@ -264,7 +271,7 @@
             });
         }
 
-        
+
         var tree;
         var element;
         var upload;
@@ -284,7 +291,7 @@
             tree = layui.tree;
             element = layui.element;
             upload = layui.upload;
-        
+
             //Hash地址的定位
             var layid = location.hash.replace(/^#test=/, '');
             element.tabChange('test', layid);
@@ -293,69 +300,70 @@
             });
 
             form.on('select(MsgType)', function (data) {
-                if(data.value == '0') {
+                if (data.value == '0') {
                     $('#UrlDiv').hide();
                     $('#ContentDiv').show();
-                } else if(data.value == '1') {
+                } else if (data.value == '1') {
                     $('#UrlDiv').show();
                     $('#ContentDiv').hide();
-                } else if(data.value == '2') {
+                } else if (data.value == '2') {
                     $('#UrlDiv').hide();
                     $('#ContentDiv').hide();
                 }
                 form.render();
             });
             form.on('select(PushType)', function (data) {
-                if(data.value == '0') {
+                if (data.value == '0') {
                     $('#PushParamDiv').hide();
                     $('#PushTimeDiv').hide();
-                } else if(data.value == '1') {
+                } else if (data.value == '1') {
                     $('#PushParamDiv').show();
                     $('#PushTimeDiv').hide();
-                } else if(data.value == '2') {
+                } else if (data.value == '2') {
                     $('#PushParamDiv').show();
                     $('#PushTimeDiv').show();
                 }
                 form.render();
             });
 
-            
-    
+
+
             //日期
             laydate.render({
-            elem: '#EffectStartDate',
-            type: 'datetime',
-            trigger: 'click'
+                elem: '#EffectStartDate',
+                type: 'datetime',
+                trigger: 'click'
             });
             laydate.render({
-            elem: '#EffectEndDate',
-            type: 'datetime',
-            trigger: 'click'
+                elem: '#EffectEndDate',
+                type: 'datetime',
+                trigger: 'click'
             });
             laydate.render({
-            elem: '#PushTime',
-            type: 'datetime',
-            trigger: 'click'
+                elem: '#PushTime',
+                type: 'datetime',
+                trigger: 'click'
             });
 
 
             //上传文件
             WebUploadJs('BgPicBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MsgPlacardBgPic"))), function (filename) {
-            $('#BgPicImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
-            $('#BgPic').val(filename);
+                $('#BgPicImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
+                $('#BgPic').val(filename);
             });
 
 
             //穿梭框
-            
+
 
             //TreeView，比如权限管理
-            
+
 
             //省市区
-            
+
         })
 
     </script>
 </body>
+
 </html>

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

@@ -54,7 +54,7 @@
                     <div class="layui-inline">
                         <label class="layui-form-label">退押订单号</label>
                         <div class="layui-input-inline">
-                            <input class="layui-input" type="text" name="OrderNo" placeholder="" autocomplete="off">
+                            <input class="layui-input" type="text" name="SeoKeyword" placeholder="" autocomplete="off">
                         </div>
                     </div>
                     <div class="layui-inline">
@@ -72,8 +72,8 @@
                                 <option value="0" selected="selected">待处理</option>
                                 <option value="2">失败</option>
                                 <option value="1">成功</option>
-                                <option value="4">通过</option>
-                                <option value="5">未通过</option>
+                                @* <option value="4">通过</option> *@
+                                @* <option value="5">未通过</option> *@
                             </select>
                         </div>
                     </div>
@@ -119,11 +119,11 @@
                         <button class="layui-btn" data-type="ImportData"><i
                             class="layui-icon layui-icon-upload layuiadmin-button-btn"></i>退押结果导入</button>
                     }
-                    @if (RightInfo.Contains("," + right + "_cash,"))
+                    @* @if (RightInfo.Contains("," + right + "_cash,"))
                     {
                         <button class="layui-btn" data-type="Cash"><i
                             class="layui-icon layui-icon-up layuiadmin-button-btn"></i>提交到支付宝平台</button>
-                    }
+                    } *@
                 </div>
                 <blockquote class="layui-elem-quote layui-text">
                     退押总金额：<span style="color: #f00;" id="ReturnAmount">0.00</span>　|　实际总金额：<span style="color: #f00;" id="fReturnAmount">0.00</span>

Areas/Admin/Views/MainServer/MerchantDepositReturns/Indexs.cshtml

@@ -54,7 +54,7 @@
                     <div class="layui-inline">
                         <label class="layui-form-label">退押订单号</label>
                         <div class="layui-input-inline">
-                            <input class="layui-input" type="text" name="OrderNo" placeholder="" autocomplete="off">
+                            <input class="layui-input" type="text" name="SeoKeyword" placeholder="" autocomplete="off">
                         </div>
                     </div>
                     <div class="layui-inline">
@@ -72,8 +72,8 @@
                                 <option value="0" selected="selected">待处理</option>
                                 <option value="2">失败</option>
                                 <option value="1">成功</option>
-                                <option value="4">通过</option>
-                                <option value="5">未通过</option>
+                                @* <option value="4">通过</option> *@
+                                @* <option value="5">未通过</option> *@
                             </select>
                         </div>
                     </div>
@@ -119,11 +119,11 @@
                         <button class="layui-btn" data-type="ImportData"><i
                             class="layui-icon layui-icon-upload layuiadmin-button-btn"></i>退押结果导入</button>
                     }
-                    @if (RightInfo.Contains("," + right + "_cash,"))
+                    @* @if (RightInfo.Contains("," + right + "_cash,"))
                     {
                         <button class="layui-btn" data-type="Cash"><i
                             class="layui-icon layui-icon-up layuiadmin-button-btn"></i>提交到支付宝平台</button>
-                    }
+                    } *@
                 </div>
                 <blockquote class="layui-elem-quote layui-text">
                     退押总金额：<span style="color: #f00;" id="ReturnAmount">0.00</span>　|　实际总金额：<span style="color: #f00;" id="fReturnAmount">0.00</span>

Areas/Admin/Views/MainServer/MsgAlert/Add.cshtml

@@ -82,8 +82,7 @@
                                     <div class="layui-upload">
                                         <input type="hidden" id="BgPic" name="BgPic" value="">
                                         <button class="layui-btn" type="button" id="BgPicBtn">选择图片</button>
-                                        <div class="layui-inline layui-word-aux">@(new
-                                            MySystem.PublicFunction().GetUploadHint("MsgAlertBgPic"))</div>
+                                        <div class="layui-inline layui-word-aux">@(new MySystem.PublicFunction().GetUploadHint("MsgAlertBgPic"))</div>
                                     </div>
                                     <div style="margin-top:10px;" id="BgPicImage">
                                     </div>

Areas/Admin/Views/MainServer/StoreHouse/Edits.cshtml

@@ -169,7 +169,7 @@
                             <div class="layui-form-item">
                                 <label class="layui-form-label">*押金</label>
                                 <div class="layui-input-inline">
-                                    <input class="layui-input" type="text" id="Deposit" name="Deposit" value=""
+                                    <input class="layui-input" type="text" id="Deposit" name="Deposit" value="@editData.Deposit"
                                         maxlength="32" lay-verify="required|" autocomplete="off" placeholder="请输入押金">
                                 </div>
                             </div>
@@ -177,7 +177,7 @@
                                 <label class="layui-form-label">附件</label>
                                 <div class="layui-input-block">
                                     <div class="layui-upload">
-                                        <input type="hidden" id="FilePath" name="FilePath" value=""
+                                        <input type="hidden" id="FilePath" name="FilePath" value="@editData.FilePath"
                                             lay-verify="required|">
                                         <button class="layui-btn" type="button" id="FilePathBtn">选择文件</button>
                                         <div class="layui-inline layui-word-aux">

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

@@ -73,6 +73,7 @@
                                 <option value="31">活动奖励</option>
                                 <option value="114">私董会分红</option>
                                 <option value="115">分仓奖励</option>
+                                <option value="126">机具货款退还</option>
                             </select>
                         </div>
                     </div>
@@ -132,6 +133,8 @@
                     红包奖励(元)：<span style="color: #f00;" id="BizAmount30">0.00</span>　|　活动奖励(元)：<span style="color: #f00;" id="BizAmount31">0.00</span>
                     <br>
                     私董会分红(元)：<span style="color: #f00;" id="BizAmount114">0.00</span>　|　分仓奖励(元)：<span style="color: #f00;" id="BizAmount115">0.00</span>
+                    <br>
+                    机具货款退还(元)：<span style="color: #f00;" id="BizAmount126">0.00</span>
                 </blockquote>
                 
                 <table id="LAY-list-manage" lay-filter="LAY-list-manage"></table>

Areas/Admin/Views/OperateServer/SysAdminOperate/Index.cshtml

@@ -47,7 +47,7 @@
                     <div class="layui-inline">
                         <label class="layui-form-label">运营中心编号</label>
                         <div class="layui-input-inline">
-                            <input class="layui-input" type="text" name="AdminName" placeholder="" autocomplete="off">
+                            <input class="layui-input" type="text" name="OpCode" placeholder="" autocomplete="off">
                         </div>
                     </div>
                     <div class="layui-inline">

Areas/Admin/Views/SpServer/ActivateRecord/Index.cshtml

@@ -73,18 +73,18 @@
                                 placeholder="激活时间" autocomplete="off">
                         </div>
                     </div>
-                    @* <div class="layui-inline">
-                        <label class="layui-form-label">商户手机号</label>
-                        <div class="layui-input-inline">
-                            <input class="layui-input" type="text" name="MerMobile" placeholder="" autocomplete="off">
-                        </div>
-                    </div>
                     <div class="layui-inline">
                         <label class="layui-form-label">终端机身号</label>
                         <div class="layui-input-inline">
                             <input class="layui-input" type="text" name="SnNo" placeholder="" autocomplete="off">
                         </div>
                     </div>
+                    @* <div class="layui-inline">
+                        <label class="layui-form-label">商户手机号</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="MerMobile" placeholder="" autocomplete="off">
+                        </div>
+                    </div>
                     <div class="layui-inline">
                         <label class="layui-form-label">激活状态</label>
                         <div class="layui-input-inline">

Areas/Admin/Views/SpServer/SpTradeRecord/Index.cshtml

@@ -60,6 +60,12 @@
                             <input class="layui-input" type="text" name="MerNo" placeholder="" autocomplete="off">
                         </div>
                     </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">机具号</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="TradeSnNo" placeholder="" autocomplete="off">
+                        </div>
+                    </div>
                     <div class="layui-inline">
                         <label class="layui-form-label">交易状态</label>
                         <div class="layui-input-inline">

Areas/Admin/Views/SpServer/TradeFluxRecord/Index.cshtml

@@ -60,6 +60,12 @@
                             <input class="layui-input" type="text" name="MerNo" placeholder="" autocomplete="off">
                         </div>
                     </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">机具号</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="TradeSnNo" placeholder="" autocomplete="off">
+                        </div>
+                    </div>
                     @* <div class="layui-inline">
                         <label class="layui-form-label">交易状态</label>
                         <div class="layui-input-inline">

wwwroot/layuiadmin/modules_main/MerchantDepositReturns_Admin.js

@@ -100,11 +100,15 @@ layui.config({
             , { field: 'CreateDate', width: 200, title: '创建时间', sort: true }
             , { field: 'StatusName', width: 200, title: '状态', sort: true }
             , { field: 'SeoDescription', width: 200, title: '描述', sort: true }
-            , { field: 'SeoTitle', width: 200, title: '操作人', sort: true }
+            , { field: 'BrandId', width: 200, title: '品牌', sort: true }
+            , { field: 'MerchantIdKqSnNo', width: 200, title: '机具Sn', sort: true }
+            , { field: 'MerchantIdMerchantMobile', width: 200, title: '手机号', sort: true }
+            , { field: 'MerchantIdMerRealName', width: 200, title: '商户姓名', sort: true }
             , { field: 'SeoKeyword', width: 200, title: '退押订单号', sort: true }
             , { field: 'AlipayAccountNo', width: 200, title: '支付宝账号', sort: true }
             , { field: 'ReturnAmount', width: 200, title: '返还金额', sort: true }
             , { field: 'ReturnAmounts', width: 200, title: '实际返还金额', sort: true }
+            , { field: 'SeoTitle', width: 200, title: '操作人', sort: true }
 
             // , { title: '操作', align: 'center', width: 400, fixed: 'right', toolbar: '#table-list-tools' }
         ]]

wwwroot/layuiadmin/modules_main/MerchantDepositReturnsn_Admin.js

@@ -2,7 +2,7 @@ var ExcelData, ExcelKind;
 function ConfirmImport() {
     $.ajax({
         type: "POST",
-        url: "/Admin/MerchantDepositReturns/Import?r=" + Math.random(1),
+        url: "/Admin/MerchantDepositReturns/Imports?r=" + Math.random(1),
         data: "ExcelData=" + encodeURIComponent(JSON.stringify(ExcelData)),
         dataType: "text",
         success: function (data) {
@@ -100,11 +100,15 @@ layui.config({
             , { field: 'CreateDate', width: 200, title: '创建时间', sort: true }
             , { field: 'StatusName', width: 200, title: '状态', sort: true }
             , { field: 'SeoDescription', width: 200, title: '描述', sort: true }
-            , { field: 'SeoTitle', width: 200, title: '操作人', sort: true }
+            , { field: 'BrandId', width: 200, title: '品牌', sort: true }
+            , { field: 'MerchantIdKqSnNo', width: 200, title: '机具Sn', sort: true }
+            , { field: 'MerchantIdMerchantMobile', width: 200, title: '手机号', sort: true }
+            , { field: 'MerchantIdMerRealName', width: 200, title: '商户姓名', sort: true }
             , { field: 'SeoKeyword', width: 200, title: '退押订单号', sort: true }
             , { field: 'AlipayAccountNo', width: 200, title: '支付宝账号', sort: true }
             , { field: 'ReturnAmount', width: 200, title: '返还金额', sort: true }
             , { field: 'ReturnAmounts', width: 200, title: '实际返还金额', sort: true }
+            , { field: 'SeoTitle', width: 200, title: '操作人', sort: true }
 
             // , { title: '操作', align: 'center', width: 400, fixed: 'right', toolbar: '#table-list-tools' }
         ]]
@@ -342,7 +346,7 @@ layui.config({
             });
             $.ajax({
                 type: "GET",
-                url: "/Admin/MerchantDepositReturns/ExportExcel?r=" + Math.random(1),
+                url: "/Admin/MerchantDepositReturns/ExportExcels?r=" + Math.random(1),
                 data: userdata,
                 dataType: "json",
                 success: function (data) {

wwwroot/layuiadmin/modules_main/SysRechargeRecord_Admin.js

@@ -143,6 +143,7 @@ layui.config({
             $("#BizAmount31").text(res.other.BizAmount31);
             $("#BizAmount114").text(res.other.BizAmount114);
             $("#BizAmount115").text(res.other.BizAmount115);
+            $("#BizAmount126").text(res.other.BizAmount126);
             $(".layui-none").text("无数据");
         }
     });