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

# Conflicts:
#	Areas/Admin/Controllers/OperateServer/SysAdminOperateController.cs
#	Areas/Admin/Views/OperateServer/SysAdminOperate/EditBalance.cshtml

AppStart/Helper/SIMPosMerchantTradeService.cs

@@ -213,16 +213,11 @@ namespace MySystem
         {
             while (true)
             {
-                string Info = RedisDbconn.Instance.RPop<string>("SIMActInfo");
-                if (!string.IsNullOrEmpty(Info))
+                string time = RedisDbconn.Instance.RPop<string>("SIMActInfo");
+                if (!string.IsNullOrEmpty(time))
                 {
                     try
                     {
-                        var time = function.ReadInstance("/GetSIMActInfo/LastDate.txt");
-                        if(string.IsNullOrEmpty(time))
-                        {
-                            time = "2024-03-18";
-                        }
                         string check = function.ReadInstance("/GetSIMActInfo/check" + time + ".txt");
                         if (string.IsNullOrEmpty(check))
                         {
@@ -270,7 +265,6 @@ namespace MySystem
                                 }
                             }
                         }
-                        function.WritePage("/GetSIMActInfo/", "LastDate.txt", DateTime.Now.ToString("yyyy-MM-dd"));
                     }
                     catch (Exception ex)
                     {

AppStart/PublicFunction.cs

@@ -514,6 +514,23 @@ namespace MySystem
 
         #endregion
 
+
+        #region 获取指定层级创客信息
+        /// <summary>
+        /// 获取指定层级创客信息
+        /// </summary>
+        /// <param name="ParentNav">父级集合</param>
+        /// <param name="Level">层级</param>
+        public static Models.Users GetTopUserInfo(string ParentNav, int Level)
+        {
+            WebCMSEntities db = new WebCMSEntities();
+            string[] ParentNavList = ParentNav.ToString().Trim(',').Replace(",,", ",").Split(',');
+            var userInfo = db.Users.FirstOrDefault(m => m.Id == int.Parse(ParentNavList[Level])) ?? new Users();
+            return userInfo;
+        }
+        #endregion
+
+
         #region 统计机具绑定数据
 
         public static void StatUserMachineData(int UserId, int BrandId, int Count)

Areas/Admin/Controllers/MainServer/CustomQueryController.cs

@@ -350,9 +350,19 @@ namespace MySystem.Areas.Admin.Controllers
                 string[] fieldData = m.Value.Replace("${", "").Replace("}$", "").Split('|');
                 string fieldName = fieldData[0];
                 string Title = fieldData[1];
+                string Control = "text";
+                string Option = "";
+                if(fieldData.Length > 2)
+                {
+                    Control = fieldData[2];
+                    if(Control == "select")
+                    {
+                        Option = fieldData[3];
+                    }
+                }
                 if(!query.ContainsKey(fieldName))
                 {
-                    query.Add(fieldName, Title);
+                    query.Add(fieldName, Title + "#cut#" + Control + "#cut#" + Option);
                 }
             }
             List<CustomQuerySub> subItems = db.CustomQuerySub.Where(m => m.ParentId == Id).ToList();
@@ -365,9 +375,19 @@ namespace MySystem.Areas.Admin.Controllers
                     string[] fieldData = m.Value.Replace("${", "").Replace("}$", "").Split('|');
                     string fieldName = fieldData[0];
                     string Title = fieldData[1];
+                    string Control = "text";
+                    string Option = "";
+                    if(fieldData.Length > 2)
+                    {
+                        Control = fieldData[2];
+                        if(Control == "select")
+                        {
+                            Option = fieldData[3];
+                        }
+                    }
                     if(!query.ContainsKey(fieldName))
                     {
-                        query.Add(fieldName, Title);
+                        query.Add(fieldName, Title + "#cut#" + Control + "#cut#" + Option);
                     }
                 }
             }
