Merge branch 'DuGuYang' into develop

Areas/Admin/Controllers/MainServer/ActiveRewardController.cs

@@ -163,7 +163,7 @@ namespace MySystem.Areas.Admin.Controllers
             }
             else
             {
-                var start = Convert.ToDateTime(DateTime.Now.AddMonths(-1).ToString("yyyy-MM-dd"));
+                var start = Convert.ToDateTime(DateTime.Now.AddMonths(-1).ToString("yyyy-MM") + "-01");
                 var check = db.ActiveReward.Any(m => m.ActDate >= start && m.BrandId == Convert.ToInt32(BrandId));
                 if (check)
                 {

Areas/Admin/Controllers/MainServer/MsgAlertController.cs

@@ -51,12 +51,12 @@ namespace MySystem.Areas.Admin.Controllers
         /// 弹窗消息列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(MsgAlert data, string MsgTypeSelect, string PushTypeSelect, string PushFlagSelect, int page = 1, int limit = 30)
+        public JsonResult IndexData(MsgAlert data, string MsgTypeSelect, string PushTypeSelect, string PushFlagSelect, string CreateDateData, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
 
-            Fields.Add("CreateDate", "3"); //时间
+            // Fields.Add("CreateDate", "3"); //时间
             Fields.Add("Title", "1"); //标题
 
 
@@ -76,6 +76,14 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and PushFlag=" + PushFlagSelect;
             }
+            //创建时间
+            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("MsgAlert", Fields, "Id desc", "0", page, limit, condition);
@@ -86,6 +94,7 @@ namespace MySystem.Areas.Admin.Controllers
                 int MsgType = int.Parse(dic["MsgType"].ToString());
                 if (MsgType == 1) dic["MsgType"] = "文本";
                 if (MsgType == 2) dic["MsgType"] = "图片";
+                if (MsgType == 3) dic["MsgType"] = "动图";
                 if (MsgType == 0) dic["MsgType"] = "";
                 dic["StatusName"] = dic["Status"].ToString() == "1" ? "正常" : "关闭";
                 //推送类型
@@ -136,6 +145,7 @@ namespace MySystem.Areas.Admin.Controllers
             Dictionary<string, object> Fields = new Dictionary<string, object>();
 
             Fields.Add("MsgType", data.MsgType); //消息类型
+            Fields.Add("Status", 1); //默认开启
             Fields.Add("Title", data.Title); //标题
             Fields.Add("Summary", data.Summary); //简介
             Fields.Add("Content", data.Content); //内容
@@ -155,9 +165,9 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("IsWeekend", data.IsWeekend); //是否周末
 
             Fields.Add("SeoTitle", data.SeoTitle);
-            Fields.Add("SeoKeyword", data.SeoKeyword);
+            Fields.Add("SeoKeyword", DateTime.Now.ToString("yyyyMMddHHmmssfff") + function.get_Random(8));
             Fields.Add("SeoDescription", data.SeoDescription);
-            int Id = new AdminContentOther(_accessor.HttpContext, SystemPublicFuction.dbtables).Add("MsgAlert", Fields, 0);
+            int Id = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Add("MsgAlert", Fields, 0);
             AddSysLog(data.Id.ToString(), "MsgAlert", "add");
             db.SaveChanges();
 
@@ -216,9 +226,8 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("IsWeekend", data.IsWeekend); //是否周末
 
             Fields.Add("SeoTitle", data.SeoTitle);
-            Fields.Add("SeoKeyword", data.SeoKeyword);
             Fields.Add("SeoDescription", data.SeoDescription);
-            new AdminContentOther(_accessor.HttpContext, SystemPublicFuction.dbtables).Edit("MsgAlert", Fields, data.Id);
+            new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("MsgAlert", Fields, data.Id);
             AddSysLog(data.Id.ToString(), "MsgAlert", "update");
             db.SaveChanges();
 
@@ -242,7 +251,7 @@ namespace MySystem.Areas.Admin.Controllers
                 int id = int.Parse(subid);
                 Dictionary<string, object> Fields = new Dictionary<string, object>();
                 Fields.Add("Status", -1);
-                new AdminContentOther(_accessor.HttpContext, SystemPublicFuction.dbtables).Edit("MsgAlert", Fields, id);
+                new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("MsgAlert", Fields, id);
             }
             db.SaveChanges();
 
@@ -266,7 +275,7 @@ namespace MySystem.Areas.Admin.Controllers
                 int id = int.Parse(subid);
                 Dictionary<string, object> Fields = new Dictionary<string, object>();
                 Fields.Add("Status", 1);
-                new AdminContentOther(_accessor.HttpContext, SystemPublicFuction.dbtables).Edit("MsgAlert", Fields, id);
+                new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("MsgAlert", Fields, id);
             }
             db.SaveChanges();
             return "success";
@@ -289,7 +298,7 @@ namespace MySystem.Areas.Admin.Controllers
                 int id = int.Parse(subid);
                 Dictionary<string, object> Fields = new Dictionary<string, object>();
                 Fields.Add("Status", 0);
-                new AdminContentOther(_accessor.HttpContext, SystemPublicFuction.dbtables).Edit("MsgAlert", Fields, id);
+                new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("MsgAlert", Fields, id);
             }
             db.SaveChanges();
             return "success";
@@ -304,7 +313,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// <param name="Id"></param>
         public string Sort(int Id, int Sort)
         {
-            new AdminContentOther(_accessor.HttpContext, SystemPublicFuction.dbtables).Sort("MsgAlert", Sort, Id);
+            new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Sort("MsgAlert", Sort, Id);
 
             AddSysLog(Id.ToString(), "MsgAlert", "sort");
             return "success";
@@ -368,7 +377,7 @@ namespace MySystem.Areas.Admin.Controllers
             }
 
 
