暂存

Areas/Admin/Controllers/MainServer/OrderRefundController.cs

@@ -49,15 +49,48 @@ namespace MySystem.Areas.Admin.Controllers
         /// 退款申请列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(OrderRefund data, string OrderNo, string CreateDateData, string UserIdMakerCode, int ProductIdSelect, string RefundStatusSelect, int page = 1, int limit = 30)
+        public JsonResult IndexData(OrderRefund data, string OrderNo, string CreateDateData, string UserIdMakerCode, string ProductIdSelect, string RefundStatusSelect, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
+            string condition = " and Status>-1";
+            //平台订单号
+            if (!string.IsNullOrEmpty(OrderNo))
+            {
+                condition += " and OrderNo like '" + OrderNo + "'";
+            }
+            //退货时间
+            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'";
+            }
+            //创客编号
+            if (!string.IsNullOrEmpty(UserIdMakerCode))
+            {
+                condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + UserIdMakerCode + "')";
+            }
+            //商品名称
+            if (!string.IsNullOrEmpty(ProductIdSelect))
+            {
+                condition += " and Id in (select OrderId from OrderProduct where ProductId=" + ProductIdSelect + ")";//表数据量过大时不适用
+            }
 
-            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("OrderRefund", Fields, "Id desc", "False", page, limit);
+            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("OrderRefund", Fields, "Id desc", "False", page, limit, condition);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             foreach (Dictionary<string, object> dic in diclist)
             {
+                //创客
+                int UserId = int.Parse(function.CheckInt(dic["UserId"].ToString()));
+                Users userid_Users = db.Users.FirstOrDefault(m => m.Id == UserId) ?? new Users();
+                dic["UserInfo"] = userid_Users.MakerCode + "<br />" + userid_Users.RealName;
+                dic.Remove("UserId");
+
+                //商品名称
+                dic["ProductName"] = RelationClass.GetProductsInfo(int.Parse(dic["ProductId"].ToString()));
+                
             }
             return Json(obj);
         }
@@ -165,7 +198,7 @@ namespace MySystem.Areas.Admin.Controllers
                 string result = "";
                 PublicAccountSet set = db.PublicAccountSet.FirstOrDefault() ?? new PublicAccountSet();
                 if (order.PayMode == 1)
