Merge branch 'DuGuYangXG' into DuGuYang

AppStart/ExcelHelper.cs

@@ -853,7 +853,7 @@ namespace MySystem
                                                         machine.OrderId = 0;
                                                         machine.RecycEndDate = null;
                                                         machine.PosSnType = 0;
-                                                        machine.BindMerchantId=0;
+                                                        machine.BindMerchantId = 0;
                                                         machine.ScanQrTrade = 0;
                                                         machine.DebitCardTrade = 0;
                                                         machine.CreditTrade = 0;
@@ -1015,110 +1015,166 @@ namespace MySystem
                                         UserCashRecord edit = db.UserCashRecord.FirstOrDefault(m => m.CashOrderNo == CashOrderNo && m.ActualTradeAmount == Amount && m.Status == 0);
                                         if (edit != null)
                                         {
-                                            edit.Status = Status;
-                                            edit.Remark = Remark;
-                                            edit.UpdateMan = Operator;
-                                            if (Status == 1)
-                                            { 
-                                                UserAccount account = db.UserAccount.FirstOrDefault(m => m.Id == edit.UserId);
-                                                if (account != null)
+                                            if (edit.TradeType == 3)
+                                            {
+                                                edit.Status = Status;
+                                                edit.Remark = Remark;
+                                                edit.UpdateMan = Operator;
+                                                if (Status == 1)
                                                 {
-                                                    account.QueryCount = 1;
-                                                    decimal TradeAmount = edit.TradeAmount;
-                                                    decimal BeforeTotalAmount = account.TotalAmount; //变更前总金额
-                                                    decimal BeforeFreezeAmount = account.FreezeAmount; //变更前冻结金额
-                                                    decimal BeforeBalanceAmount = account.BalanceAmount; //变更前余额
-                                                    account.WithdrawAmount += edit.TradeAmount;
-                                                    account.FreezeAmount -= edit.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 = edit.UserId, //创客
-                                                        ChangeType = 3, //变动类型
-                                                        ProductType = 99, //产品类型
-                                                        ChangeAmount = edit.ActualTradeAmount, //变更金额
-                                                        BeforeTotalAmount = BeforeTotalAmount, //变更前总金额
-                                                        AfterTotalAmount = AfterTotalAmount, //变更后总金额
-                                                        BeforeFreezeAmount = BeforeFreezeAmount, //变更前冻结金额
-                                                        AfterFreezeAmount = AfterFreezeAmount, //变更后冻结金额
-                                                        BeforeBalanceAmount = BeforeBalanceAmount, //变更前余额
-                                                        AfterBalanceAmount = AfterBalanceAmount, //变更后余额
-                                                    });
-                                                    db.UserAccountRecord.Add(new UserAccountRecord()
+                                                    UserAccount account = db.UserAccount.FirstOrDefault(m => m.Id == edit.UserId);
+                                                    if (account != null)
                                                     {
-                                                        CreateDate = DateTime.Now,
-                                                        UpdateDate = DateTime.Now,
-                                                        UserId = edit.UserId, //创客
-                                                        ChangeType = 4, //变动类型
-                                                        ProductType = 99, //产品类型
-                                                        ChangeAmount = edit.TradeFee, //变更金额
-                                                        BeforeTotalAmount = BeforeTotalAmount, //变更前总金额
-                                                        AfterTotalAmount = AfterTotalAmount, //变更后总金额
-                                                        BeforeFreezeAmount = BeforeFreezeAmount, //变更前冻结金额
-                                                        AfterFreezeAmount = AfterFreezeAmount, //变更后冻结金额
-                                                        BeforeBalanceAmount = BeforeBalanceAmount, //变更前余额
-                                                        AfterBalanceAmount = AfterBalanceAmount, //变更后余额
-                                                    });
-                                                    db.UserAccountRecord.Add(new UserAccountRecord()
+                                                        decimal TradeAmount = edit.TradeAmount;
+                                                        account.LeaderBalanceAmount -= TradeAmount;
+                                                        db.LeaderAccountRecord.Add(new LeaderAccountRecord()
+                                                        {
+                                                            CreateDate = DateTime.Now,
+                                                            UserId = edit.UserId, //创客
+                                                            ChangeType = 3, //变动类型
+                                                            ProductType = 99, //产品类型
+                                                            ChangeAmount = TradeAmount, //变更金额
+                                                            BeforeBalanceAmount = account.LeaderBalanceAmount + TradeAmount, //变更前余额
+                                                            AfterBalanceAmount = account.LeaderBalanceAmount, //变更后余额
+                                                        });
+                                                        db.SaveChanges();
+                                                        RedisDbconn.Instance.Set("UserAccount:" + edit.UserId, account);
+                                                    }
+                                                }
+                                                else if (Status == 2)
+                                                {
+                                                    UserAccount account = db.UserAccount.FirstOrDefault(m => m.Id == edit.UserId);
+                                                    if (account != null)
                                                     {
-                                                        CreateDate = DateTime.Now,
-                                                        UpdateDate = DateTime.Now,
-                                                        UserId = edit.UserId, //创客
-                                                        ChangeType = 5, //变动类型
-                                                        ProductType = 99, //产品类型
-                                                        ChangeAmount = edit.ManageFee, //变更金额
-                                                        BeforeTotalAmount = BeforeTotalAmount, //变更前总金额
-                                                        AfterTotalAmount = AfterTotalAmount, //变更后总金额
-                                                        BeforeFreezeAmount = BeforeFreezeAmount, //变更前冻结金额
-                                                        AfterFreezeAmount = AfterFreezeAmount, //变更后冻结金额
-                                                        BeforeBalanceAmount = BeforeBalanceAmount, //变更前余额
-                                                        AfterBalanceAmount = AfterBalanceAmount, //变更后余额
-                                                    });
-                                                    db.SaveChanges();
-                                                    RedisDbconn.Instance.Set("UserAccount:" + edit.UserId, account);
+                                                        decimal TradeAmount = edit.TradeAmount;
+                                                        account.LeaderBalanceAmount += TradeAmount;
+                                                        db.LeaderAccountRecord.Add(new LeaderAccountRecord()
+                                                        {
+                                                            CreateDate = DateTime.Now,
+                                                            UserId = edit.UserId, //创客
+                                                            ChangeType = 6, //变动类型
+                                                            ProductType = 99, //产品类型
+                                                            ChangeAmount = TradeAmount, //变更金额
+                                                            BeforeBalanceAmount = account.LeaderBalanceAmount - TradeAmount, //变更前余额
+                                                            AfterBalanceAmount = account.LeaderBalanceAmount, //变更后余额
+                                                        });
+                                                        db.SaveChanges();
+                                                        RedisDbconn.Instance.Set("UserAccount:" + edit.UserId, account);
+                                                    }
                                                 }
+                                                db.SaveChanges();
+                                                RedisDbconn.Instance.Clear("UserCashRecord:" + edit.Id);
+                                                SuccessCount += 1;
+                                                RedisDbconn.Instance.Set("CheckImport:" + checkKey, SuccessCount + " / " + TotalCount);
                                             }