@@ -501,7 +521,18 @@ namespace MySystem.Areas.Admin.Controllers
                 string val = redisCommandList[2];
                 if(kind == "lpush")
                 {
-                    new CustomRedisDbconn(ConnectStr).AddList(key, val);
+                    if(val.Contains("\n"))
+                    {
+                        string[] vals = val.TrimEnd('\n').Split('\n');
+                        foreach(string sub in vals)
+                        {
+                            new CustomRedisDbconn(ConnectStr).AddList(key, sub);
+                        }
+                    }
+                    else
+                    {
+                        new CustomRedisDbconn(ConnectStr).AddList(key, val);
+                    }
                 }
                 else if(kind == "set")
                 {

Areas/Admin/Controllers/MainServer/LeaderReserveRecordController.cs

@@ -98,8 +98,19 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["UserIdRealName"] = userid_Users.RealName;
                 dic.Remove("UserId");
 
+                var remark = dic["Remark"].ToString();
+                var SourceUserId = 0;
+                if ((remark == "推荐小盟主" || remark == "推荐大盟主") || (int.Parse(function.CheckInt(dic["OrderId"].ToString())) > 0 && int.Parse(function.CheckInt(dic["SourceUserId"].ToString())) == 0))
+                {
+                    var SourceOrderId = int.Parse(function.CheckInt(dic["OrderId"].ToString()));
+                    var orders = db.Orders.FirstOrDefault(m => m.Id == SourceOrderId) ?? new Orders();
+                    SourceUserId = orders.UserId;
+                }
+                else
+                {
+                    SourceUserId = int.Parse(function.CheckInt(dic["SourceUserId"].ToString()));
+                }
                 //购券创客
-                int SourceUserId = int.Parse(function.CheckInt(dic["SourceUserId"].ToString()));
                 if (SourceUserId > 0)
                 {
                     Users sourceUser = db.Users.FirstOrDefault(m => m.Id == SourceUserId) ?? new Users();
@@ -112,6 +123,15 @@ namespace MySystem.Areas.Admin.Controllers
                 if (ChangeType == 1) dic["ChangeTypeName"] = "增加";
                 if (ChangeType == 2) dic["ChangeTypeName"] = "减少";
 
+                //剩余可提现余额
+                int AccountRecordId = int.Parse(function.CheckInt(dic["AccountRecordId"].ToString()));
+                if (AccountRecordId > 0)
+                {
+                    LeaderAccountRecord leaderAccountRecord = db.LeaderAccountRecord.FirstOrDefault(m => m.Id == AccountRecordId) ?? new LeaderAccountRecord();
+                    dic["AfterBalanceAmount"] = leaderAccountRecord.AfterBalanceAmount;
+                    dic.Remove("AccountRecordId");
+                }
+
                 // else
                 // {
                 //     int OrderId = int.Parse(function.CheckInt(dic["OrderId"].ToString()));
@@ -220,7 +240,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 SqlString += " and SeoKeyword=" + SeoKeyword;
             }
-            var Sql = "SELECT c.MakerCode '创客编号',c.RealName '创客姓名',DATE_FORMAT(c.CreateDate,'%Y-%m-%d %H:%i:%s') '创建时间',c.Remark '变动类型',c.SeoDescription '备注',(CASE WHEN c.ChangeType=1 THEN '增加' WHEN c.ChangeType=2 THEN '减少' ELSE '' end) '操作类型',c.Type1Num '电签兑换券张数',c.Type2Num '大POS兑换券张数',d.LeaderBalanceAmount '可提现余额',c.ChangeAmt '使用额度',c.BeforeAmt '使用前剩余额度',c.AfterAmt '使用后剩余额度' FROM(SELECT a.*,b.MakerCode,b.RealName FROM(SELECT Id,UserId,CreateDate,ChangeAmt,BeforeAmt,AfterAmt,Remark,SeoDescription,ChangeType,REPLACE (JSON_EXTRACT (SeoTitle, '$[0].Num'),'\\\"','') AS 'Type1Num', REPLACE (JSON_EXTRACT (SeoTitle, '$[1].Num'),'\\\"','') AS 'Type2Num' FROM LeaderReserveRecord WHERE 1=1 " + SqlString + ") a LEFT JOIN Users b ON a.UserId=b.Id) c LEFT JOIN UserAccount d ON c.UserId=d.Id";
+            var Sql = "SELECT c.MakerCode '创客编号',c.RealName '创客姓名',DATE_FORMAT(c.CreateDate,'%Y-%m-%d %H:%i:%s') '创建时间',c.Remark '变动类型',c.SeoDescription '备注',(CASE WHEN c.ChangeType=1 THEN '增加' WHEN c.ChangeType=2 THEN '减少' ELSE '' end) '操作类型',c.Type1Num '电签兑换券张数',c.Type2Num '大POS兑换券张数',d.LeaderBalanceAmount '可提现余额',c.ChangeAmt '使用额度',c.BeforeAmt '使用前剩余额度',c.AfterAmt '使用后剩余额度',e.AfterBalanceAmount '变化后可提现余额' FROM(SELECT a.*,b.MakerCode,b.RealName FROM(SELECT Id,UserId,CreateDate,ChangeAmt,BeforeAmt,AfterAmt,Remark,SeoDescription,ChangeType,AccountRecordId,REPLACE (JSON_EXTRACT (SeoTitle, '$[0].Num'),'\\\"','') AS 'Type1Num', REPLACE (JSON_EXTRACT (SeoTitle, '$[1].Num'),'\\\"','') AS 'Type2Num' FROM LeaderReserveRecord WHERE 1=1 " + SqlString + ") a LEFT JOIN Users b ON a.UserId=b.Id) c LEFT JOIN UserAccount d ON c.UserId=d.Id LEFT JOIN(SELECT Id,AfterBalanceAmount FROM LeaderAccountRecord)e ON c.AccountRecordId=e.Id";
             var sysAdmin = bsdb.SysAdmin.FirstOrDefault(m => m.AdminName == SysUserName && m.Status > -1);
             var FileName = "盟主储蓄金变动记录" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
             string SendData = "{\"Operater\":\"" + sysAdmin.Id + "\",\"SqlString\":\"" + Sql + "\",\"FileName\":\"" + FileName + "\",\"MaxCount\":\"0\"}";

Areas/Admin/Controllers/MainServer/OrdersController.cs

@@ -218,8 +218,32 @@ namespace MySystem.Areas.Admin.Controllers
                 //创客
                 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["UserInfo"] = userid_Users.MakerCode + "<br />" + userid_Users.RealName + "<br />" + userid_Users.Id;
+
+                //顶级创客信息
+                if (!string.IsNullOrEmpty(userid_Users.ParentNav))
+                {
+                    string[] ParentNavList = userid_Users.ParentNav.Trim(',').Replace(",,", ",").Split(',');
+                    var topUserInfo = new Users();
+                    if (ParentNavList.Length > 1)
+                    {
+                        topUserInfo = PublicFunction.GetTopUserInfo(userid_Users.ParentNav, 1);
+                    }
+                    else
+                    {
+                        topUserInfo = PublicFunction.GetTopUserInfo(userid_Users.ParentNav, 0);
+                    }
+                    //顶级创客信息
+                    dic["TopUserInfo"] = topUserInfo.MakerCode + "<br />" + topUserInfo.RealName;
+
+                    //分离顶级创客信息
+                    dic["TopUserInfoMakerCode"] = topUserInfo.MakerCode;
+                    dic["TopUserInfoRealName"] = topUserInfo.RealName;
+                }
+                else
+                {
+                    dic["TopUserInfo"] = "";
+                }
 
                 //订单状态
                 int Status = int.Parse(dic["Status"].ToString());
@@ -300,11 +324,7 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["StoreFrom"] = storeuserid_Users.MakerCode + "<br />" + storeid_StoreHouse.StoreName;
                 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["TopUserInfo"] = topuserid_Users.MakerCode + "<br />" + topuserid_Users.RealName;
-                dic.Remove("TopUserId");
+                
 
                 // //支付状态
                 // int PayStatus = int.Parse(dic["PayStatus"].ToString());
@@ -617,12 +637,12 @@ namespace MySystem.Areas.Admin.Controllers
                     bool op = true;
                     decimal TotalPrice = order.TotalPrice;
                     decimal Amount = data.RefundActAmount;
-                    if(order.PayMode == 1)
+                    if (order.PayMode == 1)
                     {
                         PublicAccountSet set = db.PublicAccountSet.FirstOrDefault() ?? new PublicAccountSet();
                         string result = new Alipay.AlipayPublicClass(_accessor.HttpContext).Refund(set.AlipayAppId, set.AlipayPrivateKey, set.AlipayPublicKey, order.OrderNo, Amount);
                     }
-                    else if(order.PayMode == 3)
+                    else if (order.PayMode == 3)
                     {
                         UserAccount user = db.UserAccount.FirstOrDefault(m => m.Id == order.UserId);
                         if (user == null)
@@ -658,7 +678,7 @@ namespace MySystem.Areas.Admin.Controllers
                             Remark = Remark,
                         });
                     }
-                    if(op)
+                    if (op)
                     {
                         order.RefundStatus = 1;
                         order.RefundActAmount = Amount;
@@ -1498,7 +1518,7 @@ namespace MySystem.Areas.Admin.Controllers
                 string end = datelist[1];
                 SqlString += " and a.SendDate>='" + start + " 00:00:00' and a.SendDate<='" + end + " 23:59:59'";
             }
