盟主及运营中心增加是否对公标记功能

Areas/Admin/Controllers/MainServer/LeadersController.cs

@@ -140,6 +140,8 @@ namespace MySystem.Areas.Admin.Controllers
                 if (LeaderLevel == 2) dic["LeaderLevel"] = "大盟主";
                 if (LeaderLevel == 0) dic["LeaderLevel"] = "";
 
+                //对公标记
+                dic["BusinessFlag"] = dic["BusinessFlag"].ToString() == "1" ? "是" : "否";
             }
             return Json(obj);
         }
@@ -234,6 +236,7 @@ namespace MySystem.Areas.Admin.Controllers
                     user.LeaderLevel = data.LeaderLevel;
                     Fields.Add("UserId", userForMakerCode.UserId); //创客
                     Fields.Add("LeaderLevel", data.LeaderLevel); //盟主等级
+                    Fields.Add("BusinessFlag", data.BusinessFlag);
                     Fields.Add("SeoKeyword", data.SeoKeyword);
                     new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("Leaders", Fields, data.Id);
                     var leader = db.Leaders.FirstOrDefault(m => m.Id == data.Id) ?? new Leaders();

Areas/Admin/Controllers/MainServer/UserCashRecordController.cs

@@ -882,6 +882,10 @@ namespace MySystem.Areas.Admin.Controllers
                 int QueryCount = int.Parse(dic["QueryCount"].ToString());
                 if (QueryCount == 0) dic["LockName"] = "待提交";
                 if (QueryCount == 1) dic["LockName"] = "已提交";
+                
+                Leaders leader = db.Leaders.FirstOrDefault(m => m.Id == UserId) ?? new Leaders();
+                //对公标记
+                dic.Add("BusinessFlag", leader.BusinessFlag == 1 ? "是" : "否");
             }
             Dictionary<string, object> other = new Dictionary<string, object>();
 

Areas/Admin/Controllers/OperateServer/SysAdminOperateController.cs

@@ -172,6 +172,8 @@ namespace MySystem.Areas.Admin.Controllers
                 //提现中金额
                 dic["WithdrawingAmount"] = userAccount.WithdrawingAmount;
 
+                //对公标记
+                dic["BusinessFlag"] = dic["BusinessFlag"].ToString() == "1" ? "是" : "否";
             }
             return Json(obj);
         }
@@ -235,7 +237,8 @@ namespace MySystem.Areas.Admin.Controllers
                     Fields.Add("ReturnFlag", data.ReturnFlag); //返还标记
                     Fields.Add("ReturnAmount", data.ReturnAmount); //返还金额
                     Fields.Add("QueryCount", 1); //是否为主账号(1是，0否)
-                    Fields.Add("ExpireDate", DateTime.Now.AddMonths(12)); //过期时间
+                    Fields.Add("ExpireDate", DateTime.Now.AddMonths(12)); //过期时间                    
+                    Fields.Add("BusinessFlag", data.BusinessFlag);
 
                     int Id = new AdminContentByConn(_accessor.HttpContext, PublicFunction.OpTables, OpConn).Add("SysAdmin", Fields, 0);
                     SysAdmin edit = opdb.SysAdmin.FirstOrDefault(m => m.Id == Id);
@@ -401,6 +404,7 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("RealName", data.RealName); //运营中心名称
             Fields.Add("FilePath", data.FilePath); //附件
             Fields.Add("AdminName", data.AdminName); //用户名
+            Fields.Add("BusinessFlag", data.BusinessFlag);
             if (!string.IsNullOrEmpty(data.Password)) //密码不为空就修改密码，否则不操作
             {
                 var sys = opdb.SysAdmin.FirstOrDefault(m => m.Id == data.Id);

Areas/Admin/Controllers/OperateServer/UserCashRecordOperateController.cs

@@ -154,6 +154,9 @@ namespace MySystem.Areas.Admin.Controllers
                 int QueryCount = int.Parse(dic["QueryCount"].ToString());
                 if (QueryCount == 0) dic["LockName"] = "待提交";
                 if (QueryCount == 1) dic["LockName"] = "已提交";
+
+                //对公标记
+                dic.Add("BusinessFlag", sysAdmin.BusinessFlag == 1 ? "是" : "否");
             }
             Dictionary<string, object> other = new Dictionary<string, object>();
 

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

