Merge branch 'feature-dgy-后台优化' into feature-dgy-后台测试

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

@@ -59,7 +59,7 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("SeoKeyword", "1"); //订单编号
 
 
-            string condition = " and Status>-1 and QueryCount=1";
+            string condition = " and Status>-1";
             //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
@@ -89,18 +89,21 @@ namespace MySystem.Areas.Admin.Controllers
                 //订单信息
                 JsonData ApplyList = JsonMapper.ToObject(dic["SeoTitle"].ToString());//申请数据
                 dic["dPosCoupons"] = "";
-                dic["dPosCoupons"] = "";
-                for (int i = 0; i < ApplyList.Count; i++)
+                dic["bPosCoupons"] = "";
+                if (!string.IsNullOrEmpty(dic["SeoTitle"].ToString()))
                 {
-                    int num = Convert.ToInt32(ApplyList[i]["Num"].ToString());
-                    int type = Convert.ToInt32(ApplyList[i]["Type"].ToString());
-                    if (type == 1)
-                    {
-                        dic["dPosCoupons"] = num + "张";
-                    }
-                    else
+                    for (int i = 0; i < ApplyList.Count; i++)
                     {
-                        dic["bPosCoupons"] = num + "张";
+                        int num = Convert.ToInt32(ApplyList[i]["Num"].ToString());
+                        int type = Convert.ToInt32(ApplyList[i]["Type"].ToString());
+                        if (type == 1)
+                        {
+                            dic["dPosCoupons"] = num + "张";
+                        }
+                        else
+                        {
+                            dic["bPosCoupons"] = num + "张";
+                        }
                     }
                 }
 

Areas/Admin/Controllers/MainServer/MerchantDepositReturnsController.cs

@@ -52,12 +52,13 @@ namespace MySystem.Areas.Admin.Controllers
         /// 首台商户退押金申请记录列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(MerchantDepositReturns data, string CreateDateData, string UpdateDateData, string MerchantName, string PosSn, string StatusSelect = "0", int page = 1, int limit = 30)
+        public JsonResult IndexData(MerchantDepositReturns data, string CreateDateData, string UpdateDateData, string MerchantName, string PosSn, string PayKindSelect, string BankNameSelect, string BrandId, string StatusSelect = "0", int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
 
             Fields.Add("AlipayAccountNo", "1"); //支付宝账号
+            Fields.Add("BankCardNo", "1"); //银行卡号
             Fields.Add("SeoKeyword", "1"); //退押订单号
 
             string condition = " and Status>-1 and QueryCount=1";
@@ -67,6 +68,29 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and Status=" + StatusSelect;
             }