-            var Sql = "SELECT b.MakerCode '创客编号',b.RealName '创客真实姓名',a.OrderNo '订单号',a.Mobile '手机号',a.RealName '姓名',a.TotalPrice '总价',a.Areas '所在地区',a.Address '详细地址',a.ErpName '物流名称',a.ErpCode '运单号',DATE_FORMAT(a.SendDate,'%Y-%m-%d %H:%i:%s') '发货时间',(CASE WHEN a.PayMode=1 THEN '支付宝' WHEN a.PayMode=2 THEN '微信' WHEN a.PayMode=3 THEN '账户余额' ELSE '' end) '支付方式',DATE_FORMAT(a.PayDate,'%Y-%m-%d %H:%i:%s') '支付时间',a.TradeNo '支付交易号',c.StoreNo '仓库编号',c.StoreName '仓库名称',(CASE WHEN a.RefundStatus=0 THEN '未退款' WHEN a.RefundStatus=1 THEN '已退款' end) '退款状态',(CASE WHEN a.DeliveryType=1 THEN '邮寄到付' WHEN a.DeliveryType=2 THEN '上门自提' ELSE '' end) '提货类型',(CASE WHEN a.SendStatus=0 THEN '未发货' WHEN a.SendStatus=1 THEN '已发货' WHEN a.SendStatus=2 THEN '已退货' ELSE '' end) '发货状态',d.ProductName '商品名称',a.BuyCount '下单数量',d.TotalPrice '商品单价',d.NormDetail '商品规格',a.StoreContact '仓库联系人',(CASE WHEN a.StoreType=0 THEN '总仓' WHEN a.StoreType=1 THEN '分仓' ELSE '' end) '仓库类型',e.MakerCode '仓库归属创客编号',e.RealName '仓库归属创客姓名',(CASE WHEN a.PayStatus=0 THEN '未支付' WHEN a.PayStatus=1 THEN '支付成功' WHEN a.PayStatus=2 THEN '支付失败' WHEN a.PayStatus=3 THEN '支付锁定中' WHEN a.PayStatus=4 THEN '支付处理中' ELSE '' end) '支付状态',a.Remark '订单备注' FROM Orders a LEFT JOIN Users b ON a.UserId=b.Id LEFT JOIN StoreHouse c ON a.StoreId=c.Id LEFT JOIN OrderProduct d ON a.Id=d.OrderId LEFT JOIN Users e ON a.StoreUserId=e.Id" + SqlString + "";
+            var Sql = "SELECT aa.*,bb.MakerCode '顶级创客编号',bb.RealName '顶级创客姓名' FROM(SELECT b.Id '创客Id',b.MakerCode '创客编号',b.RealName '创客真实姓名',a.OrderNo '订单号',SUBSTRING_INDEX(SUBSTRING_INDEX(b.ParentNav,',',4),',',-1) TopId,a.Mobile '手机号',a.RealName '姓名',a.TotalPrice '总价',a.Areas '所在地区',a.Address '详细地址',a.ErpName '物流名称',a.ErpCode '运单号',DATE_FORMAT(a.SendDate,'%Y-%m-%d %H:%i:%s') '发货时间',(CASE WHEN a.PayMode=1 THEN '支付宝' WHEN a.PayMode=2 THEN '微信' WHEN a.PayMode=3 THEN '账户余额' ELSE '' end) '支付方式',DATE_FORMAT(a.PayDate,'%Y-%m-%d %H:%i:%s') '支付时间',a.TradeNo '支付交易号',c.StoreNo '仓库编号',c.StoreName '仓库名称',(CASE WHEN a.RefundStatus=0 THEN '未退款' WHEN a.RefundStatus=1 THEN '已退款' end) '退款状态',(CASE WHEN a.DeliveryType=1 THEN '邮寄到付' WHEN a.DeliveryType=2 THEN '上门自提' ELSE '' end) '提货类型',(CASE WHEN a.SendStatus=0 THEN '未发货' WHEN a.SendStatus=1 THEN '已发货' WHEN a.SendStatus=2 THEN '已退货' ELSE '' end) '发货状态',d.ProductName '商品名称',a.BuyCount '下单数量',d.TotalPrice '商品单价',d.NormDetail '商品规格',a.StoreContact '仓库联系人',(CASE WHEN a.StoreType=0 THEN '总仓' WHEN a.StoreType=1 THEN '分仓' ELSE '' end) '仓库类型',e.MakerCode '仓库归属创客编号',e.RealName '仓库归属创客姓名',(CASE WHEN a.PayStatus=0 THEN '未支付' WHEN a.PayStatus=1 THEN '支付成功' WHEN a.PayStatus=2 THEN '支付失败' WHEN a.PayStatus=3 THEN '支付锁定中' WHEN a.PayStatus=4 THEN '支付处理中' ELSE '' end) '支付状态',a.Remark '订单备注' FROM Orders a LEFT JOIN Users b ON a.UserId=b.Id LEFT JOIN StoreHouse c ON a.StoreId=c.Id LEFT JOIN OrderProduct d ON a.Id=d.OrderId LEFT JOIN Users e ON a.StoreUserId=e.Id" + SqlString + ")aa LEFT JOIN Users bb ON aa.TopId = bb.Id";
             var sysAdmin = bsdb.SysAdmin.FirstOrDefault(m => m.AdminName == SysUserName && m.Status > -1);
             var FileName = "商城订单记录" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
             string SendData = "{\"Operater\":\"" + sysAdmin.Id + "\",\"SqlString\":\"" + Sql + "\",\"FileName\":\"" + FileName + "\",\"MaxCount\":\"0\"}";

Areas/Admin/Controllers/MainServer/PosMachinesTwoController.cs

@@ -81,6 +81,10 @@ namespace MySystem.Areas.Admin.Controllers
                 {
                     condition += " and UserId=0 and BuyUserId=0";
                 }
+                if (int.Parse(IsStoreSelect) == 0)
+                {
+                    condition += " and UserId>0 and BuyUserId>0";
+                }
             }
             //绑定状态
             if (!string.IsNullOrEmpty(BindingStateSelect))

Areas/Admin/Controllers/MainServer/PreSendStockDetailController.cs

@@ -399,6 +399,85 @@ namespace MySystem.Areas.Admin.Controllers
         }
         #endregion
 
