Merge branch 'DuGuYang' into develop

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/HomeController.cs

@@ -149,60 +149,60 @@ namespace MySystem.Areas.Admin.Controllers
         [HttpPost]
         public string Login(string UserName, string Pwd, string CheckCode)
         {
-            string result = "";
-            if (function.GetCookie(_accessor.HttpContext, "checkcode") != CheckCode)
-            {
-                result = "验证码错误!!";
-            }
-            else
-            {
-                Pwd = function.MD5_32(Pwd);
-                var user = db.SysAdmin.FirstOrDefault(m => m.AdminName == UserName && m.Password == Pwd);
-                if (user != null)
-                {
-                    user.LastLoginDate = DateTime.Now;
-                    db.SaveChanges();
-                    function.WriteCookie(_accessor.HttpContext, "SysUserName", user.AdminName);
-                    function.WriteCookie(_accessor.HttpContext, "SysRealName", user.RealName);
-                    function.WriteCookie(_accessor.HttpContext, "SysRealRole", user.Role);
-                    int RoleId = int.Parse(function.CheckInt(user.Role));
-                    BsModels.SysAdminRole Role = db.SysAdminRole.FirstOrDefault(m => m.Id == RoleId) ?? new BsModels.SysAdminRole();
-                    string RightInfo = function.CheckNull(Role.RightInfo);
-                    function.WriteSession(_accessor.HttpContext, "RightInfo", RightInfo);
-                    string UserId = user.Id.ToString();
-                    function.WriteCookie(_accessor.HttpContext, "SysId", UserId);
-                    function.WriteSession(_accessor.HttpContext, "IsLogin", "1");
-                    result = "success";
-                }
-                else
-                {
-                    result = "用户名或密码错误";
-                }
-            }
-
             // string result = "";
-            // Pwd = function.MD5_32(Pwd);
-            // var user = db.SysAdmin.FirstOrDefault(m => m.AdminName == UserName && m.Password == Pwd);
-            // if (user != null)
+            // if (function.GetCookie(_accessor.HttpContext, "checkcode") != CheckCode)
             // {
-            //     user.LastLoginDate = DateTime.Now;
-            //     db.SaveChanges();
-            //     function.WriteCookie(_accessor.HttpContext, "SysUserName", user.AdminName);
-            //     function.WriteCookie(_accessor.HttpContext, "SysRealName", user.RealName);
-            //     function.WriteCookie(_accessor.HttpContext, "SysRealRole", user.Role);
-            //     int RoleId = int.Parse(function.CheckInt(user.Role));
-            //     BsModels.SysAdminRole Role = db.SysAdminRole.FirstOrDefault(m => m.Id == RoleId) ?? new BsModels.SysAdminRole();
-            //     string RightInfo = function.CheckNull(Role.RightInfo);
-            //     function.WriteSession(_accessor.HttpContext, "RightInfo", RightInfo);
-            //     string UserId = user.Id.ToString();
-            //     function.WriteCookie(_accessor.HttpContext, "SysId", UserId);
-            //     function.WriteSession(_accessor.HttpContext, "IsLogin", "1");
-            //     result = "success";
+            //     result = "验证码错误!!";
             // }
             // else
             // {
-            //     result = "用户名或密码错误";
+            //     Pwd = function.MD5_32(Pwd);
+            //     var user = db.SysAdmin.FirstOrDefault(m => m.AdminName == UserName && m.Password == Pwd);
+            //     if (user != null)
+            //     {
+            //         user.LastLoginDate = DateTime.Now;
+            //         db.SaveChanges();
+            //         function.WriteCookie(_accessor.HttpContext, "SysUserName", user.AdminName);
+            //         function.WriteCookie(_accessor.HttpContext, "SysRealName", user.RealName);
+            //         function.WriteCookie(_accessor.HttpContext, "SysRealRole", user.Role);
+            //         int RoleId = int.Parse(function.CheckInt(user.Role));
+            //         BsModels.SysAdminRole Role = db.SysAdminRole.FirstOrDefault(m => m.Id == RoleId) ?? new BsModels.SysAdminRole();
+            //         string RightInfo = function.CheckNull(Role.RightInfo);
+            //         function.WriteSession(_accessor.HttpContext, "RightInfo", RightInfo);
+            //         string UserId = user.Id.ToString();
+            //         function.WriteCookie(_accessor.HttpContext, "SysId", UserId);
+            //         function.WriteSession(_accessor.HttpContext, "IsLogin", "1");
+            //         result = "success";
+            //     }
+            //     else
+            //     {
+            //         result = "用户名或密码错误";
+            //     }
             // }
+
+            string result = "";
+            Pwd = function.MD5_32(Pwd);
+            var user = db.SysAdmin.FirstOrDefault(m => m.AdminName == UserName && m.Password == Pwd);
+            if (user != null)
+            {
+                user.LastLoginDate = DateTime.Now;
+                db.SaveChanges();
+                function.WriteCookie(_accessor.HttpContext, "SysUserName", user.AdminName);
+                function.WriteCookie(_accessor.HttpContext, "SysRealName", user.RealName);
+                function.WriteCookie(_accessor.HttpContext, "SysRealRole", user.Role);
+                int RoleId = int.Parse(function.CheckInt(user.Role));
+                BsModels.SysAdminRole Role = db.SysAdminRole.FirstOrDefault(m => m.Id == RoleId) ?? new BsModels.SysAdminRole();
+                string RightInfo = function.CheckNull(Role.RightInfo);
+                function.WriteSession(_accessor.HttpContext, "RightInfo", RightInfo);
+                string UserId = user.Id.ToString();
+                function.WriteCookie(_accessor.HttpContext, "SysId", UserId);
+                function.WriteSession(_accessor.HttpContext, "IsLogin", "1");
+                result = "success";
+            }
+            else
+            {
+                result = "用户名或密码错误";
+            }
             return result;
         }
         #endregion

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/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/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/Home/Login.cshtml

@@ -26,11 +26,11 @@
                     <label for="password">密码 / Password</label>
                     <input class="form-input" type="password" name="Pwd" id="Pwd" onKeyUp="if(event.keyCode==13){$('#CheckCode').focus();}" placeholder="请填写密码">
                 </div>
-                <div class="form-group pb10">
+                @* <div class="form-group pb10">
                     <label for="password">验证码 / Verification</label>
                     <input class="form-input" type="text" name="CheckCode" id="CheckCode" onkeyup="if(event.keyCode==13){syslogin();}" placeholder="请填写验证码" style="width: 70%; display: inline-block; margin-right: 2%">
                     <img src="/Api/PublicMethod/CheckCode" onclick="$(this).attr('src','/Api/PublicMethod/CheckCode?r='+Math.random())" style="width: 26%; height:38px;" />
-                </div>
+                </div> *@
                 @*<div class="form-group pb10 cf">
                         <label class="remembermetext fl" for="rememberme">
                             <input type="checkbox" checked name="rememberme">&nbsp;记住我的登录

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/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/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("无数据");
         }
     });