@@ -54,6 +54,12 @@
                                     <script>$("#LeaderLevel").val("@editData.LeaderLevel");</script>
                                 </div>
                             </div>
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">是否对公</label>
+                                <div class="layui-input-inline">
+                                    <input type="checkbox" id="BusinessFlag" name="BusinessFlag" value="1" @(editData.BusinessFlag == 1 ?  "checked=checked" : "") lay-skin="switch" lay-filter="switchTest" title="开关">
+                                </div>
+                            </div>
                             <div class="layui-form-item">
                                 <label class="layui-form-label">附件</label>
                                 <div class="layui-input-block">

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

@@ -131,6 +131,12 @@
                                         lay-verify="required|" autocomplete="off" placeholder="请输入仓库地址">
                                 </div>
                             </div>
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">是否对公</label>
+                                <div class="layui-input-inline">
+                                    <input type="checkbox" id="BusinessFlag" name="BusinessFlag" value="1" lay-skin="switch" lay-filter="switchTest" title="开关">
+                                </div>
+                            </div>
                             <div class="layui-form-item">
                                 <label class="layui-form-label">用户名</label>
                                 <div class="layui-input-inline">

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

@@ -99,6 +99,12 @@
                                         </div>
                                     </div>
                                 </div>
+                                <div class="layui-form-item">
+                                    <label class="layui-form-label">是否对公</label>
+                                    <div class="layui-input-inline">
+                                        <input type="checkbox" id="BusinessFlag" name="BusinessFlag" value="1" @(editData.BusinessFlag == 1 ?  "checked=checked" : "") lay-skin="switch" lay-filter="switchTest" title="开关">
+                                    </div>
+                                </div>
                                 <div class="layui-form-item">
                                     <label class="layui-form-label">用户名</label>
                                     <div class="layui-input-inline">

Models/Leaders.cs

@@ -18,5 +18,6 @@ namespace MySystem.Models
         public int UserId { get; set; }
         public DateTime? ExpiredDate { get; set; }
         public DateTime? LastBuyDate { get; set; }
+        public int BusinessFlag { get; set; }
     }
 }

Models/PosMachineOther.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models
+{
+    public partial class PosMachineOther
+    {
+        public int Id { get; set; }
+        public string CustomerNo { get; set; }
+        public string LeMerNo { get; set; }
+        public string LeMerNo4 { get; set; }
+        public int LeMerchantId { get; set; }
+    }
+}

Models/TradeFilterRecord.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models
+{
+    public partial class TradeFilterRecord
+    {
+        public int Id { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public decimal IntercetpAmount { get; set; }
+        public DateTime? OrderDate { get; set; }
+        public string OrderNo { get; set; }
+        public int OrderId { get; set; }
+        public int PrizeUserId { get; set; }
+        public int OrderUserId { get; set; }
+        public int Kind { get; set; }
+    }
+}

Models/WebCMSEntities.cs

@@ -154,6 +154,7 @@ namespace MySystem.Models
         public virtual DbSet<PosCouponRecord> PosCouponRecord { get; set; }
         public virtual DbSet<PosCoupons> PosCoupons { get; set; }
         public virtual DbSet<PosFeeWarningRecord> PosFeeWarningRecord { get; set; }
+        public virtual DbSet<PosMachineOther> PosMachineOther { get; set; }
         public virtual DbSet<PosMachines> PosMachines { get; set; }
         public virtual DbSet<PosMachinesFeeChangeRecord> PosMachinesFeeChangeRecord { get; set; }
         public virtual DbSet<PosMachinesTwo> PosMachinesTwo { get; set; }
@@ -260,8 +261,8 @@ namespace MySystem.Models
         public virtual DbSet<TradeDaySummary2Before> TradeDaySummary2Before { get; set; }
         public virtual DbSet<TradeDaySummaryAfter> TradeDaySummaryAfter { get; set; }
         public virtual DbSet<TradeDaySummaryBefore> TradeDaySummaryBefore { get; set; }
+        public virtual DbSet<TradeFilterRecord> TradeFilterRecord { get; set; }
         public virtual DbSet<TradeRecord> TradeRecord { get; set; }
-        public virtual DbSet<TradeRecordTest> TradeRecordTest { get; set; }
         public virtual DbSet<UpUserRelation> UpUserRelation { get; set; }
         public virtual DbSet<UploadParams> UploadParams { get; set; }
         public virtual DbSet<UserAccount> UserAccount { get; set; }
@@ -5525,6 +5526,10 @@ namespace MySystem.Models
             {
                 entity.Property(e => e.Id).HasColumnType("int(11)");
 
+                entity.Property(e => e.BusinessFlag)
+                    .HasColumnType("int(11)")
+                    .HasComment("对公标记");
+
                 entity.Property(e => e.CreateDate).HasColumnType("datetime");
 
                 entity.Property(e => e.ExpiredDate).HasColumnType("datetime");
@@ -10487,6 +10492,37 @@ namespace MySystem.Models
                     .HasComment("版本号");
             });
 