+            //退款类型
+            if (!string.IsNullOrEmpty(PayKindSelect))
+            {
+                condition += " and PayKind=" + PayKindSelect;
+            }
+            //开户行
+            if (!string.IsNullOrEmpty(BankNameSelect))
+            {
+                condition += " and BankName='" + BankNameSelect + "'";
+            }
+            //品牌
+            if (!string.IsNullOrEmpty(BrandId))
+            {
+                int brandId = int.Parse(BrandId);
+                var merchantIds = "";
+                var posMerchantInfo = db.PosMerchantInfo.Where(m => m.Status > -1 && m.BrandId == brandId && m.StandardMonths == 10).ToList();
+                foreach (var item in posMerchantInfo)
+                {
+                    merchantIds += item.Id + ",";
+                }
+                merchantIds = merchantIds.TrimEnd(',');
+                condition += " and MerchantId In(" + merchantIds + ")";
+            }
             //创建时间
             if (!string.IsNullOrEmpty(CreateDateData))
             {
@@ -133,6 +157,10 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["UserIdMakerCode"] = userid_Users.MakerCode;
                 dic.Remove("UserId");
 
+                int PayKind = int.Parse(dic["PayKind"].ToString());
+                if (PayKind == 0) dic["PayKindName"] = "支付宝";
+                if (PayKind == 1) dic["PayKindName"] = "银行卡";
+
                 //实际返还金额
                 decimal amt = decimal.Parse(dic["ReturnAmount"].ToString());
                 dic["ReturnAmounts"] = (amt * 0.92M).ToString("f2");
@@ -178,12 +206,13 @@ namespace MySystem.Areas.Admin.Controllers
         /// 非首台商户退押金申请记录列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexsData(MerchantDepositReturns data, string CreateDateData, string UpdateDateData, string MerchantName, string PosSn, string StatusSelect = "0", int page = 1, int limit = 30)
+        public JsonResult IndexsData(MerchantDepositReturns data, string CreateDateData, string UpdateDateData, string MerchantName, string PosSn, string PayKindSelect, string BankNameSelect, string BrandId, string StatusSelect = "0", int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
 
             Fields.Add("AlipayAccountNo", "1"); //支付宝账号
+            Fields.Add("BankCardNo", "1"); //银行卡号
             Fields.Add("SeoKeyword", "1"); //退押订单号
 
             string condition = " and Status>-1 and QueryCount=0";
@@ -193,6 +222,29 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and Status=" + StatusSelect;
             }
+            //退款类型
+            if (!string.IsNullOrEmpty(PayKindSelect))
+            {
+                condition += " and PayKind=" + PayKindSelect;
+            }
+            //开户行
+            if (!string.IsNullOrEmpty(BankNameSelect))
+            {
+                condition += " and BankName='" + BankNameSelect + "'";
+            }
+            //品牌
+            if (!string.IsNullOrEmpty(BrandId))
+            {
+                int brandId = int.Parse(BrandId);
+                var merchantIds = "";
+                var posMerchantInfo = db.PosMerchantInfo.Where(m => m.Status > -1 && m.BrandId == brandId && m.StandardMonths == 10).ToList();
+                foreach (var item in posMerchantInfo)
+                {
+                    merchantIds += item.Id + ",";
+                }
+                merchantIds = merchantIds.TrimEnd(',');
+                condition += " and MerchantId In(" + merchantIds + ")";
+            }
             //创建时间
             if (!string.IsNullOrEmpty(CreateDateData))
             {
@@ -581,10 +633,13 @@ namespace MySystem.Areas.Admin.Controllers
         /// 导出Excel
         /// </summary>
         /// <returns></returns>
-        public JsonResult ExportExcel(MerchantDepositReturns data, string StatusSelect, string CreateDateData)
+        public JsonResult ExportExcel(MerchantDepositReturns data, string CreateDateData, string UpdateDateData, string MerchantName, string PosSn, string PayKindSelect, string BankNameSelect, string StatusSelect)
         {
+
             Dictionary<string, string> Fields = new Dictionary<string, string>();
+
             Fields.Add("AlipayAccountNo", "1"); //支付宝账号
+            Fields.Add("BankCardNo", "1"); //银行卡号
             Fields.Add("SeoKeyword", "1"); //退押订单号
 
             string condition = " and Status>-1 and QueryCount=1";
@@ -594,6 +649,16 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and Status=" + StatusSelect;
             }
+            //退款类型
+            if (!string.IsNullOrEmpty(PayKindSelect))
+            {
+                condition += " and PayKind=" + PayKindSelect;
+            }
+            //开户行
+            if (!string.IsNullOrEmpty(BankNameSelect))
+            {
+                condition += " and BankName=" + BankNameSelect;
+            }
             //创建时间
             if (!string.IsNullOrEmpty(CreateDateData))
             {
@@ -602,16 +667,49 @@ namespace MySystem.Areas.Admin.Controllers
                 string end = datelist[1];
                 condition += " and CreateDate>='" + start + " 00:00:00' and CreateDate<='" + end + " 23:59:59'";
             }
+            //发放时间
+            if (!string.IsNullOrEmpty(UpdateDateData))
+            {
+                string[] datelist = UpdateDateData.Split(new string[] { " - " }, StringSplitOptions.None);
+                string start = datelist[0];
+                string end = datelist[1];
+                condition += " and UpdateDate>='" + start + " 00:00:00' and UpdateDate<='" + end + " 23:59:59'";
+            }
+            if (!string.IsNullOrEmpty(MerchantName))
+            {
+                var Ids = "";
+                var posMerchantInfo = db.PosMerchantInfo.Where(m => m.MerRealName == MerchantName).ToList();
+                foreach (var item in posMerchantInfo)
+                {
+                    Ids += item.Id + ",";
+                }
+                Ids = Ids.TrimEnd(',');
+                condition += " and MerchantId in(" + Ids + ")";
+            }
+            if (!string.IsNullOrEmpty(PosSn))
+            {
+                var Ids = "";
+                var posMerchantInfo = db.PosMerchantInfo.Where(m => m.KqSnNo == PosSn).ToList();
+                foreach (var item in posMerchantInfo)
+                {
+                    Ids += item.Id + ",";
+                }
+                Ids = Ids.TrimEnd(',');
+                condition += " and MerchantId in(" + Ids + ")";
+            }
 
 
-            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);
+            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("MerchantDepositReturns", Fields, "Id desc", "0", 1, 20000, condition, "Id,MerchantId,SeoKeyword,CreateDate,SeoDescription,AlipayAccountNo,BankCardNo,BankName", false);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             foreach (Dictionary<string, object> dic in diclist)
             {
+                int Id = int.Parse(function.CheckInt(dic["Id"].ToString()));
+                var merchantDepositReturn = db.MerchantDepositReturns.FirstOrDefault(m => m.Id == Id) ?? new MerchantDepositReturns();
                 //商户
                 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();
+                // var merchantDepositReturns = db.MerchantDepositReturns.FirstOrDefault(m => m.MerchantId == MerchantId) ?? new MerchantDepositReturns();
+                // PosMerchantInfo merchantid_PosMerchantInfo = db.PosMerchantInfo.FirstOrDefault(m => m.Id == MerchantId) ?? new PosMerchantInfo();
+                PosMerchantInfo merchantid_PosMerchantInfo = db.PosMerchantInfo.FirstOrDefault(m => m.Id == merchantDepositReturn.MerchantId) ?? new PosMerchantInfo();
                 dic["MerchantIdMerRealName"] = merchantid_PosMerchantInfo.MerRealName;
                 // dic["MerchantIdMerchantMobile"] = merchantid_PosMerchantInfo.MerchantMobile;
                 // dic["MerchantIdMerIdcardNo"] = merchantid_PosMerchantInfo.MerIdcardNo;
@@ -619,8 +717,26 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["PosSn"] = merchantid_PosMerchantInfo.KqSnNo;
                 dic["BrandId"] = RelationClass.GetKqProductBrandInfo(int.Parse(merchantid_PosMerchantInfo.BrandId.ToString()));
                 // 实际返还金额
-                decimal amt = decimal.Parse(merchantDepositReturns.ReturnAmount.ToString());
+                // decimal amt = decimal.Parse(merchantDepositReturns.ReturnAmount.ToString());
+                decimal amt = decimal.Parse(merchantDepositReturn.ReturnAmount.ToString());
                 dic["ReturnAmount"] = (amt * 0.92M).ToString("f2");
+
+                if (!string.IsNullOrEmpty(merchantDepositReturn.AlipayAccountNo))
+                {
+                    dic["AccountNo"] = merchantDepositReturn.AlipayAccountNo;
+                }
+                if (!string.IsNullOrEmpty(merchantDepositReturn.BankCardNo))
+                {
+                    dic["AccountNo"] = merchantDepositReturn.BankCardNo;
+                }
+
+
+                int PayKind = merchantDepositReturn.PayKind;
+                if (PayKind == 0) dic["PayKindName"] = "支付宝";
+                if (PayKind == 1) dic["PayKindName"] = "银行卡";
+                dic.Remove("Id");
+                dic.Remove("AlipayAccountNo");
+                dic.Remove("BankCardNo");
             }
 
             Dictionary<string, object> result = new Dictionary<string, object>();
@@ -636,7 +752,11 @@ namespace MySystem.Areas.Admin.Controllers
             // ReturnFields.Add("MerchantIdMerchantMobile", "商户手机号");
             // ReturnFields.Add("MerchantIdMerIdcardNo", "商户身份证号");
             ReturnFields.Add("SeoKeyword", "退押订单号");
-            ReturnFields.Add("AlipayAccountNo", "支付宝账号");
+            ReturnFields.Add("AccountNo", "收款账号");
+            // ReturnFields.Add("AlipayAccountNo", "支付宝账号");
+            // ReturnFields.Add("BankCardNo", "银行卡号");
+            ReturnFields.Add("BankName", "开户行");
+            ReturnFields.Add("PayKindName", "退款类型");
             ReturnFields.Add("ReturnAmount", "实际返还金额");
             ReturnFields.Add("SeoDescription", "备注");
             // ReturnFields.Add("UserIdRealName", "创客真实姓名");
@@ -656,10 +776,13 @@ namespace MySystem.Areas.Admin.Controllers
         /// 导出Excel
         /// </summary>
         /// <returns></returns>
-        public JsonResult ExportExcels(MerchantDepositReturns data, string StatusSelect, string CreateDateData)
+        public JsonResult ExportsExcel(MerchantDepositReturns data, string CreateDateData, string UpdateDateData, string MerchantName, string PosSn, string PayKindSelect, string BankNameSelect, string StatusSelect)
         {
+
             Dictionary<string, string> Fields = new Dictionary<string, string>();
+
             Fields.Add("AlipayAccountNo", "1"); //支付宝账号
+            Fields.Add("BankCardNo", "1"); //银行卡号
             Fields.Add("SeoKeyword", "1"); //退押订单号
 
             string condition = " and Status>-1 and QueryCount=0";
@@ -669,6 +792,16 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and Status=" + StatusSelect;
             }
+            //退款类型
+            if (!string.IsNullOrEmpty(PayKindSelect))
+            {
+                condition += " and PayKind=" + PayKindSelect;
+            }
+            //开户行
+            if (!string.IsNullOrEmpty(BankNameSelect))
+            {
+                condition += " and BankName=" + BankNameSelect;
+            }
             //创建时间
             if (!string.IsNullOrEmpty(CreateDateData))
             {
@@ -677,16 +810,49 @@ namespace MySystem.Areas.Admin.Controllers
                 string end = datelist[1];
                 condition += " and CreateDate>='" + start + " 00:00:00' and CreateDate<='" + end + " 23:59:59'";
             }
+            //发放时间
+            if (!string.IsNullOrEmpty(UpdateDateData))
+            {
+                string[] datelist = UpdateDateData.Split(new string[] { " - " }, StringSplitOptions.None);
+                string start = datelist[0];
+                string end = datelist[1];
+                condition += " and UpdateDate>='" + start + " 00:00:00' and UpdateDate<='" + end + " 23:59:59'";
+            }
+            if (!string.IsNullOrEmpty(MerchantName))
+            {
+                var Ids = "";
+                var posMerchantInfo = db.PosMerchantInfo.Where(m => m.MerRealName == MerchantName).ToList();
+                foreach (var item in posMerchantInfo)
+                {
+                    Ids += item.Id + ",";
+                }
+                Ids = Ids.TrimEnd(',');
+                condition += " and MerchantId in(" + Ids + ")";
+            }
+            if (!string.IsNullOrEmpty(PosSn))
+            {
+                var Ids = "";
+                var posMerchantInfo = db.PosMerchantInfo.Where(m => m.KqSnNo == PosSn).ToList();
+                foreach (var item in posMerchantInfo)
+                {
+                    Ids += item.Id + ",";
+                }
+                Ids = Ids.TrimEnd(',');
+                condition += " and MerchantId in(" + Ids + ")";
+            }
 
 
-            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);
+            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("MerchantDepositReturns", Fields, "Id desc", "0", 1, 20000, condition, "Id,MerchantId,SeoKeyword,CreateDate,SeoDescription,AlipayAccountNo,BankCardNo,BankName", false);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             foreach (Dictionary<string, object> dic in diclist)
             {
+                int Id = int.Parse(function.CheckInt(dic["Id"].ToString()));
+                var merchantDepositReturn = db.MerchantDepositReturns.FirstOrDefault(m => m.Id == Id) ?? new MerchantDepositReturns();
                 //商户
                 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();
+                // var merchantDepositReturns = db.MerchantDepositReturns.FirstOrDefault(m => m.MerchantId == MerchantId) ?? new MerchantDepositReturns();
+                // PosMerchantInfo merchantid_PosMerchantInfo = db.PosMerchantInfo.FirstOrDefault(m => m.Id == MerchantId) ?? new PosMerchantInfo();
+                PosMerchantInfo merchantid_PosMerchantInfo = db.PosMerchantInfo.FirstOrDefault(m => m.Id == merchantDepositReturn.MerchantId) ?? new PosMerchantInfo();
                 dic["MerchantIdMerRealName"] = merchantid_PosMerchantInfo.MerRealName;
                 // dic["MerchantIdMerchantMobile"] = merchantid_PosMerchantInfo.MerchantMobile;
                 // dic["MerchantIdMerIdcardNo"] = merchantid_PosMerchantInfo.MerIdcardNo;
@@ -694,9 +860,26 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["PosSn"] = merchantid_PosMerchantInfo.KqSnNo;
                 dic["BrandId"] = RelationClass.GetKqProductBrandInfo(int.Parse(merchantid_PosMerchantInfo.BrandId.ToString()));
                 // 实际返还金额
-                decimal amt = decimal.Parse(merchantDepositReturns.ReturnAmount.ToString());
+                // decimal amt = decimal.Parse(merchantDepositReturns.ReturnAmount.ToString());
+                decimal amt = decimal.Parse(merchantDepositReturn.ReturnAmount.ToString());
                 dic["ReturnAmount"] = (amt * 0.92M).ToString("f2");
 
+                if (!string.IsNullOrEmpty(merchantDepositReturn.AlipayAccountNo))
+                {
+                    dic["AccountNo"] = merchantDepositReturn.AlipayAccountNo;
+                }
+                if (!string.IsNullOrEmpty(merchantDepositReturn.BankCardNo))
+                {
+                    dic["AccountNo"] = merchantDepositReturn.BankCardNo;
+                }
+
+
+                int PayKind = merchantDepositReturn.PayKind;
+                if (PayKind == 0) dic["PayKindName"] = "支付宝";
+                if (PayKind == 1) dic["PayKindName"] = "银行卡";
+                dic.Remove("Id");
+                dic.Remove("AlipayAccountNo");
+                dic.Remove("BankCardNo");
             }
 
             Dictionary<string, object> result = new Dictionary<string, object>();