-                                            else if (Status == 2)
+                                            else
                                             {
-                                                UserAccount account = db.UserAccount.FirstOrDefault(m => m.Id == edit.UserId);
-                                                if (account != null)
+                                                edit.Status = Status;
+                                                edit.Remark = Remark;
+                                                edit.UpdateMan = Operator;
+                                                if (Status == 1)
+                                                {
+                                                    UserAccount account = db.UserAccount.FirstOrDefault(m => m.Id == edit.UserId);
+                                                    if (account != null)
+                                                    {
+                                                        account.QueryCount = 1;
+                                                        decimal TradeAmount = edit.TradeAmount;
+                                                        decimal BeforeTotalAmount = account.TotalAmount; //变更前总金额
+                                                        decimal BeforeFreezeAmount = account.FreezeAmount; //变更前冻结金额
+                                                        decimal BeforeBalanceAmount = account.BalanceAmount; //变更前余额
+                                                        account.WithdrawAmount += edit.TradeAmount;
+                                                        account.FreezeAmount -= edit.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 = edit.UserId, //创客
+                                                            ChangeType = 3, //变动类型
+                                                            ProductType = 99, //产品类型
+                                                            ChangeAmount = edit.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 = edit.UserId, //创客
+                                                            ChangeType = 4, //变动类型
+                                                            ProductType = 99, //产品类型
+                                                            ChangeAmount = edit.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 = edit.UserId, //创客
+                                                            ChangeType = 5, //变动类型
+                                                            ProductType = 99, //产品类型
+                                                            ChangeAmount = edit.ManageFee, //变更金额
+                                                            BeforeTotalAmount = BeforeTotalAmount, //变更前总金额
+                                                            AfterTotalAmount = AfterTotalAmount, //变更后总金额
+                                                            BeforeFreezeAmount = BeforeFreezeAmount, //变更前冻结金额
+                                                            AfterFreezeAmount = AfterFreezeAmount, //变更后冻结金额
+                                                            BeforeBalanceAmount = BeforeBalanceAmount, //变更前余额
+                                                            AfterBalanceAmount = AfterBalanceAmount, //变更后余额
+                                                        });
+                                                        db.SaveChanges();
+                                                        RedisDbconn.Instance.Set("UserAccount:" + edit.UserId, account);
+                                                    }
+                                                }
+                                                else if (Status == 2)
                                                 {
-                                                    decimal TradeAmount = edit.TradeAmount;
-                                                    decimal BeforeTotalAmount = account.TotalAmount; //变更前总金额
-                                                    decimal BeforeFreezeAmount = account.FreezeAmount; //变更前冻结金额
-                                                    decimal BeforeBalanceAmount = account.BalanceAmount; //变更前余额
-                                                    account.BalanceAmount += TradeAmount;
-                                                    account.FreezeAmount -= TradeAmount;
-                                                    decimal AfterTotalAmount = account.TotalAmount; //变更后总金额
-                                                    decimal AfterFreezeAmount = account.FreezeAmount; //变更后冻结金额
-                                                    decimal AfterBalanceAmount = account.BalanceAmount; //变更后余额
-                                                    db.UserAccountRecord.Add(new UserAccountRecord()
+                                                    UserAccount account = db.UserAccount.FirstOrDefault(m => m.Id == edit.UserId);
+                                                    if (account != null)
                                                     {
-                                                        CreateDate = DateTime.Now,
-                                                        UpdateDate = DateTime.Now,
-                                                        UserId = edit.UserId, //创客
-                                                        ChangeType = 6, //变动类型
-                                                        ProductType = 99, //产品类型
-                                                        ChangeAmount = TradeAmount, //变更金额
-                                                        BeforeTotalAmount = BeforeTotalAmount, //变更前总金额
-                                                        AfterTotalAmount = AfterTotalAmount, //变更后总金额
-                                                        BeforeFreezeAmount = BeforeFreezeAmount, //变更前冻结金额
-                                                        AfterFreezeAmount = AfterFreezeAmount, //变更后冻结金额
-                                                        BeforeBalanceAmount = BeforeBalanceAmount, //变更前余额
-                                                        AfterBalanceAmount = AfterBalanceAmount, //变更后余额
-                                                    });
-                                                    db.SaveChanges();
-                                                    RedisDbconn.Instance.Set("UserAccount:" + edit.UserId, account);
+                                                        decimal TradeAmount = edit.TradeAmount;
+                                                        decimal BeforeTotalAmount = account.TotalAmount; //变更前总金额
+                                                        decimal BeforeFreezeAmount = account.FreezeAmount; //变更前冻结金额
+                                                        decimal BeforeBalanceAmount = account.BalanceAmount; //变更前余额
+                                                        account.BalanceAmount += TradeAmount;
+                                                        account.FreezeAmount -= 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 = edit.UserId, //创客
+                                                            ChangeType = 6, //变动类型
+                                                            ProductType = 99, //产品类型
+                                                            ChangeAmount = TradeAmount, //变更金额
+                                                            BeforeTotalAmount = BeforeTotalAmount, //变更前总金额
+                                                            AfterTotalAmount = AfterTotalAmount, //变更后总金额
+                                                            BeforeFreezeAmount = BeforeFreezeAmount, //变更前冻结金额
+                                                            AfterFreezeAmount = AfterFreezeAmount, //变更后冻结金额
+                                                            BeforeBalanceAmount = BeforeBalanceAmount, //变更前余额
+                                                            AfterBalanceAmount = AfterBalanceAmount, //变更后余额
+                                                        });
+                                                        db.SaveChanges();
+                                                        RedisDbconn.Instance.Set("UserAccount:" + edit.UserId, account);
+                                                    }
                                                 }
+                                                db.SaveChanges();
+                                                RedisDbconn.Instance.Clear("UserCashRecord:" + edit.Id);
+                                                SuccessCount += 1;
+                                                RedisDbconn.Instance.Set("CheckImport:" + checkKey, SuccessCount + " / " + TotalCount);
                                             }
-                                            db.SaveChanges();
-                                            RedisDbconn.Instance.Clear("UserCashRecord:" + edit.Id);
-                                            SuccessCount += 1;
-                                            RedisDbconn.Instance.Set("CheckImport:" + checkKey, SuccessCount + " / " + TotalCount);
+
                                         }
                                     }
                                     DoCount += Size;

AppStart/RelationClassForConst.cs

@@ -138,6 +138,9 @@ namespace MySystem
                 case 2:
                     result = "用户提现";
                     break;
+                case 3:
+                    result = "盟主提现";
+                    break;
             }
             return result;
         }

Areas/Admin/Controllers/MainServer/StoreHouseAmountPromissController.cs

@@ -98,6 +98,12 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["ToUserIdRealName"] = touserid_Users.RealName;
                 dic.Remove("ToUserId");
 
+                //是否使用
+                int Status = int.Parse(dic["Status"].ToString());
+                if (Status == 0) dic["StatusName"] = "确认中";
+                if (Status == 1) dic["StatusName"] = "成功";
+                if (Status == 2) dic["StatusName"] = "失败";
+
             }
             return Json(obj);
         }
@@ -133,9 +139,9 @@ namespace MySystem.Areas.Admin.Controllers
             Dictionary<string, object> Fields = new Dictionary<string, object>();
             var FromUserIdInfo = db.Users.FirstOrDefault(m => m.MakerCode == FromUserId);
             var ToUserIdInfo = db.Users.FirstOrDefault(m => m.MakerCode == ToUserId);
-            ToUserIdInfo.ValidAmount += PromissAmount;
+            // ToUserIdInfo.ValidAmount += PromissAmount;//添加担保金
 
-             db.StoreHouseAmountPromiss.Add(new StoreHouseAmountPromiss()
+            db.StoreHouseAmountPromiss.Add(new StoreHouseAmountPromiss()
             {
                 CreateDate = DateTime.Now,
                 FromUserId = FromUserIdInfo.Id,
@@ -144,6 +150,14 @@ namespace MySystem.Areas.Admin.Controllers
                 SeoDescription = SeoDescription
             });
             db.SaveChanges();
+            RedisDbconn.Instance.AddList("MsgPersonalQueue", Newtonsoft.Json.JsonConvert.SerializeObject(new MsgPersonal()
+            {
+                UserId = FromUserIdInfo.Id, //接收创客
+                Title = "仓库担保通知", //标题
+                Content = "<div class='f16'>已经为创客 <br/>" + ToUserIdInfo.RealName + ' ' + ToUserIdInfo.MakerCode + "进行分仓额度担保<br/>担保金额：" + PromissAmount + " </div>", //内容
+                Summary = "已经为创客" + ToUserIdInfo.RealName + ' ' + ToUserIdInfo.MakerCode + "进行分仓额度担保，担保金额：" + PromissAmount,
+                CreateDate = DateTime.Now,
+            }));
 
             return "success";
         }
@@ -196,17 +210,36 @@ namespace MySystem.Areas.Admin.Controllers
         public string Edit(StoreHouseAmountPromiss data)
         {
             Dictionary<string, object> Fields = new Dictionary<string, object>();
+            StoreHouseAmountPromiss storeHouseAmountPromiss = db.StoreHouseAmountPromiss.FirstOrDefault(m => m.Id == data.Id);
+            Fields.Add("FromUserId", storeHouseAmountPromiss.FromUserId); //担保人
+            Fields.Add("ToUserId", storeHouseAmountPromiss.ToUserId); //担保对象
+            if (data.PromissAmount > storeHouseAmountPromiss.PromissAmount)
+            {
+                return "修改保证金不可高于原保证金额度！";
+            }
+            else
+            {
+                Fields.Add("PromissAmount", data.PromissAmount); //担保金额
+            }
 
-            Fields.Add("FromUserId", data.FromUserId); //担保人
-            Fields.Add("ToUserId", data.ToUserId); //担保对象
-            Fields.Add("PromissAmount", data.PromissAmount); //担保金额
-
-            Fields.Add("SeoTitle", data.SeoTitle);
-            Fields.Add("SeoKeyword", data.SeoKeyword);
-            Fields.Add("SeoDescription", data.SeoDescription);
+            Fields.Add("SeoTitle", storeHouseAmountPromiss.SeoTitle);
+            Fields.Add("SeoKeyword", storeHouseAmountPromiss.SeoKeyword);
+            Fields.Add("SeoDescription", storeHouseAmountPromiss.SeoDescription);
             new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("StoreHouseAmountPromiss", Fields, data.Id);
             AddSysLog(data.Id.ToString(), "StoreHouseAmountPromiss", "update");
+            UserAccount userAccount = db.UserAccount.FirstOrDefault(m => m.Id == data.ToUserId) ?? new UserAccount();
+            userAccount.ValidAmount = userAccount.ValidAmount - (storeHouseAmountPromiss.PromissAmount - data.PromissAmount);//减去担保金调整差额
             db.SaveChanges();
+            var storeA = db.StoreHouseAmountPromiss.FirstOrDefault(m => m.Id == data.Id);
+            var ToUserId = db.Users.FirstOrDefault(m => m.Id == storeHouseAmountPromiss.ToUserId);
+            RedisDbconn.Instance.AddList("MsgPersonalQueue", Newtonsoft.Json.JsonConvert.SerializeObject(new MsgPersonal()
+            {
+                UserId = storeHouseAmountPromiss.FromUserId, //接收创客
+                Title = "仓库担保调低", //标题
+                Content = "<div class='f16'>已经为创客 <br/>" + ToUserId.RealName + ' ' + ToUserId.MakerCode + "进行分仓额度担保调低<br/>担保金额：" + storeA.PromissAmount + " </div>", //内容
+                Summary = "已经为创客" + ToUserId.RealName + ' ' + ToUserId.MakerCode + "进行分仓额度担保调低，担保金额：" + storeA.PromissAmount,
+                CreateDate = DateTime.Now,
+            }));
 
             return "success";
         }