-            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, SystemPublicFuction.dbtables).IndexData("MsgAlert", Fields, "Id desc", "0", 1, 20000, condition, "", false);
+            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("MsgAlert", Fields, "Id desc", "0", 1, 20000, condition, "", false);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             foreach (Dictionary<string, object> dic in diclist)
             {

Areas/Admin/Controllers/MainServer/OrdersController.cs

@@ -178,7 +178,7 @@ namespace MySystem.Areas.Admin.Controllers
             //商品类型名称
             if (!string.IsNullOrEmpty(ProductIdSelect))
             {
-                condition += " and Id in (select OrderId from OrderProduct where ProductId="+ProductIdSelect+")";//表数据量过大时不适用
+                condition += " and Id in (select OrderId from OrderProduct where ProductId=" + ProductIdSelect + ")";//表数据量过大时不适用
             }
             //仓库类型
             if (!string.IsNullOrEmpty(StoreTypeSelect))
@@ -238,7 +238,7 @@ namespace MySystem.Areas.Admin.Controllers
                 if (SendStatus == 1) dic["SendStatusName"] = "已发货";
                 if (SendStatus == 2) dic["SendStatusName"] = "已退货";
                 if (SendStatus == 0)
-                { 
+                {
                     dic["SendInfo"] = dic["SendStatus"].ToString();
                 }
                 else
@@ -461,7 +461,7 @@ namespace MySystem.Areas.Admin.Controllers
         }
 
         #endregion
-        
+
         #region 发货
 
         public IActionResult Send(string right, int Id = 0)
@@ -557,11 +557,11 @@ namespace MySystem.Areas.Admin.Controllers
                 // string result = new Alipay.AlipayPublicClass(_accessor.HttpContext).Refund(set.AlipayAppId, set.AlipayPrivateKey, set.AlipayPublicKey, order.OrderNo, order.TotalPrice);
                 // if (result.StartsWith("success"))
                 // {
-                    order.RefundActAmount = data.RefundActAmount;
-                    order.RefundReason = data.RefundReason;
-                    order.RefundStatus = 1;                    
-                    db.SaveChanges();
-                    return "success";
+                order.RefundActAmount = data.RefundActAmount;
+                order.RefundReason = data.RefundReason;
+                order.RefundStatus = 1;
+                db.SaveChanges();
+                return "success";
                 // }
                 // else
                 // { 
@@ -951,7 +951,7 @@ namespace MySystem.Areas.Admin.Controllers
                     dic["ProductPrice"] = product.ProductPrice;  //商品单价
                     dic["NormDetail"] = product.NormDetail;  //商品规格
                     if (i == 1)
-                    { 
+                    {
                         ReturnFields.Add("ProductCode", "商品编号");
                         ReturnFields.Add("ProductName", "商品名称");
                         ReturnFields.Add("ProductCount", "商品数量");
@@ -986,7 +986,7 @@ namespace MySystem.Areas.Admin.Controllers
             // result.Add("Status", "1");
             // result.Add("Info", "Excel报表-" + DateTime.Now.ToString("yyyy-MM-ddTHH:mm:ss") + ".xlsx");
             // result.Add("Obj", diclist);
-            
+
             var title = table.CreateRow(0);
             int j = 0;
             foreach (string key in ReturnFields.Keys)
@@ -1032,7 +1032,213 @@ namespace MySystem.Areas.Admin.Controllers
         #endregion
 
 
+        #region 导出Excel
+
+        /// <summary>
+        /// 导出Excel
+        /// </summary>
+        /// <returns></returns>
+        public JsonResult ExportsExcel(Orders data, string UserIdMakerCode, string UserIdRealName, string PayModeSelect, string StoreIdStoreNo, string StoreIdStoreName, string RefundStatusSelect, string DeliveryTypeSelect, string SendStatusSelect, string ProductIdSelect, string StoreTypeSelect, string StoreUserIdMakerCode, string StoreUserIdRealName, string PayStatusSelect, string RedisKey = "ExportKey")
+        {
+            Dictionary<string, string> Fields = new Dictionary<string, string>();
+            Fields.Add("CreateDate", "3"); //时间
+            Fields.Add("OrderNo", "1"); //订单号
+            Fields.Add("RealName", "1"); //姓名
+            Fields.Add("Mobile", "1"); //手机号
+            Fields.Add("ErpCode", "1"); //运单号
+            Fields.Add("SendDate", "3"); //发货时间
+            Fields.Add("TradeNo", "1"); //支付交易号
+            Fields.Add("StoreContact", "1"); //仓库联系人
+            Fields.Add("SnNos", "2"); //SN编号
+            Fields.Add("TopUserId", "0");
+
+            string condition = " and Status>-1";
+            //创客编号
+            if (!string.IsNullOrEmpty(UserIdMakerCode))
+            {
+                condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + UserIdMakerCode + "')";
+            }
+            //创客真实姓名
+            if (!string.IsNullOrEmpty(UserIdRealName))
+            {
+                condition += " and UserId in (select UserId from UserForRealName where RealName='" + UserIdRealName + "')";
+            }
+            //支付方式
+            if (!string.IsNullOrEmpty(PayModeSelect))
+            {
+                condition += " and PayMode=" + PayModeSelect;
+            }
+            //仓库编号
+            if (!string.IsNullOrEmpty(StoreIdStoreNo))
+            {
+                condition += " and StoreId in (select StoreId from StoreHouseForStoreNo where StoreNo='" + StoreIdStoreNo + "')";
+            }
+            //仓库名称
+            if (!string.IsNullOrEmpty(StoreIdStoreName))
+            {
+                condition += " and StoreId in (select StoreId from StoreHouseForStoreName where StoreName='" + StoreIdStoreName + "')";
+            }
+            //退款状态
+            if (!string.IsNullOrEmpty(RefundStatusSelect))
+            {
+                condition += " and RefundStatus=" + RefundStatusSelect;
+            }
+            //提货类型
+            if (!string.IsNullOrEmpty(DeliveryTypeSelect))
+            {
+                condition += " and DeliveryType=" + DeliveryTypeSelect;
+            }
+            //发货状态
+            if (!string.IsNullOrEmpty(SendStatusSelect))
+            {
+                condition += " and SendStatus=" + SendStatusSelect;
+            }
+            //商品名称
+            if (!string.IsNullOrEmpty(ProductIdSelect))
+            {
+                condition += " and ProductId=" + ProductIdSelect;
+            }
+            //仓库类型
+            if (!string.IsNullOrEmpty(StoreTypeSelect))
+            {
+                condition += " and StoreType=" + StoreTypeSelect;
+            }
+            //仓库归属创客编号
+            if (!string.IsNullOrEmpty(StoreUserIdMakerCode))
+            {
+                condition += " and StoreUserId in (select StoreUserId from UserForMakerCode where MakerCode='" + StoreUserIdMakerCode + "')";
+            }
+            //仓库归属创客真实姓名
+            if (!string.IsNullOrEmpty(StoreUserIdRealName))
+            {
+                condition += " and StoreUserId in (select StoreUserId from UserForRealName where RealName='" + StoreUserIdRealName + "')";
+            }
+            //支付状态
+            if (!string.IsNullOrEmpty(PayStatusSelect))
+            {
+                condition += " and PayStatus=" + PayStatusSelect;
+            }
+            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("Orders", Fields, "Id desc", "0", 1, 20000, condition, "UserId,OrderNo,RealName,Mobile,TotalPrice,Areas,Address,ErpName,ErpCode,SendDate,PayMode,TradeNo,StoreId,RefundStatus,DeliveryType,SendStatus,ProductId,StoreContact,StoreType,StoreUserId,TopUserId,PayStatus,BuyCount,Remark,Id", false);
+            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["UserIdMakerCode"] = userid_Users.MakerCode;
+                dic["UserIdRealName"] = userid_Users.RealName;
+                dic.Remove("UserId");
+                //物流名称
+                dic["ErpName"] = RelationClass.GetErpCompanysInfo(dic["ErpName"].ToString());
+                //支付方式
+                int PayMode = int.Parse(dic["PayMode"].ToString());
+                if (PayMode == 1) dic["PayMode"] = "支付宝";
+                if (PayMode == 2) dic["PayMode"] = "微信";
+                if (PayMode == 3) dic["PayMode"] = "账户余额";
+                if (PayMode == 0) dic["PayMode"] = "";
+                //仓库
+                int StoreId = int.Parse(function.CheckInt(dic["StoreId"].ToString()));
+                StoreHouse storeid_StoreHouse = db.StoreHouse.FirstOrDefault(m => m.Id == StoreId) ?? new StoreHouse();
+                dic["StoreIdStoreNo"] = storeid_StoreHouse.StoreNo;
+                dic["StoreIdStoreName"] = storeid_StoreHouse.StoreName;
+                dic.Remove("StoreId");
+                //退款状态
+                int RefundStatus = int.Parse(dic["RefundStatus"].ToString());
+                if (RefundStatus == 0) dic["RefundStatus"] = "未退款";
+                if (RefundStatus == 1) dic["RefundStatus"] = "已退款";
+                //提货类型
+                int DeliveryType = int.Parse(dic["DeliveryType"].ToString());
+                if (DeliveryType == 1) dic["DeliveryType"] = "邮寄到付";
+                if (DeliveryType == 2) dic["DeliveryType"] = "上门自提";
+                if (DeliveryType == 0) dic["DeliveryType"] = "";
+                //发货状态
+                int SendStatus = int.Parse(dic["SendStatus"].ToString());
+                if (SendStatus == 0) dic["SendStatus"] = "未发货";
+                if (SendStatus == 1) dic["SendStatus"] = "已发货";
+                if (SendStatus == 2) dic["SendStatus"] = "已退货";
+                //商品名称
+                dic["ProductId"] = RelationClass.GetProductsInfo(int.Parse(dic["ProductId"].ToString()));
+                //仓库类型
+                int StoreType = int.Parse(dic["StoreType"].ToString());
+                if (StoreType == 0) dic["StoreType"] = "总仓";
+                if (StoreType == 1) dic["StoreType"] = "分仓";
+                //仓库归属创客
+                int StoreUserId = int.Parse(function.CheckInt(dic["StoreUserId"].ToString()));
+                Users storeuserid_Users = db.Users.FirstOrDefault(m => m.Id == StoreUserId) ?? new Users();
+                dic["StoreUserIdMakerCode"] = storeuserid_Users.MakerCode;
+                dic["StoreUserIdRealName"] = storeuserid_Users.RealName;
+                dic.Remove("StoreUserId");
+                //顶级创客
+                int TopUserId = int.Parse(function.CheckInt(dic["TopUserId"].ToString()));
+                Users topuserid_Users = db.Users.FirstOrDefault(m => m.Id == TopUserId) ?? new Users();
+                dic["TopUserIdMakerCode"] = topuserid_Users.MakerCode;
+                dic["TopUserIdRealName"] = topuserid_Users.RealName;
+                dic.Remove("TopUserId");
+                //支付状态
+                int PayStatus = int.Parse(dic["PayStatus"].ToString());
+                if (PayStatus == 0) dic["PayStatus"] = "未支付";
+                if (PayStatus == 1) dic["PayStatus"] = "支付成功";
+                if (PayStatus == 2) dic["PayStatus"] = "支付失败";
+                if (PayStatus == 3) dic["PayStatus"] = "支付锁定中";
+                if (PayStatus == 4) dic["PayStatus"] = "支付处理中";
+
+                int OrderId = int.Parse(dic["Id"].ToString());
+                List<OrderProduct> products = db.OrderProduct.Where(m => m.OrderId == OrderId).ToList();
+                foreach (OrderProduct product in products)
+                {
+                    dic["ProductCode"] = product.ProductCode;  //商品编号
+                    dic["ProductName"] = product.ProductName;  //商品名称
+                    dic["ProductCount"] = product.ProductCount;  //商品数量
+                    dic["ProductPrice"] = product.ProductPrice;  //商品单价
+                    dic["NormDetail"] = product.NormDetail;  //商品规格
+                }
+                dic.Remove("Id");
+            }
+
+            Dictionary<string, object> result = new Dictionary<string, object>();
+            result.Add("Status", "1");
+            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("UserIdMakerCode", "创客编号");
+            ReturnFields.Add("UserIdRealName", "创客真实姓名");
+            ReturnFields.Add("OrderNo", "订单号");
+            ReturnFields.Add("RealName", "姓名");
+            ReturnFields.Add("Mobile", "手机号");
+            ReturnFields.Add("TotalPrice", "总价");
+            ReturnFields.Add("Areas", "所在地区");
+            ReturnFields.Add("Address", "详细地址");
+            ReturnFields.Add("ErpName", "物流名称");
+            ReturnFields.Add("ErpCode", "运单号");
+            ReturnFields.Add("SendDate", "发货时间");
+            ReturnFields.Add("PayMode", "支付方式");
+            ReturnFields.Add("TradeNo", "支付交易号");
+            ReturnFields.Add("StoreIdStoreNo", "仓库编号");
+            ReturnFields.Add("StoreIdStoreName", "仓库名称");
+            ReturnFields.Add("RefundStatus", "退款状态");
+            ReturnFields.Add("DeliveryType", "提货类型");
+            ReturnFields.Add("SendStatus", "发货状态");
+            ReturnFields.Add("ProductId", "商品名称");
+            ReturnFields.Add("StoreContact", "仓库联系人");
+            ReturnFields.Add("StoreType", "仓库类型");
+            ReturnFields.Add("StoreUserIdMakerCode", "仓库归属创客编号");
+            ReturnFields.Add("StoreUserIdRealName", "仓库归属创客姓名");
+            ReturnFields.Add("TopUserIdMakerCode", "顶级创客编号");
+            ReturnFields.Add("TopUserIdRealName", "顶级创客姓名");
+            ReturnFields.Add("PayStatus", "支付状态");
+            ReturnFields.Add("BuyCount", "下单数量");
+            ReturnFields.Add("Remark", "订单备注");
+            ReturnFields.Add("ProductCode", "商品编号");
+            ReturnFields.Add("ProductName", "商品名称");
+            ReturnFields.Add("ProductCount", "商品数量");
+            ReturnFields.Add("ProductPrice", "商品单价");
+            ReturnFields.Add("NormDetail", "商品规格");
+            result.Add("Fields", ReturnFields);
+            AddSysLog("0", "Orders", "ExportExcel");
+            return Json(result);
+        }
 
+        #endregion
 
 
         #region 查询直推奖励100
@@ -1043,7 +1249,7 @@ namespace MySystem.Areas.Admin.Controllers
             string result = "";
             Orders order = db.Orders.FirstOrDefault(m => m.Id == Id) ?? new Orders();
             if (order.PayStatus < 1)
-            { 
+            {
                 result += "未付款\n";
                 dic.Add("code", "1");
                 dic.Add("result", result);
@@ -1068,13 +1274,13 @@ namespace MySystem.Areas.Admin.Controllers
                     item = db.UserAccountRecord.FirstOrDefault(m => m.UserId == puser.Id && m.ChangeType == 112 && m.ChangeAmount == 100 && m.CreateDate >= start && m.CreateDate <= end);
                 }
                 if (item != null)
-                { 
-                    IsGet = "已发放(发放时间:"+item.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss")+")";
+                {
+                    IsGet = "已发放(发放时间:" + item.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") + ")";
                     ToUserId = item.UserId;
                     dic.Add("code", "1");
                 }
                 else
-                { 
+                {
                     dic.Add("code", "0");
                 }
                 Users touser = db.Users.FirstOrDefault(m => m.Id == ToUserId) ?? new Users();
@@ -1084,14 +1290,14 @@ namespace MySystem.Areas.Admin.Controllers
             }
             else
             {
-                result += "上级创客未满足条件\n购买机：" + machineCount + "台，激活机：" + ActiveCount + "台\n";                
+                result += "上级创客未满足条件\n购买机：" + machineCount + "台，激活机：" + ActiveCount + "台\n";
                 dic.Add("code", "1");
             }
             dic.Add("result", result);
             return dic;
         }
         public string AddPrize100(int Id)
-        { 
+        {
             Orders order = db.Orders.FirstOrDefault(m => m.Id == Id);
             if (order != null)
             {
@@ -1160,7 +1366,7 @@ namespace MySystem.Areas.Admin.Controllers
                                 return "success";
                             }
                             else
-                            { 
+                            {
                                 return "上级创客未满足条件：购买机：" + machineCount + "台，激活机：" + ActiveCount + "台";
                             }
                         }

Areas/Admin/Controllers/MainServer/ProfitRewardRecordController.cs

@@ -121,7 +121,7 @@ namespace MySystem.Areas.Admin.Controllers
             }
             else
             {
-                var start = DateTime.Now.AddMonths(-1).ToString("yyyyMMdd");
+                var start = DateTime.Now.AddMonths(-1).ToString("yyyyMM") + "01";
                 var check = db.ProfitRewardRecord.Any(m => Convert.ToInt32(m.SeoTitle) >= Convert.ToInt32(start) && m.BrandId == Convert.ToInt32(BrandId));
                 if (check)
                 {

Areas/Admin/Controllers/MainServer/StoreHouseController.cs

@@ -77,22 +77,23 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 DataTable dt = OtherMySqlConn.dtable("SELECT Id FROM Users WHERE RealName like '%" + UserIdRealName + "%'");
                 var Count = dt.Rows.Count;
-                int times = 0;
+                // int times = 0;
                 string UserIds = "";
                 foreach (DataRow item in dt.Rows)
                 {
-                    times++;
-                    if (times == Count)
-                    {
-                        UserIds += item["Id"].ToString();
-                    }
-                    else
-                    {
-                        UserIds += item["Id"].ToString() + ",";
-                    }
+                    // times++;
+                    // if (times == Count)
+                    // {
+                    //     UserIds += item["Id"].ToString();
+                    // }
+                    // else
+                    // {
+                    //     UserIds += item["Id"].ToString() + ",";
+                    // }
+                    UserIds += item["Id"].ToString() + ",";
                 }
                 // condition += " and UserId in (select UserId from UserForRealName where RealName='" + UserIdRealName + "')";
-                condition += " and UserId in (" + UserIds + ")";
+                condition += " and UserId in (" + UserIds.TrimEnd(',') + ")";
             }
             //仓库管理员真实姓名
 
@@ -100,22 +101,23 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 DataTable dts = OtherMySqlConn.dtable("SELECT Id FROM Users WHERE RealName like '%" + ManageUserIdRealName + "%'");
                 var Counts = dts.Rows.Count;
-                int time = 1;
+                // int time = 1;
                 string UserIdss = "";
                 foreach (DataRow items in dts.Rows)
                 {
-                    time++;
-                    if (time == Counts)
-                    {
-                        UserIdss += items["Id"].ToString();
-                    }
-                    else
-                    {
-                        UserIdss += items["Id"].ToString() + ",";
-                    }
+                    // time++;
+                    // if (time == Counts)
+                    // {
+                    //     UserIdss += items["Id"].ToString();
+                    // }
+                    // else
+                    // {
+                    //     UserIdss += items["Id"].ToString() + ",";
+                    // }
+                    UserIdss += items["Id"].ToString() + ",";
                 }
                 // condition += " and ManageUserId in (select ManageUserId from UserForRealName where RealName='" + ManageUserIdRealName + "')";
-                condition += " and UserId in (" + UserIdss + ")";
+                condition += " and UserId in (" + UserIdss.TrimEnd(',') + ")";
             }
             //仓库管理员手机号
             if (!string.IsNullOrEmpty(ManageUserIdMobile))

Areas/Admin/Controllers/MainServer/TradeRecordController.cs

@@ -144,7 +144,7 @@ namespace MySystem.Areas.Admin.Controllers
             }
             else
             {
-                var start = Convert.ToDateTime(DateTime.Now.AddMonths(-1).ToString("yyyy-MM-dd"));
+                var start = Convert.ToDateTime(DateTime.Now.AddMonths(-1).ToString("yyyy-MM") + "-01");
                 var check = db.TradeRecord.Any(m => m.CreateDate >= start && m.BrandId == Convert.ToInt32(BrandId));
                 if (check)
                 {

Areas/Admin/Controllers/MainServer/UserAccountRecordController.cs

@@ -108,7 +108,7 @@ namespace MySystem.Areas.Admin.Controllers
             }
             else
             {
-                var start = Convert.ToDateTime(DateTime.Now.AddMonths(-1).ToString("yyyy-MM-dd"));
+                var start = Convert.ToDateTime(DateTime.Now.AddMonths(-1).ToString("yyyy-MM") + "-01");
                 var check = db.UserAccountRecord.Any(m => m.CreateDate >= start);
                 if (check)
                 {

Areas/Admin/Controllers/MainServer/UserCashRecordController.cs

@@ -99,7 +99,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and QueryCount=" + QueryCountSelect;
             }
-            
+
             if (!string.IsNullOrEmpty(CreateDateData))
             {
                 string[] datelist = CreateDateData.Split(new string[] { " - " }, StringSplitOptions.None);
@@ -123,7 +123,7 @@ namespace MySystem.Areas.Admin.Controllers
             }
             else
             {
-                var start = Convert.ToDateTime(DateTime.Now.AddMonths(-1).ToString("yyyy-MM-dd"));
+                var start = Convert.ToDateTime(DateTime.Now.AddMonths(-1).ToString("yyyy-MM") + "-01");
                 var check = db.UserCashRecord.Any(m => m.CreateDate >= start && m.TradeType < 3);
                 if (check)
                 {
@@ -349,6 +349,95 @@ namespace MySystem.Areas.Admin.Controllers
 
         #endregion
 
+
+        #region 批量设置成功
+
+        /// <summary>
+        /// 批量设置成功
+        /// </summary>
+        /// <returns></returns>
+        public string BatchSetting(string Id)
+        {
+            string[] idlist = Id.Split(new char[] { ',' });
+            AddSysLog(Id, "UserCashRecord", "BatchSetting");
+            foreach (string subid in idlist)
+            {
+                int id = int.Parse(subid);
+                Dictionary<string, object> Fields = new Dictionary<string, object>();
+                Fields.Add("Status", 1);//设置提现记录为成功
+                new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("UserCashRecord", Fields, id);
+                var userCashRecord = db.UserCashRecord.FirstOrDefault(m => m.Id == id) ?? new UserCashRecord();
+                if (userCashRecord.Id > 0)
+                {
+                    UserAccount account = db.UserAccount.FirstOrDefault(m => m.Id == Convert.ToInt32(userCashRecord.UserId));
+                    if (account != null)
+                    {
+                        account.QueryCount = 1;
+                        decimal TradeAmount = userCashRecord.TradeAmount;
+                        decimal BeforeTotalAmount = account.TotalAmount; //变更前总金额
+                        decimal BeforeFreezeAmount = account.FreezeAmount; //变更前冻结金额
+                        decimal BeforeBalanceAmount = account.BalanceAmount; //变更前余额
+                        account.WithdrawAmount += userCashRecord.TradeAmount;
+                        account.FreezeAmount -= userCashRecord.TradeAmount;
+                        decimal AfterTotalAmount = account.TotalAmount; //变更后总金额
+                        decimal AfterFreezeAmount = account.FreezeAmount; //变更后冻结金额
+                        decimal AfterBalanceAmount = account.BalanceAmount; //变更后余额
+                        db.UserAccountRecord.Add(new UserAccountRecord()
+                        {
+                            CreateDate = DateTime.Now,
+                            UpdateDate = DateTime.Now,
+                            UserId = userCashRecord.UserId, //创客
+                            ChangeType = 3, //变动类型
+                            ProductType = 99, //产品类型
+                            ChangeAmount = userCashRecord.ActualTradeAmount, //变更金额
+                            BeforeTotalAmount = BeforeTotalAmount, //变更前总金额
+                            AfterTotalAmount = AfterTotalAmount, //变更后总金额
+                            BeforeFreezeAmount = BeforeFreezeAmount, //变更前冻结金额
+                            AfterFreezeAmount = AfterFreezeAmount, //变更后冻结金额
+                            BeforeBalanceAmount = BeforeBalanceAmount, //变更前余额
+                            AfterBalanceAmount = AfterBalanceAmount, //变更后余额
+                        });
+                        db.UserAccountRecord.Add(new UserAccountRecord()
+                        {
+                            CreateDate = DateTime.Now,
+                            UpdateDate = DateTime.Now,
+                            UserId = userCashRecord.UserId, //创客
+                            ChangeType = 4, //变动类型
+                            ProductType = 99, //产品类型
+                            ChangeAmount = userCashRecord.TradeFee, //变更金额
+                            BeforeTotalAmount = BeforeTotalAmount, //变更前总金额
+                            AfterTotalAmount = AfterTotalAmount, //变更后总金额
+                            BeforeFreezeAmount = BeforeFreezeAmount, //变更前冻结金额
+                            AfterFreezeAmount = AfterFreezeAmount, //变更后冻结金额
+                            BeforeBalanceAmount = BeforeBalanceAmount, //变更前余额
+                            AfterBalanceAmount = AfterBalanceAmount, //变更后余额
+                        });
+                        db.UserAccountRecord.Add(new UserAccountRecord()
+                        {
+                            CreateDate = DateTime.Now,
+                            UpdateDate = DateTime.Now,
+                            UserId = userCashRecord.UserId, //创客
+                            ChangeType = 5, //变动类型
+                            ProductType = 99, //产品类型
+                            ChangeAmount = userCashRecord.ManageFee, //变更金额
+                            BeforeTotalAmount = BeforeTotalAmount, //变更前总金额
+                            AfterTotalAmount = AfterTotalAmount, //变更后总金额
+                            BeforeFreezeAmount = BeforeFreezeAmount, //变更前冻结金额
+                            AfterFreezeAmount = AfterFreezeAmount, //变更后冻结金额
+                            BeforeBalanceAmount = BeforeBalanceAmount, //变更前余额
+                            AfterBalanceAmount = AfterBalanceAmount, //变更后余额
+                        });
+                        db.SaveChanges();
+                        RedisDbconn.Instance.Set("UserAccount:" + userCashRecord.UserId, account);
+                    }
+                }
+            }
+            db.SaveChanges();
+            return "success";
+        }
+
+        #endregion
+
         #region 排序
         /// <summary>
         /// 排序
@@ -599,7 +688,7 @@ namespace MySystem.Areas.Admin.Controllers
                 // var end = Convert.ToDateTime(start).AddMonths(1);
                 // condition += " and CreateDate>='" + start + " 00:00:00' and CreateDate<'" + end + " 00:00:00'";
 
-                var start = Convert.ToDateTime(DateTime.Now.AddMonths(-1).ToString("yyyy-MM-dd"));
+                var start = Convert.ToDateTime(DateTime.Now.AddMonths(-1).ToString("yyyy-MM") + "-01");
                 var check = db.UserCashRecord.Any(m => m.CreateDate >= start && m.TradeType == 3);
                 if (check)
                 {

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

@@ -33,27 +33,28 @@
                             <div class="layui-form-item">
                                 <label class="layui-form-label">消息类型</label>
                                 <div class="layui-input-inline">
-                                    <select id="MsgType" name="MsgType" lay-search="">
+                                    <select id="MsgType" name="MsgType" lay-search="" lay-filter="MsgType">
                                         <option value="">请选择</option>
-                                        <option value="1">文本</option>
+                                        <option value="1" selected="selected">文本</option>
                                         <option value="2">图片</option>
+                                        <option value="3">动图</option>
                                     </select>
                                 </div>
                             </div>
-                            <div class="layui-form-item">
+                            <div class="layui-form-item" id="Titles">
                                 <label class="layui-form-label">标题</label>
                                 <div class="layui-input-inline">
                                     <input class="layui-input" type="text" id="Title" name="Title" maxlength="50"
-                                        lay-verify="required|" autocomplete="off" placeholder="请输入标题">
+                                        lay-verify="" autocomplete="off" placeholder="请输入标题">
                                 </div>
                             </div>
-                            <div class="layui-form-item layui-form-text">
+                            @* <div class="layui-form-item layui-form-text" id="Title">
                                 <label class="layui-form-label">简介</label>
                                 <div class="layui-input-block">
-                                    <textarea class="layui-textarea" id="Summary" name="Summary" maxlength="500"
-                                        lay-verify="" placeholder="请输入简介"></textarea>
+                                <textarea class="layui-textarea" id="Summary" name="Summary" maxlength="500"
+                                lay-verify="" placeholder="请输入简介"></textarea>
                                 </div>
-                            </div>
+                                </div> *@
                             <div class="layui-form-item layui-form-text">
                                 <label class="layui-form-label">内容</label>
                                 <div class="layui-input-block">
@@ -75,7 +76,7 @@
                                         lay-verify="" autocomplete="off" placeholder="请输入有效结束时间">
                                 </div>
                             </div>
-                            <div class="layui-form-item">
+                            <div class="layui-form-item" id="BgPics" style="display: none;">
                                 <label class="layui-form-label">背景图片</label>
                                 <div class="layui-input-block">
                                     <div class="layui-upload">
@@ -88,49 +89,49 @@
                                     </div>
                                 </div>
                             </div>
-                            <div class="layui-form-item">
+                            @* <div class="layui-form-item">
                                 <label class="layui-form-label">推送类型</label>
                                 <div class="layui-input-inline">
-                                    <select id="PushType" name="PushType" lay-search="">
-                                        <option value="">请选择</option>
-                                        <option value="0">不推送</option>
-                                        <option value="1">立即推送</option>
-                                        <option value="2">定时推送</option>
-                                    </select>
+                                <select id="PushType" name="PushType" lay-search="">
+                                <option value="">请选择</option>
+                                <option value="0">不推送</option>
+                                <option value="1">立即推送</option>
+                                <option value="2">定时推送</option>
+                                </select>
                                 </div>
-                            </div>
-                            <div class="layui-form-item">
+                                </div>
+                                <div class="layui-form-item">
                                 <label class="layui-form-label">推送标记</label>
                                 <div class="layui-input-inline">
-                                    <select id="PushFlag" name="PushFlag" lay-search="">
-                                        <option value="">请选择</option>
-                                        <option value="0">不推送</option>
-                                        <option value="1">未推送</option>
-                                        <option value="2">已推送</option>
-                                    </select>
+                                <select id="PushFlag" name="PushFlag" lay-search="">
+                                <option value="">请选择</option>
+                                <option value="0">不推送</option>
+                                <option value="1">未推送</option>
+                                <option value="2">已推送</option>
+                                </select>
                                 </div>
-                            </div>
-                            <div class="layui-form-item">
+                                </div>
+                                <div class="layui-form-item">
                                 <label class="layui-form-label">推送参数</label>
                                 <div class="layui-input-inline">
-                                    <input class="layui-input" type="text" id="PushParam" name="PushParam"
-                                        maxlength="255" lay-verify="" autocomplete="off" placeholder="请输入推送参数">
+                                <input class="layui-input" type="text" id="PushParam" name="PushParam"
+                                maxlength="255" lay-verify="" autocomplete="off" placeholder="请输入推送参数">
                                 </div>
-                            </div>
-                            <div class="layui-form-item">
+                                </div>
+                                <div class="layui-form-item">
                                 <label class="layui-form-label">推送时间</label>
                                 <div class="layui-input-inline">
-                                    <input class="layui-input" type="text" id="PushTime" name="PushTime" lay-verify=""
-                                        autocomplete="off" placeholder="请输入推送时间">
+                                <input class="layui-input" type="text" id="PushTime" name="PushTime" lay-verify=""
+                                autocomplete="off" placeholder="请输入推送时间">
                                 </div>
-                            </div>
-                            <div class="layui-form-item layui-form-text">
+                                </div> *@
+                            @* <div class="layui-form-item layui-form-text">
                                 <label class="layui-form-label">扩展字段</label>
                                 <div class="layui-input-block">
-                                    <textarea class="layui-textarea" id="ExtendColumn" name="ExtendColumn" maxlength=""
-                                        lay-verify="" placeholder="请输入扩展字段"></textarea>
+                                <textarea class="layui-textarea" id="ExtendColumn" name="ExtendColumn" maxlength=""
+                                lay-verify="" placeholder="请输入扩展字段"></textarea>
                                 </div>
-                            </div>
+                                </div> *@
                             <div class="layui-form-item">
                                 <label class="layui-form-label">跳转Url参数</label>
                                 <div class="layui-input-inline">
@@ -145,7 +146,7 @@
                                         lay-verify="" autocomplete="off" placeholder="请输入跳转Url">
                                 </div>
                             </div>
-                            <div class="layui-form-item">
+                            <div class="layui-form-item" id="Button">
                                 <label class="layui-form-label">按钮文字</label>
                                 <div class="layui-input-inline">
                                     <input class="layui-input" type="text" id="BtnText" name="BtnText" maxlength="50"
@@ -159,13 +160,13 @@
                                         maxlength="20" lay-verify="" autocomplete="off" placeholder="请输入每日次数">
                                 </div>
                             </div>
-                            <div class="layui-form-item">
+                            @* <div class="layui-form-item">
                                 <label class="layui-form-label">弹窗标识</label>
                                 <div class="layui-input-inline">
-                                    <input type="checkbox" id="AlertFlag" name="AlertFlag" value="1" lay-skin="switch"
-                                        lay-filter="switchTest" title="开关">
+                                <input type="checkbox" id="AlertFlag" name="AlertFlag" value="1" lay-skin="switch"
+                                lay-filter="switchTest" title="开关">
                                 </div>
-                            </div>
+                                </div> *@
                             <div class="layui-form-item">
                                 <label class="layui-form-label">是否周末</label>
                                 <div class="layui-input-inline">
@@ -333,6 +334,24 @@
                 location.hash = 'test=' + $(this).attr('lay-id');
             });
 
+            form.on('select(MsgType)', function (data) {
+                if (data.value == '1') {
+                    $('#Titles').show();
+                    $('#BgPics').hide();
+                    $('#Button').show();
+                } else if (data.value == '2') {
+                    $('#Titles').hide();
+                    $('#BgPics').show();
+                    $('#Button').hide();
+                }
+                else if (data.value == '3') {
+                    $('#Titles').hide();
+                    $('#BgPics').show();
+                    $('#Button').hide();
+                }
+                form.render();
+            });
+
             //日期
             laydate.render({
                 elem: '#EffectStartDate',

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

@@ -38,29 +38,30 @@
                             <div class="layui-form-item">
                                 <label class="layui-form-label">消息类型</label>
                                 <div class="layui-input-inline">
-                                    <select id="MsgType" name="MsgType" lay-search="">
+                                    <select id="MsgType" name="MsgType" lay-search="" lay-filter="MsgType">
                                         <option value="">请选择</option>
                                         <option value="1">文本</option>
                                         <option value="2">图片</option>
+                                        <option value="3">动图</option>
                                     </select>
                                     <script>$("#MsgType").val("@editData.MsgType");</script>
                                 </div>
                             </div>
-                            <div class="layui-form-item">
+                            <div class="layui-form-item" id="Titles">
                                 <label class="layui-form-label">标题</label>
                                 <div class="layui-input-inline">
                                     <input class="layui-input" type="text" id="Title" name="Title"
-                                        value="@editData.Title" maxlength="50" lay-verify="required|" autocomplete="off"
+                                        value="@editData.Title" maxlength="50" lay-verify="" autocomplete="off"
                                         placeholder="请输入标题">
                                 </div>
                             </div>
-                            <div class="layui-form-item layui-form-text">
+                            @* <div class="layui-form-item layui-form-text">
                                 <label class="layui-form-label">简介</label>
                                 <div class="layui-input-block">
-                                    <textarea class="layui-textarea" id="Summary" name="Summary" maxlength="500"
-                                        lay-verify="" placeholder="请输入简介">@editData.Summary</textarea>
+                                <textarea class="layui-textarea" id="Summary" name="Summary" maxlength="500"
+                                lay-verify="" placeholder="请输入简介">@editData.Summary</textarea>
                                 </div>
-                            </div>
+                                </div> *@
                             <div class="layui-form-item layui-form-text">
                                 <label class="layui-form-label">内容</label>
                                 <div class="layui-input-block">
@@ -84,7 +85,7 @@
                                         lay-verify="" autocomplete="off" placeholder="请输入有效结束时间">
                                 </div>
                             </div>
-                            <div class="layui-form-item">
+                            <div class="layui-form-item" id="BgPics" style="display: none;">
                                 <label class="layui-form-label">背景图片</label>
                                 <div class="layui-input-block">
                                     <div class="layui-upload">
@@ -103,53 +104,54 @@
                                     </div>
                                 </div>
                             </div>
-                            <div class="layui-form-item">
+                            @* <div class="layui-form-item">
                                 <label class="layui-form-label">推送类型</label>
                                 <div class="layui-input-inline">
-                                    <select id="PushType" name="PushType" lay-search="">
-                                        <option value="">请选择</option>
-                                        <option value="0">不推送</option>
-                                        <option value="1">立即推送</option>
-                                        <option value="2">定时推送</option>
-                                    </select>
-                                    <script>$("#PushType").val("@editData.PushType");</script>
+                                <select id="PushType" name="PushType" lay-search="">
+                                <option value="">请选择</option>
+                                <option value="0">不推送</option>
+                                <option value="1">立即推送</option>
+                                <option value="2">定时推送</option>
+                                </select>
+                                <script>$("#PushType").val("@editData.PushType");</script>
                                 </div>
-                            </div>
-                            <div class="layui-form-item">
+                                </div>
+                                <div class="layui-form-item">
                                 <label class="layui-form-label">推送标记</label>
                                 <div class="layui-input-inline">
-                                    <select id="PushFlag" name="PushFlag" lay-search="">
-                                        <option value="">请选择</option>
-                                        <option value="0">不推送</option>
-                                        <option value="1">未推送</option>
-                                        <option value="2">已推送</option>
-                                    </select>
-                                    <script>$("#PushFlag").val("@editData.PushFlag");</script>
+                                <select id="PushFlag" name="PushFlag" lay-search="">
+                                <option value="">请选择</option>
+                                <option value="0">不推送</option>
+                                <option value="1">未推送</option>
+                                <option value="2">已推送</option>
+                                </select>
+                                <script>$("#PushFlag").val("@editData.PushFlag");</script>
                                 </div>
-                            </div>
-                            <div class="layui-form-item">
+                                </div>
+                                <div class="layui-form-item">
                                 <label class="layui-form-label">推送参数</label>
                                 <div class="layui-input-inline">
-                                    <input class="layui-input" type="text" id="PushParam" name="PushParam"
-                                        value="@editData.PushParam" maxlength="255" lay-verify="" autocomplete="off"
-                                        placeholder="请输入推送参数">
+                                <input class="layui-input" type="text" id="PushParam" name="PushParam"
+                                value="@editData.PushParam" maxlength="255" lay-verify="" autocomplete="off"
+                                placeholder="请输入推送参数">
                                 </div>
-                            </div>
-                            <div class="layui-form-item">
+                                </div>
+                                <div class="layui-form-item">
                                 <label class="layui-form-label">推送时间</label>
                                 <div class="layui-input-inline">
-                                    <input class="layui-input" type="text" id="PushTime" name="PushTime"
-                                        value="@(editData.PushTime == null ? "" : editData.PushTime.Value.ToString("yyyy-MM-dd HH:mm:ss"))"
-                                        lay-verify="" autocomplete="off" placeholder="请输入推送时间">
+                                <input class="layui-input" type="text" id="PushTime" name="PushTime"
+                                value="@(editData.PushTime == null ? "" : editData.PushTime.Value.ToString("yyyy-MM-dd
+                                HH:mm:ss"))"
+                                lay-verify="" autocomplete="off" placeholder="请输入推送时间">
                                 </div>
-                            </div>
-                            <div class="layui-form-item layui-form-text">
+                                </div>
+                                <div class="layui-form-item layui-form-text">
                                 <label class="layui-form-label">扩展字段</label>
                                 <div class="layui-input-block">
-                                    <textarea class="layui-textarea" id="ExtendColumn" name="ExtendColumn" maxlength=""
-                                        lay-verify="" placeholder="请输入扩展字段">@editData.ExtendColumn</textarea>
+                                <textarea class="layui-textarea" id="ExtendColumn" name="ExtendColumn" maxlength=""
+                                lay-verify="" placeholder="请输入扩展字段">@editData.ExtendColumn</textarea>
                                 </div>
-                            </div>
+                                </div> *@
                             <div class="layui-form-item">
                                 <label class="layui-form-label">跳转Url参数</label>
                                 <div class="layui-input-inline">
@@ -165,7 +167,7 @@
                                         maxlength="500" lay-verify="" autocomplete="off" placeholder="请输入跳转Url">
                                 </div>
                             </div>
-                            <div class="layui-form-item">
+                            <div class="layui-form-item" id="Button">
                                 <label class="layui-form-label">按钮文字</label>
                                 <div class="layui-input-inline">
                                     <input class="layui-input" type="text" id="BtnText" name="BtnText"
@@ -181,14 +183,14 @@
                                         placeholder="请输入每日次数">
                                 </div>
                             </div>
-                            <div class="layui-form-item">
+                            @* <div class="layui-form-item">
                                 <label class="layui-form-label">弹窗标识</label>
                                 <div class="layui-input-inline">
-                                    <input type="checkbox" id="AlertFlag" name="AlertFlag" value="1"
-                                        @(editData.AlertFlag == 1 ? "checked=checked" : "") lay-skin="switch"
-                                        lay-filter="switchTest" title="开关">
+                                <input type="checkbox" id="AlertFlag" name="AlertFlag" value="1"
+                                @(editData.AlertFlag == 1 ? "checked=checked" : "") lay-skin="switch"
+                                lay-filter="switchTest" title="开关">
                                 </div>
-                            </div>
+                                </div> *@
                             <div class="layui-form-item">
                                 <label class="layui-form-label">是否周末</label>
                                 <div class="layui-input-inline">
@@ -356,6 +358,37 @@
                 location.hash = 'test=' + $(this).attr('lay-id');
             });
 
+            form.on('select(MsgType)', function (data) {
+                if (data.value == '1') {
+                    $('#Titles').show();
+                    $('#BgPics').hide();
+                    $('#Button').show();
+                } else if (data.value == '2') {
+                    $('#Titles').hide();
+                    $('#BgPics').show();
+                    $('#Button').hide();
+                }else if (data.value == '3') {
+                    $('#Titles').hide();
+                    $('#BgPics').show();
+                    $('#Button').hide();
+                }
+                form.render();
+            });
+            var MsgType = '@editData.MsgType';
+            if (MsgType == '1') {
+                $('#Titles').show();
+                $('#BgPics').hide();
+                $('#Button').show();
+            } else if (MsgType == '2') {
+                $('#Titles').hide();
+                $('#BgPics').show();
+                $('#Button').hide();
+            } else if (MsgType == '3') {
+                $('#Titles').hide();
+                $('#BgPics').show();
+                $('#Button').hide();
+            }
+
             //日期
             laydate.render({
                 elem: '#EffectStartDate',

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

@@ -51,6 +51,7 @@
                                 <option value="">全部...</option>
                                 <option value="1">文本</option>
                                 <option value="2">图片</option>
+                                <option value="3">动图</option>
                             </select>
                         </div>
                     </div>
@@ -67,7 +68,7 @@
                             <input class="layui-input" type="text" name="Title" placeholder="" autocomplete="off">
                         </div>
                     </div>
-                    <div class="layui-inline">
+                    @* <div class="layui-inline">
                         <label class="layui-form-label">推送类型</label>
                         <div class="layui-input-inline">
                             <select id="PushTypeSelect" name="PushTypeSelect" lay-search="">
@@ -88,7 +89,7 @@
                                 <option value="2">已推送</option>
                             </select>
                         </div>
-                    </div>
+                    </div> *@
 
                     <div class="layui-inline ml50">
                         <button class="layui-btn" lay-submit lay-filter="LAY-list-front-search">

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

@@ -235,7 +235,7 @@
                         </button>
                         @if (RightInfo.Contains("," + right + "_export,"))
                         {
-                        <button class="layui-btn" data-type="ExportExcel"><i class="layui-icon layui-icon-export layuiadmin-button-btn"></i>导出</button>
+                        <button class="layui-btn" data-type="ExportsExcel"><i class="layui-icon layui-icon-export layuiadmin-button-btn"></i>导出</button>
                         }
                     </div>
                 </div>

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

@@ -128,6 +128,11 @@
                             <button class="layui-btn" data-type="Cash"><i
                                 class="layui-icon layui-icon-up layuiadmin-button-btn"></i>提交到代付平台</button>
                         }
+                        @if (RightInfo.Contains("," + right + "_batchset,"))
+                        {
+                            <button class="layui-btn" data-type="BatchSetting"><i
+                                class="layui-icon layui-icon-edit layuiadmin-button-btn"></i>批量设置成功</button>
+                        }
                     </div>
                 </div>
             </div>

wwwroot/layuiadmin/modules_main/MsgAlert_Admin.js

@@ -32,7 +32,7 @@ layui.config({
     var laydate = layui.laydate;
     var layCreateDate = laydate.render({
         elem: '#CreateDate',
-        type: 'datetime',
+        type: 'date',
         range: true,
         trigger: 'click',
         change: function (value, date, endDate) {
@@ -97,14 +97,14 @@ layui.config({
             , { field: 'StatusName', width: 200, title: '状态', sort: true }
             , { field: 'Title', width: 200, title: '标题', sort: true }
             , { field: 'Summary', width: 200, title: '简介', sort: true }
-            , { field: 'BgPic', width: 200, title: '背景图片', width: 60, templet: '#BgPicTpl', unresize: true }
-            , { field: 'PushType', width: 200, title: '推送类型', sort: true }
-            , { field: 'PushFlag', width: 200, title: '推送标记', sort: true }
-            , { field: 'PushTime', width: 200, title: '推送时间', sort: true }
-            , { field: 'UrlParam', width: 200, title: '跳转Url参数', sort: true }
+            // , { field: 'BgPic', width: 200, title: '背景图片', width: 60, templet: '#BgPicTpl', unresize: true }
+            // , { field: 'PushType', width: 200, title: '推送类型', sort: true }
+            // , { field: 'PushFlag', width: 200, title: '推送标记', sort: true }
+            // , { field: 'PushTime', width: 200, title: '推送时间', sort: true }
+            // , { field: 'UrlParam', width: 200, title: '跳转Url参数', sort: true }
             , { field: 'BtnText', width: 200, title: '按钮文字', sort: true }
             , { field: 'TimeByDay', width: 200, title: '每日次数', sort: true }
-            , { field: 'AlertFlagName', width: 200, title: '弹窗标识', sort: true }
+            // , { field: 'AlertFlagName', width: 200, title: '弹窗标识', sort: true }
             , { field: 'IsWeekendName', width: 200, title: '是否周末', sort: true }
 
             , { field: 'Sort', fixed: 'right', title: '排序', width: 80, edit: 'text' }

wwwroot/layuiadmin/modules_main/Orders_Admin.js

@@ -541,6 +541,24 @@ layui.config({
                 }
             });
             $("#excelTemp").html('<a href="/excelfile/模板文件.xlsx">点击下载模板文件</a>');
+        },ExportsExcel: function () {
+            var userdata = '';
+            $(".layuiadmin-card-header-auto input").each(function (i) {
+                userdata += $(this).attr('name') + '=' + encodeURIComponent($(this).val()) + '&';
+            });
+            $(".layuiadmin-card-header-auto select").each(function (i) {
+                userdata += $(this).attr('name') + '=' + encodeURIComponent($(this).val()) + '&';
+            });
+            $.ajax({
+                type: "GET",
+                url: "/Admin/Orders/ExportsExcel?r=" + Math.random(1),
+                data: userdata,
+                dataType: "json",
+                success: function (data) {
+                    data.Obj.unshift(data.Fields);
+                    excel.exportExcel(data.Obj, data.Info, 'xlsx');
+                }
+            });
         }
         , ExportExcel: function () {
             var userdata = '';

wwwroot/layuiadmin/modules_main/StoreHouse_Admin.js

@@ -498,8 +498,13 @@ layui.config({
         }
     });
     form.on('submit(LAY-list-front-searchall)', function (data) {
+        var field = data.field;
+        field.ShowFlag = 1;
+        field.StoreNo="";
+        field.StoreNo="";
+        field.StoreNo="";
         table.reload('LAY-list-manage', {
-            where: null,
+            where: field,
             page: {
                 curr: 1
             }

wwwroot/layuiadmin/modules_main/UserCashRecord_Admin.js

@@ -551,6 +551,35 @@ layui.config({
                 }
             });
         },
+        BatchSetting: function () {
+            var checkStatus = table.checkStatus('LAY-list-manage'),
+                data = checkStatus.data; //得到选中的数据
+            if (data.length < 1) {
+                parent.layer.msg("请选择要设置的项");
+            } else {
+                var ids = "";
+                $.each(data, function (index, value) {
+                    ids += data[index].Id + ",";
+                });
+                ids = ids.substring(0, ids.length - 1);
+                var index = layer.confirm('确定要设为成功状态吗？', function (index) {
+                    $.ajax({
+                        type: "POST",
+                        url: "/Admin/UserCashRecord/BatchSetting?r=" + Math.random(1),
+                        data: "Id=" + ids,
+                        dataType: "text",
+                        success: function (data) {
+                            layer.close(index);
+                            if (data == "success") {
+                                table.reload('LAY-list-manage');
+                            } else {
+                                layer.msg(data);
+                            }
+                        }
+                    });
+                });
+            }
+        },
         Open: function () {
             var checkStatus = table.checkStatus('LAY-list-manage'),
                 data = checkStatus.data; //得到选中的数据