@@ -712,7 +895,11 @@ namespace MySystem.Areas.Admin.Controllers
             // ReturnFields.Add("MerchantIdMerchantMobile", "商户手机号");
             // ReturnFields.Add("MerchantIdMerIdcardNo", "商户身份证号");
             ReturnFields.Add("SeoKeyword", "退押订单号");
-            ReturnFields.Add("AlipayAccountNo", "支付宝账号");
+            ReturnFields.Add("AccountNo", "收款账号");
+            // ReturnFields.Add("AlipayAccountNo", "支付宝账号");
+            // ReturnFields.Add("BankCardNo", "银行卡号");
+            ReturnFields.Add("BankName", "开户行");
+            ReturnFields.Add("PayKindName", "退款类型");
             ReturnFields.Add("ReturnAmount", "实际返还金额");
             ReturnFields.Add("SeoDescription", "备注");
             // ReturnFields.Add("UserIdRealName", "创客真实姓名");

Areas/Admin/Controllers/MainServer/OrdersController.cs

@@ -510,9 +510,14 @@ namespace MySystem.Areas.Admin.Controllers
             string[] Ids = IdList.TrimEnd('#').Split('#');
             string[] StoreIds = StoreIdList.TrimEnd('#').Split('#');
             string[] SnNoss = SnNosList.TrimEnd('#').Split('#');