@@ -227,10 +260,23 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 int id = int.Parse(subid);
                 Dictionary<string, object> Fields = new Dictionary<string, object>();
+                StoreHouseAmountPromiss storeHouseAmountPromiss = db.StoreHouseAmountPromiss.FirstOrDefault(m => m.Id == id);
                 Fields.Add("Status", -1);
+                var userAccount = db.UserAccount.FirstOrDefault(m => m.Id == storeHouseAmountPromiss.ToUserId);
+                userAccount.ValidAmount -= storeHouseAmountPromiss.PromissAmount;//减除保证金
                 new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("StoreHouseAmountPromiss", Fields, id);
             }
             db.SaveChanges();
+            StoreHouseAmountPromiss storep = db.StoreHouseAmountPromiss.FirstOrDefault(m => m.Id == Convert.ToInt32(Id));
+            var ToUserInfo = db.Users.FirstOrDefault(m => m.Id == storep.ToUserId);
+            RedisDbconn.Instance.AddList("MsgPersonalQueue", Newtonsoft.Json.JsonConvert.SerializeObject(new MsgPersonal()
+            {
+                UserId = storep.FromUserId, //接收创客
+                Title = "取消仓库担保", //标题
+                Content = "<div class='f16'>已取消为创客 <br/>" + ToUserInfo.RealName + ' ' + ToUserInfo.MakerCode + "的仓库担保金额 " + storep.PromissAmount + "元</div>", //内容
+                Summary = "已取消为创客 " + ToUserInfo.RealName + ' ' + ToUserInfo.MakerCode + "的仓库担保金额 " + storep.PromissAmount + "元",
+                CreateDate = DateTime.Now,
+            }));
 
             return "success";
         }

Areas/Admin/Controllers/MainServer/StoreHouseController.cs

@@ -861,6 +861,8 @@ namespace MySystem.Areas.Admin.Controllers
                 NoDataReturnFields.Add("StoreNo", "仓库编号");
                 NoDataReturnFields.Add("Mobile", "仓库所属人手机号");
                 NoDataReturnFields.Add("RealName", "仓库所属人名称");
+                NoDataReturnFields.Add("MakerCode", "仓库所属人编码");
+                NoDataReturnFields.Add("ManageMakerCode", "仓库管理员编码");
                 NoDataReturnFields.Add("Name", "品牌");
                 NoDataReturnFields.Add("LaveNum", "当前库存");
                 NoDataReturnFields.Add("c1", "出库(调拨)量");
@@ -925,7 +927,7 @@ namespace MySystem.Areas.Admin.Controllers
                     }
                 }
             }
-            DataTable list = OtherMySqlConn.dtable("select * from (select s.StoreName,s.StoreNo,u.RealName,u.Mobile,k.Name,s.LaveNum,(select count(Id) from StoreStockChange where Id>=" + minId + " and Id<=" + maxId + " and CreateDate>='" + sCreateDate + "' and CreateDate<='" + eCreateDate + "' and StoreId=s.Id and TransType=1) as c1,(select count(Id) from StoreStockChange where Id>=" + minId + " and Id<=" + maxId + " and CreateDate>='" + sCreateDate + "' and CreateDate<='" + eCreateDate + "' and StoreId=s.Id and TransType in (10,11,2)) as c2,(select count(Id) from PosMachinesTwo where Id>=" + minPosId + " and Id<=" + maxPosId + " and ActivationState=1 and ActivationTime>='" + sCreateDate + "' and ActivationTime<='" + eCreateDate + "' and StoreId=s.Id) as c3 from StoreHouse s left join Users u on s.BrandId>0 and s.UserId=u.Id left join KqProducts k on s.BrandId=k.Id) tb where c1>0 or c2>0 or c3>0");
+            DataTable list = OtherMySqlConn.dtable("select * from (select s.StoreName,s.StoreNo,u.RealName,u.Mobile,u.MakerCode,(select MakerCode from Users where Id=s.ManageUserId) as ManageMakerCode,k.Name,s.LaveNum,(select count(Id) from StoreStockChange where Id>=" + minId + " and Id<=" + maxId + " and CreateDate>='" + sCreateDate + "' and CreateDate<='" + eCreateDate + "' and StoreId=s.Id and TransType=1) as c1,(select count(Id) from StoreStockChange where Id>=" + minId + " and Id<=" + maxId + " and CreateDate>='" + sCreateDate + "' and CreateDate<='" + eCreateDate + "' and StoreId=s.Id and TransType in (10,11,2)) as c2,(select count(Id) from PosMachinesTwo where Id>=" + minPosId + " and Id<=" + maxPosId + " and ActivationState=1 and ActivationTime>='" + sCreateDate + "' and ActivationTime<='" + eCreateDate + "' and StoreId=s.Id) as c3 from StoreHouse s left join Users u on s.BrandId>0 and s.UserId=u.Id left join KqProducts k on s.BrandId=k.Id) tb where c1>0 or c2>0 or c3>0");
 
             int recordcount = list.Rows.Count;
             List<Dictionary<string, object>> diclist = new List<Dictionary<string, object>>();
@@ -936,6 +938,8 @@ namespace MySystem.Areas.Admin.Controllers
                 row.Add("StoreNo", sub["StoreNo"].ToString());
                 row.Add("Mobile", sub["Mobile"].ToString());
                 row.Add("RealName", sub["RealName"].ToString());
+                row.Add("MakerCode", sub["MakerCode"].ToString());
+                row.Add("ManageMakerCode", sub["ManageMakerCode"].ToString());
                 row.Add("Name", sub["Name"].ToString());
                 row.Add("LaveNum", sub["LaveNum"].ToString());
                 row.Add("c1", sub["c1"].ToString());
@@ -953,6 +957,8 @@ namespace MySystem.Areas.Admin.Controllers
             ReturnFields.Add("StoreNo", "仓库编号");
             ReturnFields.Add("Mobile", "仓库所属人手机号");
             ReturnFields.Add("RealName", "仓库所属人名称");
+            ReturnFields.Add("MakerCode", "仓库所属人编码");
+            ReturnFields.Add("ManageMakerCode", "仓库管理员编码");
             ReturnFields.Add("Name", "品牌");
             ReturnFields.Add("LaveNum", "当前库存");
             ReturnFields.Add("c1", "出库(调拨)量");

Areas/Admin/Controllers/MainServer/UserCashRecordController.cs

@@ -398,7 +398,7 @@ namespace MySystem.Areas.Admin.Controllers
                 condition += " and QueryCount=" + QueryCount;
             }
 