+
+        #region 快捷导出Excel
+        public IActionResult QuickExportExcel(string right)
+        {
+            ViewBag.RightInfo = RightInfo;
+            ViewBag.right = right;
+
+            return View();
+        }
+
+        [HttpPost]
+        public string QuickExportExcelDo(string SnNo, string CreateDateData, string ApplyDateData, string BrandIdSelect, string ToUserIdMakerCode, string ToUserIdRealName, string FromUserIdMakerCode, string FromUserIdRealName, string FromStoreIdStoreNo, string FromStoreIdStoreName)
+        {
+
+            string SqlString = " and Status>-1";
+            //机具SN
+            if (!string.IsNullOrEmpty(SnNo))
+            {
+                SqlString += " and SnNo='" + SnNo + "'";
+            }
+            if (!string.IsNullOrEmpty(CreateDateData))
+            {
+                string[] datelist = CreateDateData.Split(new string[] { " - " }, StringSplitOptions.None);
+                string start = datelist[0];
+                string end = datelist[1];
+                SqlString += " and CreateDate>='" + start + " 00:00:00' and CreateDate<='" + end + " 23:59:59'";
+            }
+            if (!string.IsNullOrEmpty(ApplyDateData))
+            {
+                string[] datelist = ApplyDateData.Split(new string[] { " - " }, StringSplitOptions.None);
+                string start = datelist[0];
+                string end = datelist[1];
+                SqlString += " and ApplyDate>='" + start + " 00:00:00' and ApplyDate<='" + end + " 23:59:59'";
+            }
+            //产品类型
+            if (!string.IsNullOrEmpty(BrandIdSelect))
+            {
+                SqlString += " and BrandId=" + BrandIdSelect;
+            }
+            //收货人创客编号
+            if (!string.IsNullOrEmpty(ToUserIdMakerCode))
+            {
+                SqlString += " and ToUserId in (select UserId from UserForMakerCode where MakerCode='" + ToUserIdMakerCode + "')";
+            }
+            //收货人真实姓名
+            if (!string.IsNullOrEmpty(ToUserIdRealName))
+            {
+                SqlString += " and ToUserId in (select UserId from UserForRealName where RealName='" + ToUserIdRealName + "')";
+            }
+            //出货创客编号
+            if (!string.IsNullOrEmpty(FromUserIdMakerCode))
+            {
+                SqlString += " and FromUserId in (select UserId from UserForMakerCode where MakerCode='" + FromUserIdMakerCode + "')";
+            }
+            //出货创客真实姓名
+            if (!string.IsNullOrEmpty(FromUserIdRealName))
+            {
+                SqlString += " and FromUserId in (select UserId from UserForRealName where RealName='" + FromUserIdRealName + "')";
+            }
+            //出货仓库编号
+            if (!string.IsNullOrEmpty(FromStoreIdStoreNo))
+            {
+                SqlString += " and FromStoreId in (select StoreId from StoreForCode where Code='" + FromStoreIdStoreNo + "')";
+            }
+            //出货仓库名称
+            if (!string.IsNullOrEmpty(FromStoreIdStoreName))
+            {
+                SqlString += " and FromStoreId in (select StoreId from StoreForName where Name='" + FromStoreIdStoreName + "')";
+            }
+            var Sql = "SELECT a.CreateDate '创建时间',b.`Name` '产品类型',a.SnNo 'SN编号',c.MakerCode '收货创客编号',c.RealName '收货创客姓名',(CASE WHEN a.ApplyFlag=1 THEN '是' ELSE '否' END) '申请标记',a.ApplyDate '申请时间',d.MakerCode '出货创客编号',d.RealName '出货创客姓名',e.StoreNo '出货仓库编号',e.StoreName '收货仓库名称',(CASE WHEN a.CancelFlag=1 THEN '是' ELSE '否' END) '撤回标记',a.CancelDate '撤回时间',(CASE WHEN a.WithholdFlag=1 THEN '是' ELSE '否' END) '预扣标记' FROM(SELECT * FROM PreSendStockDetail WHERE 1=1 " + SqlString + ")a LEFT JOIN(SELECT Id,`Name` from KqProducts)b ON a.BrandId=b.Id LEFT JOIN(SELECT Id,MakerCode,RealName FROM Users)c ON a.ToUserId=c.Id LEFT JOIN(SELECT Id,MakerCode,RealName FROM Users)d ON a.FromUserId=d.Id LEFT JOIN(SELECT Id,StoreNo,StoreName FROM StoreHouse)e ON a.FromStoreId=e.Id" + SqlString;
+            var sysAdmin = bsdb.SysAdmin.FirstOrDefault(m => m.AdminName == SysUserName && m.Status > -1);
+            var FileName = "小分仓记录" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+            string SendData = "{\"Operater\":\"" + sysAdmin.Id + "\",\"SqlString\":\"" + Sql + "\",\"FileName\":\"" + FileName + "\",\"MaxCount\":\"0\"}";
+            RedisDbconn.Instance.AddList("ExportQueue", SendData);
+            return "success";
+        }
+        #endregion
+
+
         #region 导入数据
         /// <summary>
         /// 导入数据
@@ -678,7 +757,7 @@ namespace MySystem.Areas.Admin.Controllers
                                 userAccount.ValidAmount -= amount;//扣减分仓可用额度
                             }
                         }
-                        
+
                         RedisDbconn.Instance.AddList("PreWithholdQueue", "{\"UserId\":\"" + query.ToUserId + "\",\"SnNo\":\"" + query.SnNo + "\"}");
 
                         string text = string.Format("创客-首页-仓库管理-小分仓-撤回，UserId: '" + query.FromUserId + "'，ToUserId: '" + smallStoreHouse.UserId + "'，LaveNum：'" + smallStoreHouse.LaveNum + "'，TotalNum：'" + smallStoreHouse.TotalNum + "'，ChangeCount：'" + 1 + "'，Time'" + DateTime.Now + "'");

Areas/Admin/Controllers/MainServer/SysRechargeRecordController.cs

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

Areas/Admin/Controllers/MainServer/TradeRecordController.cs

@@ -385,29 +385,6 @@ namespace MySystem.Areas.Admin.Controllers
         #endregion
 
 
-        #region 获取激活信息
-        /// <summary>
-        /// 获取激活信息
-        /// </summary>
-        /// <param name="key"></param>
-        /// <returns></returns>
-        public string GetActInfo()
-        {
-            string check = RedisDbconn.Instance.Get<string>("CheckSIMActInfo:" + SysId);
-            if (!string.IsNullOrEmpty(check))
-            {
-                return "请勿重复操作";
-            }
-            else
-            {
-                RedisDbconn.Instance.Set("CheckSIMActInfo:" + SysId, "1");
-                RedisDbconn.Instance.SetExpire("CheckSIMActInfo:" + SysId, 10);
-                RedisDbconn.Instance.AddList("SIMActInfo", SysId);
-                return "success";
-            }
-        }
-        #endregion
-
 
         #region 导入数据
         public IActionResult Import(string right)
@@ -905,5 +882,35 @@ namespace MySystem.Areas.Admin.Controllers
 
         #endregion
 