+            int[] pIds = new int[] { 42, 41, 21, 20, 19, 18, 17, 16, 14, 13, 12, 9, 8, 7 };
             for (int i = 0; i < Ids.Length; i++)
             {
                 int Id = int.Parse(Ids[i]);
+                if (pIds.Contains(Id))
+                {
+                    Fields.Add("Status", 3);
+                }
                 int StoreId = int.Parse(StoreIds[i]);
                 string SnNos = SnNoss[i];
                 OrderProduct pro = db.OrderProduct.FirstOrDefault(m => m.Id == Id);

Areas/Admin/Views/Home/Login.cshtml

@@ -25,12 +25,12 @@
                 <div class="form-group pb10">
                     <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>
                 <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

@@ -71,6 +71,46 @@
                                 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="BankCardNo" placeholder="" autocomplete="off">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">开户行</label>
+                        <div class="layui-input-inline">
+                            <select id="BankNameSelect" name="BankNameSelect" lay-search="">
+                                <option value="">全部...</option>
+                                <option value="工商银行">工商银行</option>
+                                <option value="农业银行">农业银行</option>
+                                <option value="邮储银行">邮储银行</option>
+                                <option value="建设银行">建设银行</option>
+                                <option value="招商银行">招商银行</option>
+                                <option value="中国银行">中国银行</option>
+                                <option value="交通银行">交通银行</option>
+                                <option value="浦发银行">浦发银行</option>
+                                <option value="广发银行">广发银行</option>
+                                <option value="民生银行">民生银行</option>
+                                <option value="平安银行">平安银行</option>
+                                <option value="光大银行">光大银行</option>
+                                <option value="兴业银行">兴业银行</option>
+                                <option value="中信银行">中信银行</option>
+                                <option value="上海银行">上海银行</option>
+                                <option value="其他银行">其他银行</option>
+                            </select>
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">退款类型</label>
+                        <div class="layui-input-inline">
+                            <select id="PayKindSelect" name="PayKindSelect" lay-search="">
+                                <option value="">全部...</option>
+                                <option value="0">支付宝</option>
+                                <option value="1">银行卡</option>
+                            </select>
+                        </div>
+                    </div>
                     <div class="layui-inline">
                         <label class="layui-form-label">退押状态</label>
                         <div class="layui-input-inline">
@@ -79,8 +119,21 @@
                                 <option value="0" selected="selected">待处理</option>
                                 <option value="2">失败</option>
                                 <option value="1">成功</option>
-                                @* <option value="4">通过</option> *@
-                                @* <option value="5">未通过</option> *@
+                            </select>
+                        </div>
+                    </div>
+                    @{
+                        Dictionary<string, string> ProfitObjectsActivesDic = new MySystem.DictionaryClass().getKqProductBrandDic();
+                    }
+                    <div class="layui-inline">
+                        <label class="layui-form-label">品牌</label>
+                        <div class="layui-input-inline">
+                            <select id="BrandId" name="BrandId" lay-search="">
+                                <option value="">全部...</option>
+                                @foreach (string key in ProfitObjectsActivesDic.Keys)
+                                {
+                                    <option value="@key">@ProfitObjectsActivesDic[key]</option>
+                                }
                             </select>
                         </div>
                     </div>
@@ -140,23 +193,24 @@
                             class="layui-icon layui-icon-upload layuiadmin-button-btn"></i>退押结果导入</button>
                     }
                     @* @if (RightInfo.Contains("," + right + "_cash,"))