-            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("UserCashRecord", Fields, "Id desc", "0", 1, 20000, condition, "CashOrderNo,UserId,IdCardNo,ActualTradeAmount,Remark,Status,QueryCount", false);
+            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("UserCashRecord", Fields, "Id desc", "0", 1, 20000, condition, "CashOrderNo,UserId,IdCardNo,ActualTradeAmount,Remark,Status,QueryCount,CreateDate", false);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             foreach (Dictionary<string, object> dic in diclist)
             {
@@ -439,6 +439,7 @@ namespace MySystem.Areas.Admin.Controllers
             ReturnFields.Add("LockName", "代付标记");
             ReturnFields.Add("StatusName", "状态");
             ReturnFields.Add("Remark", "备注");
+            ReturnFields.Add("CreateDate", "创建时间");
 
             // ReturnFields.Add("CashOrderNo", "提现单号");
             // ReturnFields.Add("MakerCode", "创客编码");
@@ -451,7 +452,6 @@ namespace MySystem.Areas.Admin.Controllers
             // ReturnFields.Add("Status", "订单状态");
             // ReturnFields.Add("ReturnCode", "提现服务返回编码");
             // ReturnFields.Add("ReturnMsg", "提现服务返回信息");
-            // ReturnFields.Add("CreateDate", "创建时间");
             result.Add("Fields", ReturnFields);
             AddSysLog("0", "UserCashRecord", "ExportExcel");
             return Json(result);
@@ -523,46 +523,74 @@ namespace MySystem.Areas.Admin.Controllers
             UserCashRecord edit = db.UserCashRecord.FirstOrDefault(m => m.Id == Id);
             if (edit != null)
             {
-                edit.Status = 2;
-                edit.Remark = Remark;
-                edit.UpdateMan = SysUserName;
-                UserAccount account = db.UserAccount.FirstOrDefault(m => m.Id == edit.UserId);
-                if (account != null)
+                if (edit.TradeType == 3)
                 {
-                    decimal TradeAmount = edit.TradeAmount;
-                    decimal BeforeTotalAmount = account.TotalAmount; //变更前总金额
-                    decimal BeforeFreezeAmount = account.FreezeAmount; //变更前冻结金额
-                    decimal BeforeBalanceAmount = account.BalanceAmount; //变更前余额
-                    account.BalanceAmount += TradeAmount;
-                    if (account.FreezeAmount >= TradeAmount)
+                    edit.Status = 2;
+                    edit.Remark = Remark;
+                    edit.UpdateMan = SysUserName;
+                    UserAccount account = db.UserAccount.FirstOrDefault(m => m.Id == edit.UserId);
+                    if (account != null)
                     {
-                        account.FreezeAmount -= TradeAmount;
+                        decimal TradeAmount = edit.TradeAmount;
+                        account.LeaderBalanceAmount += TradeAmount;
+                        db.LeaderAccountRecord.Add(new LeaderAccountRecord()
+                        {
+                            CreateDate = DateTime.Now,
+                            UserId = edit.UserId, //创客
+                            ChangeType = 6, //变动类型
+                            ProductType = 99, //产品类型
+                            ChangeAmount = TradeAmount, //变更金额
+                            BeforeBalanceAmount = account.LeaderBalanceAmount - TradeAmount, //变更前余额
+                            AfterBalanceAmount = account.LeaderBalanceAmount, //变更后余额
+                        });
+                        db.SaveChanges();
+                        RedisDbconn.Instance.Set("UserAccount:" + edit.UserId, account);
                     }
-                    else
+                }
+                else
+                {
+                    edit.Status = 2;
+                    edit.Remark = Remark;
+                    edit.UpdateMan = SysUserName;
+                    UserAccount account = db.UserAccount.FirstOrDefault(m => m.Id == edit.UserId);
+                    if (account != null)
                     {
-                        return "冻结金额不足";
+                        decimal TradeAmount = edit.TradeAmount;
+                        decimal BeforeTotalAmount = account.TotalAmount; //变更前总金额
+                        decimal BeforeFreezeAmount = account.FreezeAmount; //变更前冻结金额
+                        decimal BeforeBalanceAmount = account.BalanceAmount; //变更前余额
+                        account.BalanceAmount += TradeAmount;
+                        if (account.FreezeAmount >= TradeAmount)
+                        {
+                            account.FreezeAmount -= TradeAmount;
+                        }
+                        else
+                        {
+                            return "冻结金额不足";
+                        }
+                        decimal AfterTotalAmount = account.TotalAmount; //变更后总金额
+                        decimal AfterFreezeAmount = account.FreezeAmount; //变更后冻结金额
+                        decimal AfterBalanceAmount = account.BalanceAmount; //变更后余额
+                        db.UserAccountRecord.Add(new UserAccountRecord()
+                        {
+                            CreateDate = DateTime.Now,
+                            UpdateDate = DateTime.Now,
+                            UserId = edit.UserId, //创客
+                            ChangeType = 6, //变动类型
+                            ProductType = 99, //产品类型
+                            ChangeAmount = TradeAmount, //变更金额
+                            BeforeTotalAmount = BeforeTotalAmount, //变更前总金额
+                            AfterTotalAmount = AfterTotalAmount, //变更后总金额
+                            BeforeFreezeAmount = BeforeFreezeAmount, //变更前冻结金额
+                            AfterFreezeAmount = AfterFreezeAmount, //变更后冻结金额
+                            BeforeBalanceAmount = BeforeBalanceAmount, //变更前余额
+                            AfterBalanceAmount = AfterBalanceAmount, //变更后余额
+                        });
+                        db.SaveChanges();
+                        RedisDbconn.Instance.Set("UserAccount:" + edit.UserId, account);
                     }
-                    decimal AfterTotalAmount = account.TotalAmount; //变更后总金额
-                    decimal AfterFreezeAmount = account.FreezeAmount; //变更后冻结金额
-                    decimal AfterBalanceAmount = account.BalanceAmount; //变更后余额
-                    db.UserAccountRecord.Add(new UserAccountRecord()
-                    {
-                        CreateDate = DateTime.Now,
-                        UpdateDate = DateTime.Now,
-                        UserId = edit.UserId, //创客
-                        ChangeType = 6, //变动类型
-                        ProductType = 99, //产品类型
-                        ChangeAmount = TradeAmount, //变更金额
-                        BeforeTotalAmount = BeforeTotalAmount, //变更前总金额
-                        AfterTotalAmount = AfterTotalAmount, //变更后总金额
-                        BeforeFreezeAmount = BeforeFreezeAmount, //变更前冻结金额
-                        AfterFreezeAmount = AfterFreezeAmount, //变更后冻结金额
-                        BeforeBalanceAmount = BeforeBalanceAmount, //变更前余额
-                        AfterBalanceAmount = AfterBalanceAmount, //变更后余额
-                    });
-                    db.SaveChanges();
-                    RedisDbconn.Instance.Set("UserAccount:" + edit.UserId, account);
                 }
+
                 db.SaveChanges();
             }
             return "success";

Areas/Admin/Controllers/MainServer/UsersController.cs

@@ -997,6 +997,121 @@ namespace MySystem.Areas.Admin.Controllers
 
         #endregion
 
+
+        #region 直属创客导出Excel
+
+        /// <summary>
+        /// 直属创客导出Excel
+        /// </summary>
+        /// <returns></returns>
+        public JsonResult ExportZSExcel(Users data, string MakerCode, string ParentMakerCode)
+        {
+            Dictionary<string, string> Fields = new Dictionary<string, string>();
+
+            string condition = " and Status>-1";
+            //创客编号
+            if (!string.IsNullOrEmpty(MakerCode))
+            {
+                condition += " and ParentUserId in (select UserId from UserForMakerCode where MakerCode='" + MakerCode + "')";
+            }
+            //直属创客编号
+            if (!string.IsNullOrEmpty(ParentMakerCode))
+            {
+                condition += " and ParentUserId in (select UserId from UserForMakerCode where MakerCode='" + ParentMakerCode + "')";
+            }
+
+            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("Users", Fields, "Id desc", "True", 1, 20000, condition, "Id,MakerCode,RealName,UserLevel", false);
+            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
+            foreach (Dictionary<string, object> dic in diclist)
+            {
+                int Id = int.Parse(dic["Id"].ToString());
+                Users userZS = db.Users.FirstOrDefault(m => m.Id == Id) ?? new Users();
+                dic["MakerCode"] = userZS.MakerCode;
+                dic["RealName"] = userZS.RealName;
+                dic["UserLevel"] = RelationClass.GetUserLevelSetInfo(int.Parse(dic["UserLevel"].ToString()));
+            }
+            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("Id", "Id");
+            ReturnFields.Add("MakerCode", "创客编号");
+            ReturnFields.Add("RealName", "创客姓名");
+            ReturnFields.Add("UserLevel", "创客等级");
+
+            result.Add("Fields", ReturnFields);
+            AddSysLog("0", "Users", "ExportZSExcel");
+            return Json(result);
+        }
+
+        #endregion
+
+
+        #region 上级创客导出Excel
+
+        /// <summary>
+        /// 上级创客导出Excel
+        /// </summary>
+        /// <returns></returns>
+        public JsonResult ExportSJExcel(Users data, string MakerCode, string ParentMakerCode)
+        {
+            Dictionary<string, string> Fields = new Dictionary<string, string>();
+
+            string condition = " and Status>-1";
+            //创客编号
+            if (!string.IsNullOrEmpty(MakerCode))
+            {
+                var query = db.UserForMakerCode.FirstOrDefault(m => m.MakerCode == MakerCode);
+                Users self = db.Users.FirstOrDefault(m => m.Id == query.UserId);
+                if (self != null)
+                {
+                    string ParentNav = function.CheckNull(self.ParentNav);
+                    condition += " and Id in (" + ParentNav.Trim(',').Replace(",,", ",") + ")";
+                }
+            }
+            //直属创客编号
+            if (!string.IsNullOrEmpty(ParentMakerCode))
+            {
+                var query = db.UserForMakerCode.FirstOrDefault(m => m.MakerCode == ParentMakerCode);
+                Users self = db.Users.FirstOrDefault(m => m.Id == query.UserId);
+                if (self != null)
+                {
+                    string ParentNav = function.CheckNull(self.ParentNav);
+                    condition += " and Id in (" + ParentNav.Trim(',').Replace(",,", ",") + ")";
+                }
+            }
+
+            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("Users", Fields, "Id desc", "True", 1, 20000, condition, "Id,MakerCode,RealName,UserLevel", false);
+            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
+            foreach (Dictionary<string, object> dic in diclist)
+            {
+                int Id = int.Parse(dic["Id"].ToString());
+                Users userSJ = db.Users.FirstOrDefault(m => m.Id == Id) ?? new Users();
+                dic["MakerCode"] = userSJ.MakerCode;
+                dic["RealName"] = userSJ.RealName;
+                dic["UserLevel"] = RelationClass.GetUserLevelSetInfo(int.Parse(dic["UserLevel"].ToString()));
+            }
+            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("Id", "Id");
+            ReturnFields.Add("MakerCode", "创客编号");
+            ReturnFields.Add("RealName", "创客姓名");
+            ReturnFields.Add("UserLevel", "创客等级");
+
+            result.Add("Fields", ReturnFields);
+            AddSysLog("0", "Users", "ExportExcel");
+            return Json(result);
+        }
+
+        #endregion
+
+
         #region 同步数据
 
         /// <summary>
@@ -1274,6 +1389,7 @@ namespace MySystem.Areas.Admin.Controllers
             string end = "";
 
             string condition = " and Status>-1";
+            string con = " and Status>-1";
             string sort = "Id desc";
             //创客编号
             if (!string.IsNullOrEmpty(MakerCode))
@@ -1289,6 +1405,7 @@ namespace MySystem.Areas.Admin.Controllers
                 string[] datelist = CreateDateData.Split(new string[] { " - " }, StringSplitOptions.None);
                 start = datelist[0].Replace("-", "");
                 end = datelist[1].Replace("-", "");
+                con += " and TradeDate>='" + start + "' and TradeDate<='" + end + "'";
             }
 
             Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("Users", Fields, sort, "True", page, limit, condition);