+
+        #region 获取激活信息
+        public IActionResult GetSimTrade(string right)
+        {
+            ViewBag.RightInfo = RightInfo;
+            ViewBag.right = right;
+            return View();
+        }
+
+        public string GetSimTradePost(string DateStr)
+        {
+            string check = RedisDbconn.Instance.Get<string>("CheckSIMActInfo:" + SysId);
+            if (!string.IsNullOrEmpty(check))
+            {
+                return "请勿重复操作";
+            }
+            if(DateTime.Parse(DateStr) >= DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd")))
+            {
+                return "请输入早于今天的日期";
+            }
+            RedisDbconn.Instance.Set("CheckSIMActInfo:" + SysId, "1");
+            RedisDbconn.Instance.SetExpire("CheckSIMActInfo:" + SysId, 10);
+            RedisDbconn.Instance.AddList("SIMActInfo", DateStr);
+            AddSysLog("0", "TradeRecord", "GetSimTrade");
+            return "success";
+        }
+        #endregion
+
+
+
     }
 }

Areas/Admin/Controllers/OperateServer/AmountRecordOperateController.cs

@@ -127,6 +127,14 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["OpCode"] = sysAdmin.OpCode;
                 dic["MakerCode"] = sysAdmin.MakerCode;
                 dic["MakerName"] = sysAdmin.MakerName;
+                dic["SourceInfo"] = "";
+                if (int.Parse(dic["QueryCount"].ToString()) > 0)
+                {
+                    var Id = int.Parse(dic["QueryCount"].ToString());
+                    var orderInfo = db.Orders.FirstOrDefault(m => m.Id == Id) ?? new Models.Orders();
+                    var userInfo = db.Users.FirstOrDefault(m => m.Id == orderInfo.UserId) ?? new Models.Users();
+                    dic["SourceInfo"] = userInfo.MakerCode + "<br />" + userInfo.RealName;
+                }
                 int OperateType = int.Parse(dic["OperateType"].ToString());
                 dic["OperateTypeName"] = "";
                 if (OperateType == 1) dic["OperateTypeName"] = "收入";

Areas/Admin/Controllers/OperateServer/SysAdminOperateController.cs

@@ -629,7 +629,7 @@ namespace MySystem.Areas.Admin.Controllers
         #region 修改运营中心未使用额度
 
         [HttpPost]
-        public string EditAmt(SysAdmin data, string OperationAmount, string Note, int Kind)
+        public string EditAmt(SysAdmin data, string OperationAmount, string Note, int Kind, int ReturnFlag)
         {
             var sysAdmin = opdb.SysAdmin.FirstOrDefault(m => m.Id == data.Id);
             var account = opdb.UserAccount.FirstOrDefault(m => m.UserId == sysAdmin.UserId);
@@ -648,6 +648,7 @@ namespace MySystem.Areas.Admin.Controllers
             //增加
             else if (Kind == 2)
             {
+                sysAdmin.ReturnAmount = decimal.Parse(OperationAmount);
                 account.TotalAmt += decimal.Parse(OperationAmount);
                 OperateType = 1;//系统增加
                 description = "系统增加";
@@ -686,8 +687,13 @@ namespace MySystem.Areas.Admin.Controllers
                     ChangeAmount = decimal.Parse(OperationAmount),//操作金额
                     OperateType = OperateType,//操作类别
                 }).Entity;
-                opdb.SaveChanges();
+
                 AddSysLog(data.Id.ToString(), "SysAdmin", "EditAmt");
+                opdb.SaveChanges();
+                if (Kind == 2 && ReturnFlag == 1)
+                {
+                    RedisDbconn.Instance.AddList("OperateAddServiceQueue", sysAdmin.Id.ToString());
+                }
             }
             return "success";
         }
@@ -711,7 +717,7 @@ namespace MySystem.Areas.Admin.Controllers
         #region 修改运营中心可提现额度
 
         [HttpPost]
-        public string EditBalance(SysAdmin data, string OperationAmount, string Note, int Kind, int ReturnFlag)
+        public string EditBalance(SysAdmin data, string OperationAmount, string Note, int Kind)
         {
             var sysAdmin = opdb.SysAdmin.FirstOrDefault(m => m.Id == data.Id);
             var account = opdb.UserAccount.FirstOrDefault(m => m.UserId == sysAdmin.UserId);
@@ -774,10 +780,6 @@ namespace MySystem.Areas.Admin.Controllers
                 }).Entity;
                 AddSysLog(data.Id.ToString(), "SysAdmin", "EditBalance");
                 opdb.SaveChanges();
-                if (Kind == 2 && ReturnFlag == 1)
-                {
-                    RedisDbconn.Instance.AddList("OperateAddServiceQueue", sysAdmin.Id.ToString());
-                }
             }
             return "success";
         }

Areas/Admin/Views/MainServer/CustomQuery/Confirm.cshtml

@@ -3,6 +3,7 @@
     string right = ViewBag.right as string;
     string Id = ViewBag.Id as string;
     Dictionary<string, string> query = ViewBag.query as Dictionary<string, string>;
+    string dateJs = "";
 }
 <!DOCTYPE html>
 <html>
@@ -29,11 +30,40 @@
                     <div class="layui-tab-item layui-show">
                         @foreach(string key in query.Keys)
                         {
+                            string[] dataList = query[key].Split(new string[] { "#cut#" }, StringSplitOptions.None);
+                            string text = dataList[0];
+                            string control = dataList[1];
+                            if(control == "datetime" || control == "date" || control == "time" || control == "month")
+                            {
+                                dateJs += key + "_" + control + "|";
+                            }
                             <div class="layui-form-item">
-                                <label class="layui-form-label">@(query[key])</label>
+                                <label class="layui-form-label">@(text)</label>
+                                @if(control == "textarea")
+                                {
                                 <div class="layui-input-block">
-                                    <input class="layui-input" type="text" id="@(key)" name="@(key)" lay-verify="required|" autocomplete="off" placeholder="请输入@(query[key])">
+                                    <textarea class="layui-textarea" id="@(key)" name="@(key)" lay-verify="required|" placeholder="请输入@(text)" style="height: 300px;"></textarea>
                                 </div>
+                                }
+                                else if(control == "select")
+                                {
+                                    string[] options = dataList[2].Split(',');
+                                    <div class="layui-input-block">
+                                        <select id="@(key)" name="@(key)" lay-search="" lay-verify="required|" placeholder="请选择@(text)">
+                                            <option value="">请选择</option>
+                                            @foreach (string option in options)
+                                            {
+                                                <option value="@option">@option</option>
+                                            }
+                                        </select>
+                                    </div>
+                                }
+                                else
+                                {
+                                <div class="layui-input-block">
+                                    <input class="layui-input" type="text" id="@(key)" name="@(key)" lay-verify="required|" autocomplete="off" placeholder="请输入@(text)">
+                                </div>
+                                }
                             </div>
                         }
                     </div>
@@ -48,7 +78,6 @@
     </div>
 
     <script src="/layuiadmin/layui/layui.js"></script>