+            modelBuilder.Entity<PosMachineOther>(entity =>
+            {
+                entity.HasComment("机具扩展表");
+
+                entity.Property(e => e.Id)
+                    .HasColumnType("int(11)")
+                    .HasComment("机具Id");
+
+                entity.Property(e => e.CustomerNo)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("客户号")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.LeMerNo)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("乐刷商编")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.LeMerNo4)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("四方商编")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.LeMerchantId)
+                    .HasColumnType("int(11)")
+                    .HasComment("商户Id");
+            });
+
             modelBuilder.Entity<PosMachines>(entity =>
             {
                 entity.Property(e => e.Id).HasColumnType("int(11)");
@@ -18281,125 +18317,56 @@ namespace MySystem.Models
                 entity.Property(e => e.VipFlag).HasColumnType("int(11)");
             });
 
-            modelBuilder.Entity<TradeRecord>(entity =>
+            modelBuilder.Entity<TradeFilterRecord>(entity =>
             {
-                entity.HasIndex(e => new { e.BrandId, e.UserId, e.MerchantId, e.MerNo, e.SnNo, e.CreateDate })
-                    .HasName("TradeRecordIndex");
+                entity.HasComment("训练营拦截记录");
 
                 entity.Property(e => e.Id).HasColumnType("int(11)");
 
-                entity.Property(e => e.ActStatus).HasColumnType("int(11)");
-
-                entity.Property(e => e.BankCardType).HasColumnType("int(11)");
-
-                entity.Property(e => e.BrandId).HasColumnType("int(11)");
-
-                entity.Property(e => e.CapFlag).HasColumnType("int(11)");
-
-                entity.Property(e => e.ClearDate).HasColumnType("datetime");
-
-                entity.Property(e => e.CreateDate).HasColumnType("datetime");
-
-                entity.Property(e => e.CreateMan)
-                    .HasColumnType("varchar(50)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.DirectFlag)
-                    .HasColumnType("bit(1)")
-                    .HasDefaultValueSql("b'0'");
-
-                entity.Property(e => e.HelpMonthCount).HasColumnType("int(11)");
-
-                entity.Property(e => e.MerBuddyType).HasColumnType("int(11)");
-
-                entity.Property(e => e.MerHelpFlag)
-                    .HasColumnType("bit(1)")
-                    .HasDefaultValueSql("b'0'");
-
-                entity.Property(e => e.MerNo)
-                    .HasColumnType("varchar(32)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.MerUserId).HasColumnType("int(11)");
-
-                entity.Property(e => e.MerchantId).HasColumnType("int(11)");
-
-                entity.Property(e => e.ParentNav)
-                    .HasColumnType("mediumtext")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.PayType).HasColumnType("int(11)");
-
-                entity.Property(e => e.QrPayFlag).HasColumnType("int(11)");
-
-                entity.Property(e => e.QueryCount).HasColumnType("int(11)");
-
-                entity.Property(e => e.RecordNo)
-                    .HasColumnType("varchar(50)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                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.SnNo)
-                    .HasColumnType("varchar(32)")
-                    .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.TopUserId).HasColumnType("int(11)");
+                entity.Property(e => e.CreateDate)
+                    .HasColumnType("datetime")
+                    .HasComment("创建时间");
 
-                entity.Property(e => e.TradeAmount).HasColumnType("decimal(18,2)");
+                entity.Property(e => e.IntercetpAmount)
+                    .HasColumnType("decimal(18,2)")
+                    .HasComment("拦截金额");
 
-                entity.Property(e => e.TradeDate).HasColumnType("datetime");
+                entity.Property(e => e.Kind)
+                    .HasColumnType("int(11)")
+                    .HasComment("类别");
 
-                entity.Property(e => e.TradeSerialNo)
-                    .HasColumnType("varchar(48)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
+                entity.Property(e => e.OrderDate)
+                    .HasColumnType("datetime")
+                    .HasComment("下单时间");
 
-                entity.Property(e => e.UpdateDate).HasColumnType("datetime");
+                entity.Property(e => e.OrderId)
+                    .HasColumnType("int(11)")
+                    .HasComment("订单");
 
-                entity.Property(e => e.UpdateMan)
+                entity.Property(e => e.OrderNo)
                     .HasColumnType("varchar(50)")
+                    .HasComment("订单号")
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
-                entity.Property(e => e.UserId).HasColumnType("int(11)");
-
-                entity.Property(e => e.Version).HasColumnType("int(11)");
+                entity.Property(e => e.OrderUserId)
+                    .HasColumnType("int(11)")
+                    .HasComment("下单人");
 
-                entity.Property(e => e.VipFlag).HasColumnType("int(11)");
+                entity.Property(e => e.PrizeUserId)
+                    .HasColumnType("int(11)")
+                    .HasComment("拦截奖励人");
             });
 
-            modelBuilder.Entity<TradeRecordTest>(entity =>
+            modelBuilder.Entity<TradeRecord>(entity =>
             {
+                entity.HasIndex(e => new { e.BrandId, e.UserId, e.MerchantId, e.MerNo, e.SnNo, e.CreateDate })
+                    .HasName("TradeRecordIndex");
+
                 entity.Property(e => e.Id).HasColumnType("int(11)");
 
+                entity.Property(e => e.ActStatus).HasColumnType("int(11)");
+
                 entity.Property(e => e.BankCardType).HasColumnType("int(11)");
 
                 entity.Property(e => e.BrandId).HasColumnType("int(11)");
@@ -18436,12 +18403,19 @@ namespace MySystem.Models
 
                 entity.Property(e => e.MerchantId).HasColumnType("int(11)");
 
+                entity.Property(e => e.ParentNav)
+                    .HasColumnType("mediumtext")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.PayType).HasColumnType("int(11)");
+
                 entity.Property(e => e.QrPayFlag).HasColumnType("int(11)");
 
                 entity.Property(e => e.QueryCount).HasColumnType("int(11)");
 
                 entity.Property(e => e.RecordNo)
-                    .HasColumnType("varchar(100)")
+                    .HasColumnType("varchar(50)")
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
@@ -18495,6 +18469,8 @@ namespace MySystem.Models
                 entity.Property(e => e.UserId).HasColumnType("int(11)");
 
                 entity.Property(e => e.Version).HasColumnType("int(11)");
+
+                entity.Property(e => e.VipFlag).HasColumnType("int(11)");
             });
 
             modelBuilder.Entity<UpUserRelation>(entity =>

OpModels/AmountRecordNew.cs

@@ -7,16 +7,10 @@ namespace MySystem.OpModels
     {
         public int Id { get; set; }
         public int Sort { get; set; }
-        public int QueryCount { get; set; }
         public int Status { get; set; }
         public int Version { get; set; }
         public DateTime? CreateDate { get; set; }
         public DateTime? UpdateDate { get; set; }
-        public string CreateMan { get; set; }
-        public string UpdateMan { get; set; }
-        public string SeoTitle { get; set; }
-        public string SeoKeyword { get; set; }
-        public string SeoDescription { get; set; }
         public int ChangeTypeId { get; set; }
         public string Remark { get; set; }
         public int ShowType { get; set; }
@@ -34,5 +28,9 @@ namespace MySystem.OpModels
         public decimal UseValidAmount { get; set; }
         public int DataType { get; set; }
         public int DataId { get; set; }
+        public int? QueryCount { get; set; }
+        public string SeoTitle { get; set; }
+        public string SeoKeyword { get; set; }
+        public string SeoDescription { get; set; }
     }
 }

OpModels/SysAdmin.cs

@@ -34,5 +34,6 @@ namespace MySystem.OpModels
         public ulong ReturnFlag { get; set; }
         public decimal ReturnAmount { get; set; }
         public DateTime? ExpireDate { get; set; }
+        public int BusinessFlag { get; set; }
     }
 }

OpModels/WebCMSEntities.cs

@@ -432,18 +432,7 @@ namespace MySystem.OpModels
                     .HasColumnType("int(11)")
                     .HasComment("操作类别");
 
-                entity.Property(e => e.QueryCount)
-                    .HasColumnType("int(11)");
-
-                entity.Property(e => e.CreateMan)
-                    .HasColumnType("varchar(50)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.UpdateMan)
-                    .HasColumnType("varchar(50)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
+                entity.Property(e => e.QueryCount).HasColumnType("int(11)");
 
                 entity.Property(e => e.Remark)
                     .HasColumnType("varchar(100)")
@@ -2630,6 +2619,10 @@ namespace MySystem.OpModels
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.BusinessFlag)
+                    .HasColumnType("int(11)")
+                    .HasComment("对公标记");
+
                 entity.Property(e => e.CreateDate).HasColumnType("datetime");
 
                 entity.Property(e => e.CreateMan)

wwwroot/layuiadmin/modules_main/Leaders_Admin.js

@@ -154,6 +154,7 @@ layui.config({
             , { field: 'LastBuyDate', width: 180, title: '最后购买时间', sort: true }
             , { field: 'ExpiredDate', width: 180, title: '盟主到期时间', sort: true }
             , { field: 'LeaderStatus', width: 100, title: '状态', sort: true }
+            , { field: 'BusinessFlag', width: 100, title: '是否对公', sort: true }
             , { field: 'LeaderLevel', width: 100, title: '盟主等级', sort: true }
             , { field: 'LeaderReserve', width: 150, title: '盟主储蓄金', sort: true }
             , { field: 'LeaderBalanceAmount', width: 150, title: '盟主可提现余额', sort: true }

wwwroot/layuiadmin/modules_main/UserCashLeaderRecord_Admin.js

@@ -169,6 +169,11 @@ layui.config({
                     width: 200,
                     title: '发佣金额(元)',
                     sort: true
+                }, {
+                    field: 'BusinessFlag',
+                    width: 100,
+                    title: '是否对公',
+                    sort: true
                 }, {
                     field: 'StatusName',
                     width: 200,

wwwroot/layuiadmin/modules_operate/SysAdminOperate_Admin.js

@@ -170,6 +170,10 @@ layui.config({
                 field: 'CreateDate',
                 title: '创建时间',
                 sort: true
+            }, {
+                field: 'BusinessFlag',
+                title: '是否对公',
+                sort: true
             }, {
                 field: 'TotalAmt',
                 title: '未使用额度',

wwwroot/layuiadmin/modules_operate/UserCashRecord_Admin.js

@@ -170,6 +170,11 @@ layui.config({
                     width: 200,
                     title: '发佣金额(元)',
                     sort: true
+                }, {
+                    field: 'BusinessFlag',
+                    width: 100,
+                    title: '是否对公',
+                    sort: true
                 }, {
                     field: 'StatusName',
                     width: 200,