@@ -1338,63 +1455,63 @@ namespace MySystem.Areas.Admin.Controllers
 
             WebCMSEntities db = new WebCMSEntities();
             Dictionary<string, object> other = new Dictionary<string, object>();
-            DataTable dt = OtherMySqlConn.dtable("select Sum(HelpNonDirectTradeAmt + HelpNonDirectDebitTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='self' and UserId= '"+ParentId+"' and TradeDate >= '"+start+"' and TradeDate <= '"+end+"'");
+            DataTable dt = OtherMySqlConn.dtable("select Sum(HelpDirectTradeAmt + HelpDirectDebitTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='self' and UserId= '" + ParentId + "'" + con);
             if (dt.Rows.Count > 0)
             {
                 TotalAmtfc = Convert.ToDecimal(function.CheckNum(dt.Rows[0][0].ToString()));
             }
-            dt = OtherMySqlConn.dtable("select Sum(HelpNonDirectTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='self' and UserId= '"+ParentId+"' and TradeDate >= '"+start+"' and TradeDate <= '"+end+"'");
+            dt = OtherMySqlConn.dtable("select Sum(HelpDirectTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='self' and UserId= '" + ParentId + "'" + con);
             if (dt.Rows.Count > 0)
             {
                 DAmtfc = Convert.ToDecimal(function.CheckNum(dt.Rows[0][0].ToString()));
             }
-            dt = OtherMySqlConn.dtable("select Sum(HelpNonDirectDebitTradeAmt),Sum(HelpDirectDebitCapTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='self' and UserId= '"+ParentId+"' and TradeDate >= '"+start+"' and TradeDate <= '"+end+"'");
+            dt = OtherMySqlConn.dtable("select Sum(HelpDirectDebitTradeAmt),Sum(HelpDirectDebitCapTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='self' and UserId= '" + ParentId + "'" + con);
             if (dt.Rows.Count > 0)
             {
                 JAmtfc = Convert.ToDecimal(function.CheckNum(dt.Rows[0][0].ToString())) - Convert.ToDecimal(function.CheckNum(dt.Rows[0][1].ToString()));
             }
-            dt = OtherMySqlConn.dtable("select Sum(HelpDirectDebitCapTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='self' and UserId= '"+ParentId+"' and TradeDate >= '"+start+"' and TradeDate <= '"+end+"'");
+            dt = OtherMySqlConn.dtable("select Sum(HelpDirectDebitCapTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='self' and UserId= '" + ParentId + "'" + con);
             if (dt.Rows.Count > 0)
             {
                 JfAmtfc = Convert.ToDecimal(function.CheckNum(dt.Rows[0][0].ToString()));
             }
-            dt = OtherMySqlConn.dtable("select Sum(HelpDirectDebitCapNum) from TradeDaySummary where QueryCount=0 and SeoTitle='self' and UserId= '"+ParentId+"' and TradeDate >= '"+start+"' and TradeDate <= '"+end+"'");
+            dt = OtherMySqlConn.dtable("select Sum(HelpDirectDebitCapNum) from TradeDaySummary where QueryCount=0 and SeoTitle='self' and UserId= '" + ParentId + "'" + con);
             if (dt.Rows.Count > 0)
             {
                 JCountfc = Convert.ToInt32(function.CheckInt(dt.Rows[0][0].ToString()));
             }
-            dt = OtherMySqlConn.dtable("select Sum(HelpNonDirectTradeAmt) from TradeDaySummary where QueryCount=1 and SeoTitle='self' and UserId= '"+ParentId+"' and TradeDate >= '"+start+"' and TradeDate <= '"+end+"'");
+            dt = OtherMySqlConn.dtable("select Sum(HelpDirectTradeAmt) from TradeDaySummary where QueryCount=1 and SeoTitle='self' and UserId= '" + ParentId + "'" + con);
             if (dt.Rows.Count > 0)
             {
                 YAmtfc = Convert.ToDecimal(function.CheckNum(dt.Rows[0][0].ToString()));
             }
 
-            dt = OtherMySqlConn.dtable("select Sum(NotHelpNonDirectTradeAmt + NotHelpNonDirectDebitTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='self' and UserId= '"+ParentId+"' and TradeDate >= '"+start+"' and TradeDate <= '"+end+"'");
+            dt = OtherMySqlConn.dtable("select Sum(NotHelpDirectTradeAmt + NotHelpDirectDebitTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='self' and UserId= '" + ParentId + "'" + con);
             if (dt.Rows.Count > 0)
             {
                 TotalAmtwd = Convert.ToDecimal(function.CheckNum(dt.Rows[0][0].ToString()));
             }
-            dt = OtherMySqlConn.dtable("select Sum(NotHelpNonDirectTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='self' and UserId= '"+ParentId+"' and TradeDate >= '"+start+"' and TradeDate <= '"+end+"'");
+            dt = OtherMySqlConn.dtable("select Sum(NotHelpDirectTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='self' and UserId= '" + ParentId + "'" + con);
             if (dt.Rows.Count > 0)
             {
                 DAmtwd = Convert.ToDecimal(function.CheckNum(dt.Rows[0][0].ToString()));
             }
-            dt = OtherMySqlConn.dtable("select Sum(NotHelpNonDirectDebitTradeAmt),Sum(NotHelpDirectDebitCapTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='self' and UserId= '"+ParentId+"' and TradeDate >= '"+start+"' and TradeDate <= '"+end+"'");
+            dt = OtherMySqlConn.dtable("select Sum(NotHelpDirectDebitTradeAmt),Sum(NotHelpDirectDebitCapTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='self' and UserId= '" + ParentId + "'" + con);
             if (dt.Rows.Count > 0)
             {
                 JAmtwd = Convert.ToDecimal(function.CheckNum(dt.Rows[0][0].ToString())) - Convert.ToDecimal(function.CheckNum(dt.Rows[0][1].ToString()));
             }
-            dt = OtherMySqlConn.dtable("select Sum(NotHelpDirectDebitCapTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='self' and UserId= '"+ParentId+"' and TradeDate >= '"+start+"' and TradeDate <= '"+end+"'");
+            dt = OtherMySqlConn.dtable("select Sum(NotHelpDirectDebitCapTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='self' and UserId= '" + ParentId + "'" + con);
             if (dt.Rows.Count > 0)
             {
                 JfAmtwd = Convert.ToDecimal(function.CheckNum(dt.Rows[0][0].ToString()));
             }
-            dt = OtherMySqlConn.dtable("select Sum(NotHelpDirectDebitCapNum) from TradeDaySummary where QueryCount=0 and SeoTitle='self' and UserId= '"+ParentId+"' and TradeDate >= '"+start+"' and TradeDate <= '"+end+"'");
+            dt = OtherMySqlConn.dtable("select Sum(NotHelpDirectDebitCapNum) from TradeDaySummary where QueryCount=0 and SeoTitle='self' and UserId= '" + ParentId + "'" + con);
             if (dt.Rows.Count > 0)
             {
                 JCountwd = Convert.ToInt32(function.CheckInt(dt.Rows[0][0].ToString()));
             }