-    <script src="/other/mybjq/lang/zh_CN.js"></script>
     <script>
         
         layui.config({
@@ -63,7 +92,8 @@
                 , laydate = layui.laydate
                 , croppers = layui.croppers
                 , transfer = layui.transfer
-                , util = layui.util;
+                , util = layui.util
+                , element = layui.element
         
             //Hash地址的定位
             var layid = location.hash.replace(/^#test=/, '');
@@ -73,6 +103,18 @@
             });
     
             //日期
+            var dateJs = "@(dateJs.TrimEnd('|'))";
+            if(dateJs != "") {
+                var dateJsList = dateJs.split('|');
+                for(var i=0;i<dateJsList.length;i++){
+                    var dataList = dateJsList[i].split('_');
+                    laydate.render({
+                        elem: '#' + dataList[0],
+                        type: dataList[1],
+                        trigger: 'click'
+                    });
+                }
+            }
             
 
             //上传文件

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

@@ -158,6 +158,11 @@
                         <button class="layui-btn" lay-submit lay-filter="LAY-list-front-searchall">
                             <i class="layui-icon layui-icon-list layuiadmin-button-btn"></i>全部
                         </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>
+                        }
                     </div>
                 </div>
             </div>
@@ -174,12 +179,6 @@
                         <button class="layui-btn" data-type="batchdel"><i
                             class="layui-icon layui-icon-delete layuiadmin-button-btn"></i>删除</button>
                     }
-                    @if (RightInfo.Contains("," + right + "_edit,"))
-                    {
-                        <button class="layui-btn" data-type="ExportExcel"><i
-                            class="layui-icon layui-icon-export layuiadmin-button-btn"></i>导出</button>
-
-                    }
                 </div>
 
                 <table id="LAY-list-manage" lay-filter="LAY-list-manage"></table>

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

@@ -74,6 +74,7 @@
                                 <option value="114">私董会分红</option>
                                 <option value="115">分仓奖励</option>
                                 <option value="126">机具货款退还</option>
+                                <option value="135">大盘分红</option>
                             </select>
                         </div>
                     </div>
@@ -134,7 +135,7 @@
                     <br>
                     私董会分红(元)：<span style="color: #f00;" id="BizAmount114">0.00</span>　|　分仓奖励(元)：<span style="color: #f00;" id="BizAmount115">0.00</span>
                     <br>
-                    机具货款退还(元)：<span style="color: #f00;" id="BizAmount126">0.00</span>
+                    机具货款退还(元)：<span style="color: #f00;" id="BizAmount126">0.00</span>　|大盘分红(元)：<span style="color: #f00;" id="BizAmount135">0.00</span>
                 </blockquote>
                 
                 <table id="LAY-list-manage" lay-filter="LAY-list-manage"></table>

Areas/Admin/Views/MainServer/TradeRecord/GetSimTrade.cshtml

@@ -0,0 +1,95 @@
+@{
+    string RightInfo = ViewBag.RightInfo as string;
+    string right = ViewBag.right as string;
+    
+}
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <title>交易记录(增加)</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="/layuiadmin/layui/css/layui.css" media="all">
+    <script src="/admin/js/jquery-1.10.1.min.js"></script>
+    <script src="/admin/js/LAreaData2.js"></script>
+</head>
+<body>
+
+    <div class="layui-form" lay-filter="layuiadmin-form-useradmin" id="layuiadmin-form-useradmin">
+        
+        <div class="layui-card">
+          <div class="layui-card-body">
+            <div class="layui-tab" lay-filter="mytabbar">
+                <ul class="layui-tab-title">
+                    <li class="layui-this" lay-id="1">基本信息</li>
+                </ul>
+                <div class="layui-tab-content mt20">
+                    <div class="layui-tab-item layui-show">
+                        <div class="layui-form-item">
+                            <label class="layui-form-label">日期</label>
+                            <div class="layui-input-inline">
+                                <input class="layui-input" type="text" id="DateStr" name="DateStr"
+                                    lay-verify="" autocomplete="off" placeholder="请输入日期">
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="layui-form-item layui-hide">
+                <input type="button" lay-submit lay-filter="LAY-list-front-submit" id="LAY-list-front-submit" value="确认">
+            </div>
+          </div>
+        </div>
+    </div>
+
+    <script src="/layuiadmin/layui/layui.js"></script>
+    <script>
+        
+        layui.config({
+            base: '/layuiadmin/' //静态资源所在路径
+        }).extend({
+            index: 'lib/index' //主入口模块
+        }).use(['index', 'form', 'upload', 'layedit', 'laydate', 'element', 'croppers', 'transfer', 'tree', 'util'], function () {
+            var $ = layui.$
+                , form = layui.form
+                , layer = layui.layer
+                , layedit = layui.layedit
+                , laydate = layui.laydate
+                , croppers = layui.croppers
+                , transfer = layui.transfer
+                , util = layui.util
+                , element = layui.element
+        
+            //Hash地址的定位
+            var layid = location.hash.replace(/^#test=/, '');
+            element.tabChange('test', layid);
+            element.on('tab(test)', function (elem) {
+                location.hash = 'test=' + $(this).attr('lay-id');
+            });
+    
+            //日期
+            laydate.render({
+                elem: '#DateStr',
+                type: 'date',
+                trigger: 'click'
+            });
+            
+
+            //上传文件
+            
+
+            //穿梭框
+            
+
+            //TreeView，比如权限管理
+            
+
+            //省市区
+            
+        })
+
+    </script>
+</body>
+</html>

Areas/Admin/Views/MainServer/TradeRecord/ImportTrade.cshtml

@@ -37,7 +37,14 @@
                         <div class="layui-form-item">
                             <label class="layui-form-label">模板下载</label>
                             <div class="layui-form-mid layui-word-aux" id="excelTemp">
+                                @if(ExcelKind == "1")
+                                {
+                                <a href="https://kexiaoshuang.oss-cn-chengdu.aliyuncs.com/ExcelTmplate/%E5%B9%BF%E7%94%B5%E5%8D%A1%E6%BF%80%E6%B4%BB%E8%A1%A8%E6%A0%BC%E6%A8%A1%E6%9D%BF.xlsx">点击下载入库模版</a>
+                                }
+                                else
+                                {
                                 <a href="https://kexiaoshuang.oss-cn-chengdu.aliyuncs.com/ExcelTmplate/%E5%B9%BF%E7%94%B5%E5%8D%A1%E4%BA%A4%E6%98%93%E8%A1%A8%E6%A0%BC%E6%A8%A1%E6%9D%BF.xlsx">点击下载入库模版</a>
+                                }
                             </div>
                         </div>
                         <div class="layui-form-item">

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

@@ -148,7 +148,7 @@
                             <button class="layui-btn" data-type="ImportTrade">
                                 <i class="layui-icon layui-icon-upload layuiadmin-button-btn"></i>导交易
                             </button>
-                            <button class="layui-btn" onclick="GetActInfo()">
+                            <button class="layui-btn" data-type="GetActInfo">
                                 <i class="layui-icon layui-icon-upload layuiadmin-button-btn"></i>获取激活信息
                             </button>
                             }