-                { 
+                {
                     result = new Alipay.AlipayPublicClass(_accessor.HttpContext).Refund(set.AlipayAppId, set.AlipayPrivateKey, set.AlipayPublicKey, order.OrderNo, order.ActualPay);
                 }
                 else if (order.PayMode == 2)
@@ -174,17 +207,17 @@ namespace MySystem.Areas.Admin.Controllers
                 }
                 if (result.StartsWith("success|"))
                 {
-                    int OrderCount = db.OrderForNo.FirstOrDefault(m=>m.OrderNo == order.OrderNo).OrderIds.Split(',').Length;
+                    int OrderCount = db.OrderForNo.FirstOrDefault(m => m.OrderNo == order.OrderNo).OrderIds.Split(',').Length;
                     if (order.CouponId > 0 && OrderCount == 1)
                     {
                         Coupons coupon = db.Coupons.FirstOrDefault(m => m.Id == order.CouponId);
                         if (coupon != null)
                         {
                             if (coupon.IsReUse == 0)
-                            { 
+                            {
                                 CouponsForUser couponForUser = db.CouponsForUser.FirstOrDefault(m => m.UserId == order.UserId && m.CouponId == order.CouponId && m.IsUse == 1);
                                 if (couponForUser != null)
-                                { 
+                                {
                                     couponForUser.IsLock = 0;
                                     couponForUser.IsUse = 0;
                                 }

Areas/Admin/Controllers/MainServer/ProductsController.cs

@@ -38,18 +38,6 @@ namespace MySystem.Areas.Admin.Controllers
         {
             ViewBag.RightInfo = RightInfo;
             ViewBag.right = right;
-            ViewBag.SysUserName = SysUserName;
-
-            string Condition = "";
-            Condition += "ProductName:\"" + data.ProductName + "\",";
-            Condition += "MerchantClassId:\"" + data.MerchantClassId + "\",";
-
-            if (!string.IsNullOrEmpty(Condition))
-            {
-                Condition = Condition.TrimEnd(',');
-                Condition = ", where: {" + Condition + "}";
-            }
-            ViewBag.Condition = Condition;
             return View();
         }
 
@@ -61,26 +49,30 @@ namespace MySystem.Areas.Admin.Controllers
         /// 商品信息列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(Products data, int page = 1, int limit = 30)
+        public JsonResult IndexData(Products data, string ColId, int page = 1, int limit = 30)
         {
-            Dictionary<string, string> ProductFareTempDic = new ProductDictionary().getProductFareTempDic(data.MerchantId);
-            Dictionary<string, string> MerchantClassDic = new MerchantDictionary().getMerchantClassDic(data.MerchantId);
+            // Dictionary<string, string> ProductFareTempDic = new ProductDictionary().getProductFareTempDic(data.MerchantId);
+            // Dictionary<string, string> MerchantClassDic = new MerchantDictionary().getMerchantClassDic(data.MerchantId);
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
-            Fields.Add("ColId", "1"); //分类
+            // Fields.Add("ColId", "1"); //分类
             Fields.Add("ProductName", "2"); //商品名称
-            Fields.Add("MerchantClassId", "1"); //商家分类
+            // Fields.Add("MerchantClassId", "1"); //商家分类
             string condition = "";
-            if (SysRealRole == 3)
+            // if (SysRealRole == 3)
+            // {
+            //     condition += " and MerchantId=" + SysId;
+            // }
+            if (!string.IsNullOrEmpty(ColId))
             {
-                condition += " and MerchantId=" + SysId;
+                condition += " and ColId like '%" + ColId + "%'";
             }
             Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("Products", Fields, "Id desc", "False", page, limit, condition);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             foreach (Dictionary<string, object> dic in diclist)
             {
-                dic["FareTemplateId"] = new DictionaryClass().getDictionaryNameByKey(ProductFareTempDic, dic["FareTemplateId"].ToString());
-                dic["MerchantClassId"] = new DictionaryClass().getDictionaryNameByKey(MerchantClassDic, dic["MerchantClassId"].ToString());
+                // dic["FareTemplateId"] = new DictionaryClass().getDictionaryNameByKey(ProductFareTempDic, dic["FareTemplateId"].ToString());
+                // dic["MerchantClassId"] = new DictionaryClass().getDictionaryNameByKey(MerchantClassDic, dic["MerchantClassId"].ToString());
                 dic["Status"] = dic["Status"].ToString() == "1" ? "已上架" : "已下架";
             }
             return Json(obj);
@@ -118,7 +110,7 @@ namespace MySystem.Areas.Admin.Controllers
         {
             Products product = db.Products.FirstOrDefault(m => m.ProductName == data.ProductName);
             if (product != null)
-            { 
+            {
                 return "商品名称已存在";
             }
             Dictionary<string, object> Fields = new Dictionary<string, object>();
@@ -391,19 +383,19 @@ namespace MySystem.Areas.Admin.Controllers
         }
 
         #endregion
-   
-    
-    
-    
-    
+
+
+
+
+
         #region 根据分类获取商品列表
 
-        public List<Dictionary<string, object>> GetProductByCol(string ColIds,string MerchantIds)
-        { 
+        public List<Dictionary<string, object>> GetProductByCol(string ColIds, string MerchantIds)
+        {
             List<Dictionary<string, object>> list = new List<Dictionary<string, object>>();
             IQueryable<Products> products = db.Products;
             if (!string.IsNullOrEmpty(ColIds))
-            { 
+            {
                 List<string> colidlist = ColIds.Split(',').ToList();
                 products = products.Where(m => colidlist.Contains(m.ColId));
             }
@@ -419,7 +411,7 @@ namespace MySystem.Areas.Admin.Controllers
             }
             products = products.OrderByDescending(m => m.Id);
             foreach (Products product in products.ToList())
-            { 
+            {
                 Dictionary<string, object> row = new Dictionary<string, object>();
                 row.Add("title", product.ProductName);
                 row.Add("value", product.Id);
@@ -460,7 +452,7 @@ namespace MySystem.Areas.Admin.Controllers
         }
 
         #endregion
-    
-    
+
+
     }
 }

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

@@ -4,33 +4,40 @@
 }
 <!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">
     <link rel="stylesheet" href="/layuiadmin/style/admin.css" media="all">
     <script src="/admin/js/jquery-1.10.1.min.js"></script>
     <style>
-        .layui-input-inline{
+        .layui-input-inline {
             width: 175px !important;
         }
-        .layui-form-label{
+
+        .layui-form-label {
             width: 85px !important;
         }
-        .layui-inline{
+
+        .layui-inline {
             margin-right: 0px !important;
-        }        
-        .w100{
+        }
+
+        .w100 {
             width: 100px !important;
         }
-        .ml50{
+
+        .ml50 {
             margin-left: 50px !important;
         }
     </style>
 </head>
+
 <body>
     <div class="layui-fluid">
         <div class="layui-card">
@@ -38,21 +45,15 @@
                 <div class="layui-form-item">
                     <div class="layui-inline">
                         <label class="layui-form-label">分类</label>
+                        @{
+                            Dictionary<string, string> ColDic = new MySystem.DictionaryClass().getColDic("006");
+                        }
                         <div class="layui-input-inline">
                             <select id="ColId" name="ColId" lay-search="">
                                 <option value="">全部...</option>
-                                @{Dictionary<string, string> ColDic = new MySystem.DictionaryClass().getColDic("002");}
                                 @foreach (string key in ColDic.Keys)
                                 {
-                                    if (RightInfo.Contains("," + key + ","))
-                                    {
-                                        string kg = "";
-                                        for (int i = 1; i < key.Length / 3 - 1; i++)
-                                        {
-                                            kg += "　　";
-                                        }
-                                        <option value="@key">@kg@ColDic[key]</option>
-                                    }
+                                    <option value="@key">@ColDic[key]</option>
                                 }
                             </select>
                         </div>
@@ -78,19 +79,23 @@
                 <div style="padding-bottom: 10px;">
                     @if (RightInfo.Contains("," + right + "_add,"))
                     {
-                        <button class="layui-btn" data-type="add"><i class="layui-icon layui-icon-add-1 layuiadmin-button-btn"></i>新增</button>
+                        <button class="layui-btn" data-type="add"><i
+                            class="layui-icon layui-icon-add-1 layuiadmin-button-btn"></i>新增</button>
                     }
                     @if (RightInfo.Contains("," + right + "_delete,"))
                     {
-                        <button class="layui-btn" data-type="batchdel"><i class="layui-icon layui-icon-delete layuiadmin-button-btn"></i>删除</button>
+                        <button class="layui-btn" data-type="batchdel"><i
+                            class="layui-icon layui-icon-delete layuiadmin-button-btn"></i>删除</button>
                     }
                     @if (RightInfo.Contains("," + right + "_up,"))
                     {
-                        <button class="layui-btn" data-type="Open"><i class="layui-icon layui-icon-up layuiadmin-button-btn"></i>上架</button>
+                        <button class="layui-btn" data-type="Open"><i
+                            class="layui-icon layui-icon-up layuiadmin-button-btn"></i>上架</button>
                     }
                     @if (RightInfo.Contains("," + right + "_down,"))
                     {
-                        <button class="layui-btn" data-type="Close"><i class="layui-icon layui-icon-down layuiadmin-button-btn"></i>下架</button>
+                        <button class="layui-btn" data-type="Close"><i
+                            class="layui-icon layui-icon-down layuiadmin-button-btn"></i>下架</button>
                     }
                 </div>
 
@@ -101,15 +106,15 @@
                 <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 + "_norm,"))
                     {
-                        <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="norm"><i class="layui-icon layui-icon-edit"></i>规格</a>
+                            <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="norm"><i class="layui-icon layui-icon-edit"></i>规格</a>
                     }
                 </script>
             </div>
@@ -141,4 +146,5 @@
         var right = '@right';
     </script>
 </body>
+
 </html>