-            dt = OtherMySqlConn.dtable("select Sum(NotHelpNonDirectTradeAmt) from TradeDaySummary where QueryCount=1 and SeoTitle='self' and UserId= '"+ParentId+"' and TradeDate >= '"+start+"' and TradeDate <= '"+end+"'");
+            dt = OtherMySqlConn.dtable("select Sum(NotHelpDirectTradeAmt) from TradeDaySummary where QueryCount=1 and SeoTitle='self' and UserId= '" + ParentId + "'" + con);
             if (dt.Rows.Count > 0)
             {
                 YAmtwd = Convert.ToDecimal(function.CheckNum(dt.Rows[0][0].ToString()));
@@ -1468,63 +1585,63 @@ namespace MySystem.Areas.Admin.Controllers
 
             WebCMSEntities db = new WebCMSEntities();
             Dictionary<string, object> obj = new Dictionary<string, object>();
-            DataTable dt = OtherMySqlConn.dtable("select Sum(HelpNonDirectTradeAmt + HelpNonDirectDebitTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='team'"+ condition);
+            DataTable dt = OtherMySqlConn.dtable("select Sum(HelpNonDirectTradeAmt + HelpNonDirectDebitTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='team'" + condition);
             if (dt.Rows.Count > 0)
             {
                 TotalAmtfc = Convert.ToDecimal(function.CheckNum(dt.Rows[0][0].ToString()));
             }
-            dt = OtherMySqlConn.dtable("select Sum(HelpNonDirectTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='team'"+ condition);
+            dt = OtherMySqlConn.dtable("select Sum(HelpNonDirectTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='team'" + condition);
             if (dt.Rows.Count > 0)
             {
                 DAmtfc = Convert.ToDecimal(function.CheckNum(dt.Rows[0][0].ToString()));
             }
-            dt = OtherMySqlConn.dtable("select Sum(HelpNonDirectDebitTradeAmt),Sum(HelpDirectDebitCapTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='team'"+ condition);
+            dt = OtherMySqlConn.dtable("select Sum(HelpNonDirectDebitTradeAmt),Sum(HelpDirectDebitCapTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='team'" + condition);
             if (dt.Rows.Count > 0)
             {
                 JAmtfc = Convert.ToDecimal(function.CheckNum(dt.Rows[0][0].ToString())) - Convert.ToDecimal(function.CheckNum(dt.Rows[0][1].ToString()));
             }
-            dt = OtherMySqlConn.dtable("select Sum(HelpDirectDebitCapTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='team'"+ condition);
+            dt = OtherMySqlConn.dtable("select Sum(HelpDirectDebitCapTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='team'" + condition);
             if (dt.Rows.Count > 0)
             {
                 JfAmtfc = Convert.ToDecimal(function.CheckNum(dt.Rows[0][0].ToString()));
             }
-            dt = OtherMySqlConn.dtable("select Sum(HelpDirectDebitCapNum) from TradeDaySummary where QueryCount=0 and SeoTitle='team'"+ condition);
+            dt = OtherMySqlConn.dtable("select Sum(HelpDirectDebitCapNum) from TradeDaySummary where QueryCount=0 and SeoTitle='team'" + condition);
             if (dt.Rows.Count > 0)
             {
                 JCountfc = Convert.ToInt32(function.CheckInt(dt.Rows[0][0].ToString()));
             }
-            dt = OtherMySqlConn.dtable("select Sum(HelpNonDirectTradeAmt) from TradeDaySummary where QueryCount=1 and SeoTitle='team'"+ condition);
+            dt = OtherMySqlConn.dtable("select Sum(HelpNonDirectTradeAmt) from TradeDaySummary where QueryCount=1 and SeoTitle='team'" + condition);
             if (dt.Rows.Count > 0)
             {
                 YAmtfc = Convert.ToDecimal(function.CheckNum(dt.Rows[0][0].ToString()));
             }
 
-            dt = OtherMySqlConn.dtable("select Sum(NotHelpNonDirectTradeAmt + NotHelpNonDirectDebitTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='team'"+ condition);
+            dt = OtherMySqlConn.dtable("select Sum(NotHelpNonDirectTradeAmt + NotHelpNonDirectDebitTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='team'" + condition);
             if (dt.Rows.Count > 0)
             {
                 TotalAmtwd = Convert.ToDecimal(function.CheckNum(dt.Rows[0][0].ToString()));
             }
-            dt = OtherMySqlConn.dtable("select Sum(NotHelpNonDirectTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='team'"+ condition);
+            dt = OtherMySqlConn.dtable("select Sum(NotHelpNonDirectTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='team'" + condition);
             if (dt.Rows.Count > 0)
             {
                 DAmtwd = Convert.ToDecimal(function.CheckNum(dt.Rows[0][0].ToString()));
             }
-            dt = OtherMySqlConn.dtable("select Sum(NotHelpNonDirectDebitTradeAmt),Sum(NotHelpDirectDebitCapTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='team'"+ condition);
+            dt = OtherMySqlConn.dtable("select Sum(NotHelpNonDirectDebitTradeAmt),Sum(NotHelpDirectDebitCapTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='team'" + condition);
             if (dt.Rows.Count > 0)
             {
                 JAmtwd = Convert.ToDecimal(function.CheckNum(dt.Rows[0][0].ToString())) - Convert.ToDecimal(function.CheckNum(dt.Rows[0][1].ToString()));
             }
-            dt = OtherMySqlConn.dtable("select Sum(NotHelpDirectDebitCapTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='team'"+ condition);
+            dt = OtherMySqlConn.dtable("select Sum(NotHelpDirectDebitCapTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='team'" + condition);
             if (dt.Rows.Count > 0)
             {
                 JfAmtwd = Convert.ToDecimal(function.CheckNum(dt.Rows[0][0].ToString()));
             }
-            dt = OtherMySqlConn.dtable("select Sum(NotHelpDirectDebitCapNum) from TradeDaySummary where QueryCount=0 and SeoTitle='team'"+ condition);
+            dt = OtherMySqlConn.dtable("select Sum(NotHelpDirectDebitCapNum) from TradeDaySummary where QueryCount=0 and SeoTitle='team'" + condition);
             if (dt.Rows.Count > 0)
             {
                 JCountwd = Convert.ToInt32(function.CheckInt(dt.Rows[0][0].ToString()));
             }
-            dt = OtherMySqlConn.dtable("select Sum(NotHelpNonDirectTradeAmt) from TradeDaySummary where QueryCount=1 and SeoTitle='team'"+ condition);
+            dt = OtherMySqlConn.dtable("select Sum(NotHelpNonDirectTradeAmt) from TradeDaySummary where QueryCount=1 and SeoTitle='team'" + condition);
             if (dt.Rows.Count > 0)
             {
                 YAmtwd = Convert.ToDecimal(function.CheckNum(dt.Rows[0][0].ToString()));

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

@@ -35,7 +35,7 @@
                     </ul>
                     <div class="layui-tab-content mt20">
                         <div class="layui-tab-item layui-show">
-                            <div class="layui-form-item">
+                            @* <div class="layui-form-item">
                                 <label class="layui-form-label">*担保人</label>
                                 <div class="layui-input-inline">
                                     <input class="layui-input" type="text" id="FromUserId" name="FromUserId" value="@editData.FromUserId"
@@ -49,7 +49,7 @@
                                     <input class="layui-input" type="text" id="ToUserId" name="ToUserId" maxlength="30" value="@editData.ToUserId"
                                          lay-verify="required|" autocomplete="off" placeholder="请输入被担保人创客编码">
                                 </div>
-                            </div>
+                            </div> *@
                             <div class="layui-form-item">
                                 <label class="layui-form-label">*担保金额</label>
                                 <div class="layui-input-inline">

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

@@ -115,11 +115,7 @@
                     }
                     @if (RightInfo.Contains("," + right + "_delete,"))
                     {
-                            <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del"><i class="layui-icon layui-icon-delete"></i>删除</a>
-                    }
-                    @if (RightInfo.Contains("," + right + "_edit,"))
-                    {
-
+                            <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del"><i class="layui-icon layui-icon-delete"></i>清空担保额</a>
                     }
                 </script>
             </div>

Areas/Admin/Views/MainServer/SysTools/ChangeSignQuan.cshtml

@@ -34,11 +34,7 @@
                                     <label class="layui-form-label">机具券</label>
                                     <div class="layui-input-block">
                                         <textarea class="layui-textarea" lay-verify="required|" name="OldSn" id="OldSn"
-<<<<<<< HEAD
-                                            placeholder="请输入原机具SN,多个SN用回车隔开"></textarea>
-=======
                                             placeholder="请输入机具SN,多个SN用回车隔开"></textarea>
->>>>>>> DuGuYangDo
                                     </div>
                                 </div>
                                 <div class="layui-form-item">

Areas/Admin/Views/MainServer/SysTools/ChangeSignSn.cshtml

@@ -34,11 +34,7 @@
                                     <label class="layui-form-label">机具SN</label>
                                     <div class="layui-input-block">
                                         <textarea class="layui-textarea" lay-verify="required|" name="OldSn" id="OldSn"
-<<<<<<< HEAD
-                                            placeholder="请输入原机具SN,多个SN用回车隔开"></textarea>
-=======
                                             placeholder="请输入机具SN,多个SN用回车隔开"></textarea>
->>>>>>> DuGuYangDo
                                     </div>
                                 </div>
                                 <div class="layui-form-item">

Areas/Admin/Views/MainServer/SysTools/Loop.cshtml

@@ -11,33 +11,40 @@
 }
 <!DOCTYPE html>
 <html>