-                    {
+                        {
                         <button class="layui-btn" data-type="Cash"><i
-                            class="layui-icon layui-icon-up layuiadmin-button-btn"></i>提交到支付宝平台</button>
-                    } *@
+                        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>
+                    退押总金额：<span style="color: #f00;" id="ReturnAmount">0.00</span>　|　实际总金额：<span style="color: #f00;"
+                        id="fReturnAmount">0.00</span>
                 </blockquote>
                 <table id="LAY-list-manage" lay-filter="LAY-list-manage"></table>
                 <script type="text/html" id="table-list-tools">
                     @if (RightInfo.Contains("," + right + "_edit,"))
                     {
-                                            <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="edit"><i class="layui-icon layui-icon-edit"></i>编辑</a>
+                                                <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="edit"><i class="layui-icon layui-icon-edit"></i>编辑</a>
                     }
                     @if (RightInfo.Contains("," + right + "_delete,"))
                     {
-                                            <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del"><i class="layui-icon layui-icon-delete"></i>删除</a>
+                                                <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del"><i class="layui-icon layui-icon-delete"></i>删除</a>
                     }
                     @if (RightInfo.Contains("," + right + "_edit,"))
                     {

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

@@ -71,6 +71,46 @@
                                 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="BankCardNo" placeholder="" autocomplete="off">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">开户行</label>
+                        <div class="layui-input-inline">
+                            <select id="BankNameSelect" name="BankNameSelect" lay-search="">
+                                <option value="">全部...</option>
+                                <option value="工商银行">工商银行</option>
+                                <option value="农业银行">农业银行</option>
+                                <option value="邮储银行">邮储银行</option>
+                                <option value="建设银行">建设银行</option>
+                                <option value="招商银行">招商银行</option>
+                                <option value="中国银行">中国银行</option>
+                                <option value="交通银行">交通银行</option>
+                                <option value="浦发银行">浦发银行</option>
+                                <option value="广发银行">广发银行</option>
+                                <option value="民生银行">民生银行</option>
+                                <option value="平安银行">平安银行</option>
+                                <option value="光大银行">光大银行</option>
+                                <option value="兴业银行">兴业银行</option>
+                                <option value="中信银行">中信银行</option>
+                                <option value="上海银行">上海银行</option>
+                                <option value="其他银行">其他银行</option>
+                            </select>
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">退款类型</label>
+                        <div class="layui-input-inline">
+                            <select id="PayKindSelect" name="PayKindSelect" lay-search="">
+                                <option value="">全部...</option>
+                                <option value="0">支付宝</option>
+                                <option value="1">银行卡</option>
+                            </select>
+                        </div>
+                    </div>
                     <div class="layui-inline">
                         <label class="layui-form-label">退押状态</label>
                         <div class="layui-input-inline">
@@ -84,6 +124,21 @@
                             </select>
                         </div>
                     </div>
+                    @{
+                        Dictionary<string, string> ProfitObjectsActivesDic = new MySystem.DictionaryClass().getKqProductBrandDic();
+                    }
+                    <div class="layui-inline">
+                        <label class="layui-form-label">品牌</label>
+                        <div class="layui-input-inline">
+                            <select id="BrandId" name="BrandId" lay-search="">
+                                <option value="">全部...</option>
+                                @foreach (string key in ProfitObjectsActivesDic.Keys)
+                                {
+                                    <option value="@key">@ProfitObjectsActivesDic[key]</option>
+                                }
+                            </select>
+                        </div>
+                    </div>
                     <div class="layui-inline">
                         <label class="layui-form-label">商户姓名</label>
                         <div class="layui-input-inline">

Models/KqProducts.cs

@@ -18,5 +18,20 @@ namespace MySystem.Models
         public string SeoKeyword { get; set; }
         public string SeoDescription { get; set; }
         public string Name { get; set; }
+        public int CountOfBox { get; set; }
+        public int MinStock { get; set; }
+        public int Kind { get; set; }
+        public int NoticeMoneyUnit { get; set; }
+        public int ReqMoneyUnit { get; set; }
+        public string AdColId { get; set; }
+        public decimal DefaultDeposit { get; set; }
+        public ulong MerNameWithStar { get; set; }
+        public ulong SingleDepositApi { get; set; }
+        public decimal ActTradeAmount { get; set; }
+        public decimal PosPrice { get; set; }
+        public int MainStoreId { get; set; }
+        public string SpProductType { get; set; }
+        public decimal FluxProfit { get; set; }
+        public decimal FluxAmount { get; set; }
     }
 }