@@ -201,37 +201,5 @@
     <script>
         var BrandId = '@BrandId';
     </script>
-    <script>
-        function GetActInfo() {
-            var index = layer.confirm('确定操作该功能吗？', function (index) {
-                var indexs = layer.load(1, {
-                    shade: [0.5, '#000']
-                });
-                var userdata = $("#confirmFrm").serialize();
-                $.ajax({
-                    type: "POST",
-                    url: "/Admin/TradeRecord/GetActInfo?r=" + Math.random(1),
-                    data: userdata,
-                    dataType: "text",
-                    success: function (data) {
-                        layer.close(index); //关闭弹层
-                        if (data == "success") {
-                            layer.close(indexs); //关闭弹层
-                            layer.msg('成功', {
-                                time: 1000
-                            }, function () {
-                                window.location.reload();
-                            });
-                        } else {
-                            layer.close(indexs); //关闭弹层
-                            layer.msg(data, { time: 1000 }, function () {
-                                window.location.reload();
-                            });
-                        }
-                    }
-                });
-            });
-        }
-    </script>
 </body>
 </html>

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

@@ -48,6 +48,13 @@
                             </div>
                         </div>
                     </div>
+                    <div class="layui-form-item" id="ReturnInfo" style="display: none;>
+                        <label class="layui-form-label">向上返额度</label>
+                        <div class="layui-input-block">
+                            <input type="checkbox" id="ReturnFlag" name="ReturnFlag" value="1"
+                                lay-skin="switch" lay-filter="ReturnFlag" title="开关">
+                        </div>
+                    </div>
                     <div class="layui-form-item">
                         <label class="layui-form-label">*金额</label>
                         <div class="layui-input-inline">
@@ -97,6 +104,17 @@
                 location.hash = 'test=' + $(this).attr('lay-id');
             });
 
+            form.on('select(Kind)', function (data) {
+                if(data.value == '2') {
+                    $('#ReturnInfo').show();
+                }
+                else
+                {
+                    $('#ReturnInfo').hide();
+                }
+                form.render();
+            });
+
             //日期
 
             //上传文件

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

@@ -46,11 +46,6 @@
                             </select>
                         </div>
                     </div>
-                    <div class="layui-form-item" id="ReturnInfo" style="display: none;>
-                        <label class="layui-form-label">向上返额度</label>
-                        <div class="layui-input-block">
-                            <input type="checkbox" id="ReturnFlag" name="ReturnFlag" value="1"
-                                lay-skin="switch" lay-filter="ReturnFlag" title="开关">
                         </div>
                     </div>
                     <div class="layui-form-item">
@@ -102,19 +97,6 @@
                 location.hash = 'test=' + $(this).attr('lay-id');
             });
 
-            
-            form.on('select(Kind)', function (data) {
-                if(data.value == '2') {
-                    $('#ReturnInfo').show();
-                    $('#ContentDiv').hide();
-                }
-                else
-                {
-                    $('#ReturnInfo').hide();
-                }
-                form.render();
-            });
-
             //日期
 
             //上传文件

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

@@ -65,18 +65,17 @@
                         <div class="layui-input-inline">
                             <input class="layui-input" type="text" name="MakerName" placeholder="" autocomplete="off">
                         </div>
-                    </div><div class="layui-form-item">
-                        <div class="layui-inline">
-                            <label class="layui-form-label">合伙人类型</label>
-                            <div class="layui-input-inline">
-                                <select id="UserType" name="UserType">
-                                    <option value="">请选择</option>
-                                    <option value="1">运营中心</option>
-                                    <option value="2">黄金合伙人</option>
-                                    <option value="3">钻石合伙人</option>
-                                    <option value="4">战略合伙人</option>
-                                </select>
-                            </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">合伙人类型</label>
+                        <div class="layui-input-inline">
+                            <select id="UserType" name="UserType">
+                                <option value="">请选择</option>
+                                <option value="1">运营中心</option>
+                                <option value="2">黄金合伙人</option>
+                                <option value="3">钻石合伙人</option>
+                                <option value="4">战略合伙人</option>
+                            </select>
                         </div>
                     </div>
                     <div class="layui-inline">

Models/LeaderReserveRecord.cs

@@ -24,5 +24,6 @@ namespace MySystem.Models
         public string TradeDate { get; set; }
         public string TradeMonth { get; set; }
         public int UserId { get; set; }
+        public int AccountRecordId { get; set; }
     }
 }

Models/WebCMSEntities.cs