+
 <head>
     <meta charset="utf-8">
     <title>循环机查询</title>
     <meta name="renderer" content="webkit">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <meta name="viewport"
+        content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
     <link rel="stylesheet" href="/layuiadmin/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="/layuiadmin/style/admin.css" media="all">
     <script src="/admin/js/jquery-1.10.1.min.js"></script>
     <style>
-        .layui-input-inline{
+        .layui-input-inline {
             width: 175px !important;
         }
-        .layui-form-label{
+
+        .layui-form-label {
             width: 85px !important;
         }
-        .layui-inline{
+
+        .layui-inline {
             margin-right: 0px !important;
         }
-        .w100{
+
+        .w100 {
             width: 100px !important;
         }
-        .ml50{
+
+        .ml50 {
             margin-left: 50px !important;
         }
     </style>
 </head>
+
 <body>
     <div class="layui-fluid">
         <div class="layui-card">
@@ -47,21 +54,13 @@
                         <div class="layui-inline">
                             <label class="layui-form-label">来源机具SN</label>
                             <div class="layui-input-inline">
-<<<<<<< HEAD
                                 <input class="layui-input" type="text" name="ComeSn" id="ComeSn" autocomplete="off">
-=======
-                                <input class="layui-input" type="text" name="SwapSnExpand" id="SwapSnExpand" autocomplete="off">
->>>>>>> DuGuYangDo
                             </div>
                         </div>
                         <div class="layui-inline">
                             <label class="layui-form-label">发货机具SN</label>
                             <div class="layui-input-inline">
-<<<<<<< HEAD
                                 <input class="layui-input" type="text" name="SendSn" id="SendSn" autocomplete="off">
-=======
-                                <input class="layui-input" type="text" name="SnNos" id="SnNos" autocomplete="off">
->>>>>>> DuGuYangDo
                             </div>
                         </div>
                     </div>
@@ -69,19 +68,13 @@
             </div>
 
             <div class="layui-card-body">
-<<<<<<< HEAD
-                <table id="LAY-list-manage" lay-filter="LAY-list-manage"></table>
-                <script type="text/html" id="MakerCodeTpl">
-=======
-
                 <table id="LAY-list-manage" lay-filter="LAY-list-manage"></table>
                 <script type="text/html" id="imgTpl">
                     <img style="display: inline-block; width: 50%; height: 100%;" src={{ d.avatar }}>
                 </script>
                 <script type="text/html" id="Loop">
->>>>>>> DuGuYangDo
-                    <a lay-href="/Admin/SysTools/Loop?right=@right&SwapSnExpand=@("{{d.SnNos}}")" lay-text="发货机信息" style="color: #428bca;">{{d.SwapSnExpand}}</a>
-                    <a lay-href="/Admin/SysTools/Loop?right=@right&SnNos=@("{{d.SwapSnExpand}}")" lay-text="申请机信息" style="color: #428bca;">{{d.SnNos}}</a>
+                    <a lay-href="/Admin/SysTools/Index?right=@right&SwapSnExpand=@("{{d.SnNos}}")" lay-text="发货机信息" style="color: #428bca;">{{d.SwapSnExpand}}</a>
+                    <a lay-href="/Admin/SysTools/Index?right=@right&SnNos=@("{{d.SwapSnExpand}}")" lay-text="申请机信息" style="color: #428bca;">{{d.SnNos}}</a>
                 </script>
             </div>
         </div>
@@ -90,4 +83,5 @@
     <script src="/layuiadmin/layui/layui.js"></script>
     <script src="/layuiadmin/modules_main/SysTools_Admin.js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
 </body>
+
 </html>

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

@@ -81,6 +81,7 @@
                                 <option value="">全部...</option>
                                 <option value="1">消费代付</option>
                                 <option value="2">用户提现</option>
+                                <option value="3">盟主提现</option>
                             </select>
                         </div>
                     </div>

Areas/Admin/Views/MainServer/Users/Children.cshtml

@@ -91,8 +91,10 @@
 
             <div class="layui-card-body">
                 <blockquote class="layui-elem-quote layui-text">
+                    个人交易额：
+                    </br>
                     刷卡交易总额(扶)(元)：<span style="color: #f00;" id="TotalAmtfc">0.00</span>　| 贷记卡交易额(扶)(元)：<span style="color: #f00;" id="DAmtfc">0.00</span>　|　借记卡非封顶交易额(扶)(元)：<span style="color: #f00;" id="JAmtfc">0.00</span>　|　借记卡封顶交易额(扶)(元)：<span style="color: #f00;" id="JfAmtfc">0.00</span>　|　借记卡交易笔数(扶)(元)：<span style="color: #f00;" id="JCountfc">0.00</span>　|　云闪付小额交易额(扶)(元)：<span style="color: #f00;" id="YAmtfc">0.00</span>
-                    <br>
+                    </br>
                     刷卡交易总额(稳)(元)：<span style="color: #f00;" id="TotalAmtwd">0.00</span>　| 贷记卡交易额(稳)(元)：<span style="color: #f00;" id="DAmtwd">0.00</span>　|　借记卡非封顶交易额(稳)(元)：<span style="color: #f00;" id="JAmtwd">0.00</span>　|　借记卡封顶交易额(稳)(元)：<span style="color: #f00;" id="JfAmtwd">0.00</span>　|　借记卡交易笔数(稳)(元)：<span style="color: #f00;" id="JCountwd">0.00</span>　|　云闪付小额交易额(稳)(元)：<span style="color: #f00;" id="YAmtwd">0.00</span>
                 </blockquote>
                 <table id="LAY-list-manage" lay-filter="LAY-list-manage"></table>

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

@@ -202,6 +202,8 @@
                     @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="ExportZSExcel"><i class="layui-icon layui-icon-export layuiadmin-button-btn"></i>导出直属创客</button>
+                        <button class="layui-btn" data-type="ExportSJExcel"><i class="layui-icon layui-icon-export layuiadmin-button-btn"></i>导出上级创客</button>
                     }
                     @if (RightInfo.Contains("," + right + "_import,"))
                     {

Models/BackEndOpRecord.cs

@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models
+{
+    public partial class BackEndOpRecord
+    {
+        public int Id { get; set; }
+        public int Sort { get; set; }
+        public int QueryCount { get; set; }
+        public int Status { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public string SeoTitle { get; set; }
+        public string SeoKeyword { get; set; }
+        public string SeoDescription { get; set; }
+        public string Remark { get; set; }
+        public string AfterData { get; set; }
+        public string BeforeData { get; set; }
+        public string TableEnName { get; set; }
+        public string TableChName { get; set; }
+        public string SysRealName { get; set; }
+        public string SysUserName { get; set; }
+    }
+}

Models/LeaderAccountRecord.cs

@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models
+{
+    public partial class LeaderAccountRecord
+    {
+        public int Id { get; set; }
+        public int Sort { get; set; }
+        public int QueryCount { get; set; }
+        public int Status { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public string SeoTitle { get; set; }
+        public string SeoKeyword { get; set; }
+        public string SeoDescription { get; set; }
+        public string TransRecordNo { get; set; }
+        public string Remark { get; set; }
+        public decimal AfterBalanceAmount { get; set; }
+        public decimal BeforeBalanceAmount { get; set; }
+        public decimal AfterFreezeAmount { get; set; }
+        public decimal BeforeFreezeAmount { get; set; }
+        public decimal AfterTotalAmount { get; set; }
+        public decimal BeforeTotalAmount { get; set; }
+        public decimal ChangeAmount { get; set; }
+        public int ProductType { get; set; }
+        public int ChangeType { get; set; }
+        public int UserId { get; set; }
+    }
+}

Models/UserAccount.cs

@@ -36,5 +36,6 @@ namespace MySystem.Models
         public decimal FixedAmount { get; set; }
         public decimal LeaderReserve { get; set; }
         public decimal ValidAmount { get; set; }
+        public decimal LeaderBalanceAmount { get; set; }
     }
 }

Models/Users.cs

@@ -85,5 +85,6 @@ namespace MySystem.Models
         public int LeaderLevel { get; set; }
         public decimal ValidAmount { get; set; }
         public int BusinessFlag { get; set; }
+        public string DeviceType { get; set; }
     }
 }

Models/WebCMSEntities.cs

@@ -28,6 +28,7 @@ namespace MySystem.Models
         public virtual DbSet<AppVersion> AppVersion { get; set; }
         public virtual DbSet<AppVideo> AppVideo { get; set; }
         public virtual DbSet<AppVideoList> AppVideoList { get; set; }
+        public virtual DbSet<BackEndOpRecord> BackEndOpRecord { get; set; }
         public virtual DbSet<BankInfo> BankInfo { get; set; }
         public virtual DbSet<BusinessActSummary> BusinessActSummary { get; set; }
         public virtual DbSet<BusinessPartner> BusinessPartner { get; set; }
@@ -53,6 +54,7 @@ namespace MySystem.Models
         public virtual DbSet<KqProductOrgs> KqProductOrgs { get; set; }
         public virtual DbSet<KqProductRuleSet> KqProductRuleSet { get; set; }
         public virtual DbSet<KqProducts> KqProducts { get; set; }
+        public virtual DbSet<LeaderAccountRecord> LeaderAccountRecord { get; set; }
         public virtual DbSet<LeaderReserveRecord> LeaderReserveRecord { get; set; }
         public virtual DbSet<MachineApply> MachineApply { get; set; }
         public virtual DbSet<MachineApplyDetail> MachineApplyDetail { get; set; }
@@ -644,6 +646,9 @@ namespace MySystem.Models
 
             modelBuilder.Entity<ActivityRedPackageStock>(entity =>
             {
+                entity.HasIndex(e => new { e.UserId, e.ActivityDate })
+                    .HasName("ActivityRedPackageStockIndex");
+
                 entity.Property(e => e.Id).HasColumnType("int(11)");
 
                 entity.Property(e => e.ActivityDate)
@@ -1145,6 +1150,71 @@ namespace MySystem.Models
                     .HasCollation("utf8_general_ci");
             });
 
+            modelBuilder.Entity<BackEndOpRecord>(entity =>
+            {
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.AfterData)
+                    .HasColumnType("mediumtext")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.BeforeData)
+                    .HasColumnType("mediumtext")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.CreateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.QueryCount).HasColumnType("int(11)");
+
+                entity.Property(e => e.Remark)
+                    .HasColumnType("varchar(200)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoDescription)
+                    .HasColumnType("varchar(500)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoKeyword)
+                    .HasColumnType("varchar(200)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoTitle)
+                    .HasColumnType("varchar(100)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Sort).HasColumnType("int(11)");
+
+                entity.Property(e => e.Status).HasColumnType("int(11)");
+
+                entity.Property(e => e.SysRealName)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SysUserName)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.TableChName)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.TableEnName)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.UpdateDate).HasColumnType("datetime");
+            });
+
             modelBuilder.Entity<BankInfo>(entity =>
             {
                 entity.Property(e => e.Id).HasColumnType("int(11)");
@@ -2903,6 +2973,66 @@ namespace MySystem.Models
                 entity.Property(e => e.Version).HasColumnType("int(11)");
             });
 