Models/MerchantDepositReturns.cs

@@ -19,5 +19,8 @@ namespace MySystem.Models
         public decimal ReturnAmount { get; set; }
         public string AlipayAccountNo { get; set; }
         public int MerchantId { get; set; }
+        public string BankCardNo { get; set; }
+        public string BankName { get; set; }
+        public int PayKind { get; set; }
     }
 }

Models/RefreshTokens.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models
+{
+    public partial class RefreshTokens
+    {
+        public string RefreshToken { get; set; }
+        public DateTime? ExpiredDate { get; set; }
+        public string UserName { get; set; }
+    }
+}

Models/TradeRecord.cs

@@ -40,5 +40,6 @@ namespace MySystem.Models
         public string ParentNav { get; set; }
         public int PayType { get; set; }
         public int VipFlag { get; set; }
+        public int ActStatus { get; set; }
     }
 }

Models/Users.cs

@@ -94,5 +94,7 @@ namespace MySystem.Models
         public DateTime? CreateStoreDate { get; set; }
         public int StoreStock { get; set; }
         public int ThisMonthSend { get; set; }
+        public string BusinessLogo { get; set; }
+        public string BusinessName { get; set; }
     }
 }

wwwroot/layuiadmin/modules_main/MerchantDepositReturns_Admin.js

@@ -136,6 +136,9 @@ layui.config({
             , { field: 'MerchantIdMerRealName', width: 200, title: '商户姓名', sort: true }
             , { field: 'SeoKeyword', width: 200, title: '退押订单号', sort: true }
             , { field: 'AlipayAccountNo', width: 200, title: '支付宝账号', sort: true }
+            , { field: 'BankCardNo', width: 200, title: '银行卡号', sort: true }
+            , { field: 'BankName', width: 200, title: '开户行', sort: true }
+            , { field: 'PayKindName', 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 }

wwwroot/layuiadmin/modules_main/MerchantDepositReturnsn_Admin.js

@@ -136,6 +136,9 @@ layui.config({
             , { field: 'MerchantIdMerRealName', width: 200, title: '商户姓名', sort: true }
             , { field: 'SeoKeyword', width: 200, title: '退押订单号', sort: true }
             , { field: 'AlipayAccountNo', width: 200, title: '支付宝账号', sort: true }
+            , { field: 'BankCardNo', width: 200, title: '银行卡号', sort: true }
+            , { field: 'BankName', width: 200, title: '开户行', sort: true }
+            , { field: 'PayKindName', 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 }