@@ -5323,6 +5323,10 @@ namespace MySystem.Models
             {
                 entity.Property(e => e.Id).HasColumnType("int(11)");
 
+                entity.Property(e => e.AccountRecordId)
+                    .HasColumnType("int(11)")
+                    .HasComment("可提现余额变动Id");
+
                 entity.Property(e => e.AfterAmt).HasColumnType("decimal(18,2)");
 
                 entity.Property(e => e.BeforeAmt).HasColumnType("decimal(18,2)");

wwwroot/layuiadmin/modules_main/LeaderReserveRecord_Admin.js

@@ -102,7 +102,8 @@ layui.config({
             , { field: 'SeoKeyword', width: 200, title: '订单编号', sort: true }
             , { field: 'dPosCoupons', width: 150, title: '电签兑换券', sort: true }
             , { field: 'bPosCoupons', width: 150, title: '大POS兑换券', sort: true }
-            , { field: 'LeaderBalanceAmount', width: 130, title: '可提现余额', sort: true }
+            , { field: 'LeaderBalanceAmount', width: 150, title: '当前可提现余额', sort: true }
+            , { field: 'AfterBalanceAmount', width: 200, title: '变化后可提现余额', sort: true }
             , { field: 'ChangeAmt', width: 130, title: '使用额度', sort: true }
             , { field: 'BeforeAmt', width: 180, title: '使用前剩余额度', sort: true }
             , { field: 'AfterAmt', width: 180, title: '使用后剩余额度', sort: true }

wwwroot/layuiadmin/modules_main/Orders_Admin.js

@@ -154,6 +154,7 @@ layui.config({
             , { field: 'TotalPrice', width: 200, title: '订单金额', sort: true }
             , { field: 'BuyCount', width: 200, title: '购买数量', sort: true }
             , { field: 'UserInfo', width: 200, title: '创客信息', sort: true }
+            , { field: 'UserId', width: 100, title: '创客Id', sort: true }
             , { field: 'Store', width: 200, title: '发货仓库信息', sort: true }
             , { field: 'StoreContact', width: 200, title: '仓库联系人信息', sort: true }
             , { field: 'StoreFrom', width: 200, title: '仓库归属信息', sort: true }

wwwroot/layuiadmin/modules_main/PreSendStockDetail_Admin.js

@@ -390,15 +390,34 @@ layui.config({
             $(".layuiadmin-card-header-auto select").each(function (i) {
                 userdata += $(this).attr('name') + '=' + encodeURIComponent($(this).val()) + '&';
             });
-            $.ajax({
-                type: "GET",
-                url: "/Admin/PreSendStockDetail/ExportExcel?r=" + Math.random(1),
-                data: userdata,
-                dataType: "json",
-                success: function (data) {
-                    data.Obj.unshift(data.Fields);
-                    excel.exportExcel(data.Obj, data.Info, 'xlsx');
-                }
+            var index = layer.confirm('确定导出吗？', function (index) {
+                var indexs = layer.load(1, {
+                    shade: [0.5, '#000']
+                });
+                $.ajax({
+                    // type: "GET",
+                    // url: "/Admin/PreSendStockDetail/ExportExcel?r=" + Math.random(1),
+                    type: "POST",
+                    url: "/Admin/PreSendStockDetail/QuickExportExcelDo?r=" + Math.random(1),
+                    data: userdata,
+                    dataType: "text",
+                    success: function (data) {
+                        layer.close(index); //关闭弹层
+                        if (data == "success") {
+                            layer.close(indexs); //关闭弹层
+                            layer.msg('导出成功，请到我的下载中点击下载文件', {
+                                time: 1000
+                            }, function () {
+                                window.location.reload();
+                            });
+                        } else {
+                            layer.close(indexs); //关闭弹层
+                            layer.msg(data);
+                        }
+                        // data.Obj.unshift(data.Fields);
+                        // excel.exportExcel(data.Obj, data.Info, 'xlsx');
+                    }
+                });
             });
         }
         , Open: function () {

wwwroot/layuiadmin/modules_main/SysRechargeRecord_Admin.js

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

wwwroot/layuiadmin/modules_main/TradeRecord_Admin.js

@@ -669,6 +669,60 @@ layui.config({
                 });
             }
         }
+        , GetActInfo: function () {
+            var perContent = layer.open({
+                type: 2
+                , title: '获取广电卡激活数据'
+                , content: 'GetSimTrade'
+                , maxmin: true
+                , area: ['500px', '450px']
+                , btn: ['确定', '取消']
+                , yes: function (index, layero) {
+                    var iframeWindow = window['layui-layer-iframe' + index]
+                        , submitID = 'LAY-list-front-submit'
+                        , submit = layero.find('iframe').contents().find('#' + submitID);
+
+                    setTimeout(function () {
+                        layero.find('iframe').contents().find('.layui-tab-item').each(function (i) {
+                            var errObj = $(this).find('.layui-form-danger');
+                            if (errObj.length > 0) {
+                                iframeWindow.element.tabChange('mytabbar', String(i + 1));
+                                submit.click();
+                            }
+                        });
+                    }, 300);
+
+
+                    //监听提交
+                    iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
+                        var field = data.field; //获取提交的字段
+                        var userdata = "";
+                        for (var prop in field) {
+                            userdata += prop + "=" + encodeURIComponent(field[prop]) + "&";
+                        }
+                        //提交 Ajax 成功后，静态更新表格中的数据
+                        //$.ajax({});
+
+                        $.ajax({
+                            type: "POST",
+                            url: "/Admin/TradeRecord/GetSimTradePost?r=" + Math.random(1),
+                            data: userdata,
+                            dataType: "text",
+                            success: function (data) {
+                                layer.close(index); //关闭弹层
+                                if (data == "success") {
+                                    layer.msg("提交成功");
+                                } else {
+                                    layer.msg(data);
+                                }
+                            }
+                        });
+                    });
+
+                    submit.trigger('click');
+                }
+            });
+        }
     };
 
     $('.layui-btn').on('click', function () {

wwwroot/layuiadmin/modules_operate/AmountRecord_Admin.js

@@ -91,7 +91,7 @@ layui.config({
         , url: '/Admin/AmountRecordOperate/IndexData' //模拟接口
         , cols: [[
             { type: 'checkbox', fixed: 'left' }
-            , { field: 'OpCode', width: 105, title: '运营中心编号', sort: true }
+            , { field: 'OpCode', width: 150, title: '运营中心编号', sort: true }
             , { field: 'MakerCode', width: 105, title: '创客编号', sort: true }
             , { field: 'MakerName', width: 105, title: '创客姓名', sort: true }
             , { field: 'SeoKeyword', width: 100, title: '备注', sort: true }
@@ -99,13 +99,15 @@ layui.config({
             , { field: 'UseAmount', width: 110, title: '交易金额', sort: true }
             , { field: 'BeforeAmount', width: 130, title: '交易前总金额', sort: true }
             , { field: 'AfterAmount', width: 130, title: '交易后总金额', sort: true }
-            , { field: 'CreateDate', width: 110, title: '交易时间', sort: true }
+            , { field: 'CreateDate', width: 180, title: '交易时间', sort: true }
+            , { field: 'SourceInfo', width: 200, title: '来源创客信息', sort: true }
         ]]
         , where: {
         }
         , page: true
         , limit: 30
-        , height: 'full-' + String($('.layui-card-header').height() + 130)
+        , height: 'full-220'
+        // , height: 'full-' + String($('.layui-card-header').height() + 130)
         , text: '对不起，加载出现异常！'
         , done: function (res, curr, count) {
             $(".layui-none").text("无数据");

wwwroot/layuiadmin/modules_operate/SysAdminOperate_Admin.js

@@ -250,6 +250,7 @@ layui.config({
                                             table.reload('LAY-list-manage'); //数据刷新
                                         });
                                     } else {
+                                        layer.close(loadindex); //关闭弹层
                                         layer.msg(data);
                                     }
                                 }
@@ -307,6 +308,7 @@ layui.config({
                                             table.reload('LAY-list-manage'); //数据刷新
                                         });
                                     } else {
+                                        layer.close(loadindex); //关闭弹层
                                         layer.msg(data);
                                     }
                                 }
@@ -366,7 +368,8 @@ layui.config({
                                 if (data == "success") {
                                     table.reload('LAY-list-manage'); //数据刷新
                                 } else {
-                                    layer.msg(data);
+                                        layer.close(loadindex); //关闭弹层
+                                        layer.msg(data);
                                 }
                             }
                         });
@@ -476,7 +479,8 @@ layui.config({
                                         table.reload('LAY-list-manage'); //数据刷新
                                     });
                                 } else {
-                                    layer.msg(data);
+                                        layer.close(loadindex); //关闭弹层
+                                        layer.msg(data);
                                 }
                             }
                         });