+            modelBuilder.Entity<LeaderAccountRecord>(entity =>
+            {
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.AfterBalanceAmount).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.AfterFreezeAmount).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.AfterTotalAmount).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.BeforeBalanceAmount).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.BeforeFreezeAmount).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.BeforeTotalAmount).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.ChangeAmount).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.ChangeType).HasColumnType("int(11)");
+
+                entity.Property(e => e.CreateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.ProductType).HasColumnType("int(11)");
+
+                entity.Property(e => e.QueryCount).HasColumnType("int(11)");
+
+                entity.Property(e => e.Remark)
+                    .HasColumnType("varchar(64)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoDescription)
+                    .HasColumnType("varchar(500)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoKeyword)
+                    .HasColumnType("varchar(200)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoTitle)
+                    .HasColumnType("varchar(100)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Sort).HasColumnType("int(11)");
+
+                entity.Property(e => e.Status).HasColumnType("int(11)");
+
+                entity.Property(e => e.TransRecordNo)
+                    .HasColumnType("varchar(32)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.UpdateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.UserId).HasColumnType("int(11)");
+            });
+
             modelBuilder.Entity<LeaderReserveRecord>(entity =>
             {
                 entity.Property(e => e.Id).HasColumnType("int(11)");
@@ -12351,6 +12481,8 @@ namespace MySystem.Models
 
                 entity.Property(e => e.FreezeAmount).HasColumnType("decimal(18,2)");
 
+                entity.Property(e => e.LeaderBalanceAmount).HasColumnType("decimal(18,2)");
+
                 entity.Property(e => e.LeaderReserve).HasColumnType("decimal(18,2)");
 
                 entity.Property(e => e.LockStatus).HasColumnType("int(11)");
@@ -15029,6 +15161,11 @@ namespace MySystem.Models
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.DeviceType)
+                    .HasColumnType("varchar(30)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
                 entity.Property(e => e.ExpiredDate).HasColumnType("datetime");
 
                 entity.Property(e => e.GroupId)

wwwroot/layuiadmin/modules_main/StoreHouseAmountPromiss_Admin.js

@@ -98,8 +98,7 @@ layui.config({
             , { field: 'ToUserIdMakerCode', width: 200, title: '担保对象创客编号', sort: true }
             , { field: 'ToUserIdRealName', width: 200, title: '担保对象真实姓名', sort: true }
             , { field: 'PromissAmount', width: 200, title: '担保金额', sort: true }
-
-            , { field: 'Sort', fixed: 'right', title: '排序', width: 80, edit: 'text' }
+            , { field: 'StatusName', width: 80, title: '状态',  sort: true }
             , { title: '操作', align: 'center', fixed: 'right', toolbar: '#table-list-tools' }
         ]]
         , where: {
@@ -118,7 +117,7 @@ layui.config({
     table.on('tool(LAY-list-manage)', function (obj) {
         var data = obj.data;
         if (obj.event === 'del') {
-            var index = layer.confirm('确定要删除吗？删除后不能恢复！', function (index) {
+            var index = layer.confirm('确定要清空担保额？清空后不能恢复！', function (index) {
                 $.ajax({
                     type: "POST",
                     url: "/Admin/StoreHouseAmountPromiss/Delete?r=" + Math.random(1),

wwwroot/layuiadmin/modules_main/StoreHouse_Admin.js

@@ -234,7 +234,7 @@ layui.config({
                 sort: true
             }, {
                 title: '操作',
-                width: 200,
+                width: 300,
                 align: 'center',
                 fixed: 'right',
                 toolbar: '#table-list-tools'

wwwroot/layuiadmin/modules_main/SysTools_Admin.js

@@ -8,13 +8,8 @@ table.render({
         , { field: 'OrderNo', width: 200, title: '订单号', sort: true }
         , { field: 'MakerCode', width: 200, title: '创客编号', sort: true }
         , { field: 'RealName', width: 200, title: '创客姓名', sort: true }
-<<<<<<< HEAD
-        , { field: 'ComeSn', width: 200, title: '来源机具SN', sort: true, templet: '#MakerCodeTpl' }
-        , { field: 'SendSn', width: 200, title: '发货SN', sort: true, templet: '#MakerCodeTpl' }
-=======
         , { field: 'ComeSn', width: 200, title: '来源机具SN', sort: true, templet: '#Loop' }
         , { field: 'SendSn', width: 200, title: '发货SN', sort: true, templet: '#Loop' }
->>>>>>> DuGuYangDo
         , { field: 'CreateDate', width: 200, title: '申请时间', sort: true }
         , { field: 'Status', width: 200, title: '申请状态', sort: true }
         , { title: '操作', width: 1500, align: 'left', toolbar: '#table-list-tools' }

wwwroot/layuiadmin/modules_main/Users_Admin.js

@@ -789,6 +789,44 @@ layui.config({
                 }
             });
         }
+        , ExportZSExcel: 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/Users/ExportZSExcel?r=" + Math.random(1),
+                data: userdata,
+                dataType: "json",
+                success: function (data) {
+                    data.Obj.unshift(data.Fields);
+                    excel.exportExcel(data.Obj, data.Info, 'xlsx');
+                }
+            });
+        }
+        , ExportSJExcel: 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/Users/ExportSJExcel?r=" + Math.random(1),
+                data: userdata,
+                dataType: "json",
+                success: function (data) {
+                    data.Obj.unshift(data.Fields);
+                    excel.exportExcel(data.Obj, data.Info, 'xlsx');
+                }
+            });
+        }
         , ThreeElement: function () {
             var perContent = layer.open({
                 type: 2