暂存

Areas/Admin/Controllers/MainServer/SetMerchantTypeRecordController.cs

@@ -50,55 +50,35 @@ namespace MySystem.Areas.Admin.Controllers
         /// 设置商户型创客记录
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(StoreSwapSn data, string MakerCode, string RealName, string SnTypeSelect, string SwapStatusSelect, string BizStatusSelect, string RiskStatusSelect, int page = 1, int limit = 30)
+        public JsonResult IndexData(SetMerchantTypeRecord data, string PosSn, string MerUserTypeMakerCode, string PosFromMakerCode, string OperateType, string CreateDateData, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
 
-            Fields.Add("BrandId", "1"); //品牌
-            Fields.Add("SnNo", "1"); //SN号
-            Fields.Add("StandardDate", "3"); //激活时间
-            Fields.Add("SwapSnNo", "1"); //兑换SN号
-            Fields.Add("SwapApplyOrderNo", "1"); //兑换申请单号
-            Fields.Add("SwapApplyDate", "3"); //兑换时间
+            Fields.Add("PosSn", "1"); //SN号
 
             string condition = " and Status>-1";
-            //创客编号
-            if (!string.IsNullOrEmpty(MakerCode))
+            //商户型创客编号
+            if (!string.IsNullOrEmpty(MerUserTypeMakerCode))
             {
-                condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + MakerCode + "')";
+                condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + MerUserTypeMakerCode + "')";
             }
-            //创客名称
-            if (!string.IsNullOrEmpty(RealName))
+            //机具所属创客编号
+            if (!string.IsNullOrEmpty(PosFromMakerCode))
             {
-                condition += " and UserId in (select UserId from UserForRealName where RealName='" + RealName + "')";
+                condition += " and UserId in (select UserId from UserForRealName where RealName='" + PosFromMakerCode + "')";
             }
-            //SN类型
-            if(!string.IsNullOrEmpty(SnTypeSelect))
+            //操作类型
+            if(!string.IsNullOrEmpty(OperateType))
             {
-                condition += " and SnType=" + SnTypeSelect;
-            }
-            //兑换状态
-            if(!string.IsNullOrEmpty(SwapStatusSelect))
-            {
-                condition += " and SwapStatus=" + SwapStatusSelect;
-            }
-            //业务状态
-            if(!string.IsNullOrEmpty(BizStatusSelect))
-            {
-                condition += " and BizStatus=" + BizStatusSelect;
-            }
-            //风控状态
-            if(!string.IsNullOrEmpty(RiskStatusSelect))
-            {
-                condition += " and RiskStatus=" + RiskStatusSelect;
+                condition += " and OperateType=" + OperateType;
             }
 
             Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("SetMerchantTypeRecord", Fields, "Id desc", "0", page, limit, condition);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             foreach (Dictionary<string, object> dic in diclist)
             {
-                dic["BrandId"] = RelationClass.GetKqProductBrandInfo(int.Parse(dic["BrandId"].ToString()));
+                dic["BrandName"] = RelationClass.GetKqProductBrandInfo(int.Parse(dic["BrandId"].ToString()));
                 dic["SwapExtProductTypes"] = RelationClass.GetKqProductBrandList(dic["SwapExtProductTypes"].ToString());
 
                 //创客信息

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -842,6 +842,7 @@ namespace MySystem.Areas.Admin.Controllers
             db.SetMerchantTypeRecord.Add(new SetMerchantTypeRecord()
             {
                 CreateDate = DateTime.Now,
+                SeoTitle = SysUserName + "_" + SysRealName,
                 IsRecyc = (ulong)pos.IsPurchase,
                 CreditAmount = pos.CreditTrade,
                 PosSnType = pos.PosSnType,
@@ -854,6 +855,8 @@ namespace MySystem.Areas.Admin.Controllers
                 Note = "后台设置商户型创客",
                 ToUserId = user.Id,
                 FromUserId = pos.BuyUserId,
+                OperateType = 1,
+                BuyUserId = pos.BuyUserId,
             });
             db.SaveChanges();
             string text = string.Format("设置商户代理，创客编号: " + MakerCode + "，机具SN：" + PosSn + "，商户：" + MerNo + "，操作人：" + SysRealName + "，Time：" + DateTime.Now + "");
@@ -901,44 +904,58 @@ namespace MySystem.Areas.Admin.Controllers
                 return "创客编号不存在";
             }
             PosMerchantInfo merchant = db.PosMerchantInfo.FirstOrDefault(m => m.KqMerNo == MerNo);
-            pos.UserId = pos.BuyUserId;
-            merchant.UserId = pos.BuyUserId;
-            merchant.MerUserType = 0;
-            user.MerchantType = 0;
-            db.SetMerchantTypeRecord.Add(new SetMerchantTypeRecord()
+            if (merchant == null)
             {
-                CreateDate = DateTime.Now,
-                IsRecyc = (ulong)pos.IsPurchase,
-                CreditAmount = pos.CreditTrade,
-                PosSnType = pos.PosSnType,
-                ActDate = pos.ActivationTime,
-                BindDate = pos.BindingTime,
-                ActStatus = (ulong)pos.ActivationState,
-                BindStatus = (ulong)pos.BindingState,
-                MerNo = MerNo,
-                PosSn = pos.PosSn,
-                Note = "后台取消商户型创客",
-                // OpeateType = 1,
-            });
-            db.SaveChanges();
-            if (pos.BindMerchantId == 0)
+                return "商户编号不存在";
+            }
+            else if (merchant.MerUserType == 1 && merchant.UserId == user.Id)
             {
-                pos.BindMerchantId = merchant.Id;
-                if (IsSend == 1)
+                pos.UserId = pos.BuyUserId;
+                merchant.UserId = pos.BuyUserId;
+                merchant.MerUserType = 0;
+                user.MerchantType = 0;
+                db.SetMerchantTypeRecord.Add(new SetMerchantTypeRecord()
                 {
-                    RedisDbconn.Instance.AddList("MsgPersonalQueue", Newtonsoft.Json.JsonConvert.SerializeObject(new MsgPersonal()
+                    CreateDate = DateTime.Now,
+                    SeoTitle = SysUserName + "_" + SysRealName,
+                    IsRecyc = (ulong)pos.IsPurchase,
+                    CreditAmount = pos.CreditTrade,
+                    PosSnType = pos.PosSnType,
+                    ActDate = pos.ActivationTime,
+                    BindDate = pos.BindingTime,
+                    ActStatus = (ulong)pos.ActivationState,
+                    BindStatus = (ulong)pos.BindingState,
+                    MerNo = MerNo,
+                    PosSn = pos.PosSn,
+                    Note = "后台取消商户型创客",
+                    ToUserId = user.Id,
+                    FromUserId = pos.BuyUserId,
+                    OperateType = 2,
+                    BuyUserId = pos.BuyUserId,
+                });
+                db.SaveChanges();
+                if (pos.BindMerchantId == 0)
+                {
+                    pos.BindMerchantId = merchant.Id;
+                    if (IsSend == 1)
                     {
-                        UserId = pos.BuyUserId, //接收创客
-                        MsgType = 2,
-                        Title = "商户型代理取消成功", //标题
-                        Summary = "您的 " + kqProducts.Name + " SN:" + pos.PosSn + "已给下级代理" + user.RealName + "" + MakerCode + "取消成功",
-                        CreateDate = DateTime.Now,
-                    }));
+                        RedisDbconn.Instance.AddList("MsgPersonalQueue", Newtonsoft.Json.JsonConvert.SerializeObject(new MsgPersonal()
+                        {
+                            UserId = pos.BuyUserId, //接收创客
+                            MsgType = 2,
+                            Title = "商户型代理取消成功", //标题
+                            Summary = "您的 " + kqProducts.Name + " SN:" + pos.PosSn + "已给下级代理" + user.RealName + "" + MakerCode + "取消成功",
+                            CreateDate = DateTime.Now,
+                        }));
+                    }
                 }
+                string text = string.Format("取消商户代理，创客编号: " + user.MakerCode + "，机具SN：" + pos.PosSn + "，操作人：" + SysRealName + "，Time：" + DateTime.Now + "");
+                function.WriteLog(text, "CancelMerAgent");//取消商户型代理日志
+            }
+            else
+            {
+                return "未找到相关信息";
             }
-            string text = string.Format("取消商户代理，创客编号: " + user.MakerCode + "，机具SN：" + pos.PosSn + "，操作人：" + SysRealName + "，Time：" + DateTime.Now + "");
-            function.WriteLog(text, "CancelMerAgent");//取消商户型代理日志
-
             return "success";
         }
 

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

@@ -8,7 +8,7 @@
 
 <head>
     <meta charset="utf-8">
-    <title>小仓库</title>
+    <title>设置商户型创客记录</title>
     <meta name="renderer" content="webkit">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="viewport"
@@ -45,59 +45,41 @@
             <div class="layui-form layui-card-header layuiadmin-card-header-auto">
                 <div class="layui-form-item">
                     <div class="layui-inline">
-                        <label class="layui-form-label">仓库编号</label>
+                        <label class="layui-form-label">机具SN</label>
                         <div class="layui-input-inline">
-                            <input class="layui-input" type="text" name="StoreNo" placeholder="" autocomplete="off">
+                            <input class="layui-input" type="text" name="PosSn" placeholder="" autocomplete="off">
                         </div>
                     </div>
                     <div class="layui-inline">
-                        <label class="layui-form-label">创建时间</label>
+                        <label class="layui-form-label">商户型创客编号</label>
                         <div class="layui-input-inline">
-                            <input class="layui-input" type="text" readonly name="CreateDateData" id="CreateDate"
-                                placeholder="" autocomplete="off">
+                            <input class="layui-input" type="text" name="MerUserTypeMakerCode" placeholder=""
+                                autocomplete="off">
                         </div>
                     </div>
                     <div class="layui-inline">
-                        <label class="layui-form-label">仓库名称</label>
+                        <label class="layui-form-label">机具所属创客编号</label>
                         <div class="layui-input-inline">
-                            <input class="layui-input" type="text" name="StoreName" placeholder="" autocomplete="off">
+                            <input class="layui-input" type="text" name="PosFromMakerCode" placeholder=""
+                                autocomplete="off">
                         </div>
                     </div>
-                    @* <div class="layui-inline">
-                        <label class="layui-form-label">仓库归属人</label>
+                    <div class="layui-form-item">
+                        <label class="layui-form-label">操作类别</label>
                         <div class="layui-input-inline">
-                            <select id="UserIdSelect" name="UserIdSelect" lay-search="">
-                                <option value="">全部...</option>
+                            <select id="OperateType" name="OperateType" lay-search="">
+                                <option value="1">设置</option>
+                                <option value="2">取消</option>
                             </select>
                         </div>
                     </div>
                     <div class="layui-inline">
-                        <label class="layui-form-label">产品类型</label>
-                        <div class="layui-input-inline">
-                            <select id="BrandId" name="BrandId" lay-search="">
-                                <option value="">全部...</option>
-                            </select>
-                        </div>
-                    </div> *@
-                    <div class="layui-inline">
-                        <label class="layui-form-label">仓库归属人手机号</label>
-                        <div class="layui-input-inline">
-                            <input class="layui-input" type="text" name="Mobile" placeholder="" autocomplete="off">
-                        </div>
-                    </div>
-                    @* <div class="layui-inline">
-                        <label class="layui-form-label">出货仓库编号</label>
+                        <label class="layui-form-label">创建时间</label>
                         <div class="layui-input-inline">
-                            <input class="layui-input" type="text" name="FromStoreIdStoreNo" autocomplete="off">
+                            <input class="layui-input" type="text" readonly name="CreateDateData" id="CreateDate"
+                                placeholder="" autocomplete="off">
                         </div>
                     </div>
-                    <div class="layui-inline">
-                        <label class="layui-form-label">出货仓库名称</label>
-                        <div class="layui-input-inline">
-                            <input class="layui-input" type="text" name="FromStoreIdStoreName" autocomplete="off">
-                        </div>
-                    </div> *@
-
                     <div class="layui-inline ml50">
                         <button class="layui-btn" lay-submit lay-filter="LAY-list-front-search">
                             <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>查询
@@ -110,42 +92,8 @@
             </div>
 
             <div class="layui-card-body">
-                <div style="padding-bottom: 10px;">
-                    @if (RightInfo.Contains("," + right + "_add,"))
-                    {
-                        <button class="layui-btn" data-type="add"><i
-                            class="layui-icon layui-icon-add-1 layuiadmin-button-btn"></i>添加</button>
-                    }
-                    @if (RightInfo.Contains("," + right + "_delete,"))
-                    {
-                        <button class="layui-btn" data-type="batchdel"><i
-                            class="layui-icon layui-icon-delete layuiadmin-button-btn"></i>删除</button>
-                    }
-                    @if (RightInfo.Contains("," + right + "_edit,"))
-                    {
-                        <button class="layui-btn" data-type="ImportData"><i
-                            class="layui-icon layui-icon-upload layuiadmin-button-btn"></i>导入</button>
-                        <button class="layui-btn" data-type="ExportExcel"><i
-                            class="layui-icon layui-icon-export layuiadmin-button-btn"></i>导出</button>
-
-                    }
-                </div>
-
                 <table id="LAY-list-manage" lay-filter="LAY-list-manage"></table>
                 <script type="text/html" id="table-list-tools">
-                    @if (RightInfo.Contains("," + right + "_edit,"))
-                    {
-                        <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="edit"><i class="layui-icon layui-icon-edit"></i>编辑</a>
-                    }
-                    @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-normal layui-btn-xs" lay-href="/Admin/PreSendStockDetail/Index?right=@right&StoreId=@("{{d.Id}}")">预发货库存明细</a>
-
-                    }
                 </script>
             </div>
         </div>

Models/ChangeTypes.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models
+{
+    public partial class ChangeTypes
+    {
+        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 Name { get; set; }
+        public int Kind { get; set; }
+    }
+}

Models/LeaderCompPrize.cs

@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models
+{
+    public partial class LeaderCompPrize
+    {
+        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 SecDirectCount { get; set; }
+        public int NotDirectCount { get; set; }
+        public int DirectCount { get; set; }
+        public int UserId { get; set; }
+        public string StatMonth { get; set; }
+    }
+}

Models/SchoolMorningMeet.cs

@@ -23,5 +23,7 @@ namespace MySystem.Models
         public string Photo { get; set; }
         public string Lecturer { get; set; }
         public string Title { get; set; }
+        public ulong IsBanner { get; set; }
+        public string BannerPhoto { get; set; }
     }
 }

Models/SetMerchantTypeRecord.cs

@@ -26,5 +26,7 @@ namespace MySystem.Models
         public string Note { get; set; }
         public int ToUserId { get; set; }
         public int FromUserId { get; set; }
+        public int OperateType { get; set; }
+        public int BuyUserId { get; set; }
     }
 }

Models/UserAccountRecord.cs

@@ -29,5 +29,6 @@ namespace MySystem.Models
         public int ProductType { get; set; }
         public int ChangeType { get; set; }
         public int UserId { get; set; }
+        public int Kind { get; set; }
     }
 }

Models/WebCMSEntities.cs

@@ -37,6 +37,7 @@ namespace MySystem.Models
         public virtual DbSet<BusinessPartnerMerchant> BusinessPartnerMerchant { get; set; }
         public virtual DbSet<BusinessPartnerPos> BusinessPartnerPos { get; set; }
         public virtual DbSet<BusinessTradeSummary> BusinessTradeSummary { get; set; }
+        public virtual DbSet<ChangeTypes> ChangeTypes { get; set; }
         public virtual DbSet<Col> Col { get; set; }
         public virtual DbSet<ConsumerOpenIds> ConsumerOpenIds { get; set; }
         public virtual DbSet<ConsumerOrderForNo> ConsumerOrderForNo { get; set; }
@@ -69,6 +70,7 @@ namespace MySystem.Models
         public virtual DbSet<KqProductRuleSet> KqProductRuleSet { get; set; }
         public virtual DbSet<KqProducts> KqProducts { get; set; }
         public virtual DbSet<LeaderAccountRecord> LeaderAccountRecord { get; set; }
+        public virtual DbSet<LeaderCompPrize> LeaderCompPrize { get; set; }
         public virtual DbSet<LeaderReserveRecord> LeaderReserveRecord { get; set; }
         public virtual DbSet<Leaders> Leaders { get; set; }
         public virtual DbSet<MachineApply> MachineApply { get; set; }
@@ -269,7 +271,7 @@ namespace MySystem.Models
         {
             if (!optionsBuilder.IsConfigured)
             {
-                optionsBuilder.UseMySql(Library.ConfigurationManager.AppSettings["SqlConnStr"].ToString(), x => x.ServerVersion("5.7.17-mysql")); 
+                optionsBuilder.UseMySql(Library.ConfigurationManager.AppSettings["SqlConnStr"].ToString(), x => x.ServerVersion("5.7.17-mysql"));
             }
         }
 
@@ -1979,6 +1981,43 @@ namespace MySystem.Models
                 entity.Property(e => e.VipFlag).HasColumnType("int(11)");
             });
 
+            modelBuilder.Entity<ChangeTypes>(entity =>
+            {
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.CreateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.Kind).HasColumnType("int(11)");
+
+                entity.Property(e => e.Name)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.QueryCount).HasColumnType("int(11)");
+
+                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.UpdateDate).HasColumnType("datetime");
+            });
+
             modelBuilder.Entity<Col>(entity =>
             {
                 entity.HasComment("分类设置");
@@ -4148,6 +4187,86 @@ namespace MySystem.Models
                 entity.Property(e => e.Version).HasColumnType("int(11)");
             });
 
+            modelBuilder.Entity<LeaderCompPrize>(entity =>
+            {
+                entity.HasComment("领导人达标奖");
+
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.CreateDate)
+                    .HasColumnType("datetime")
+                    .HasComment("创建时间");
+
+                entity.Property(e => e.CreateMan)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("创建人")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.DirectCount)
+                    .HasColumnType("int(11)")
+                    .HasComment("直推达标人数");
+
+                entity.Property(e => e.NotDirectCount)
+                    .HasColumnType("int(11)")
+                    .HasComment("简推达标人数");
+
+                entity.Property(e => e.QueryCount)
+                    .HasColumnType("int(11)")
+                    .HasComment("点击量");
+
+                entity.Property(e => e.SecDirectCount)
+                    .HasColumnType("int(11)")
+                    .HasComment("次直推达标人数");
+
+                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)")
+                    .HasComment("排序序号");
+
+                entity.Property(e => e.StatMonth)
+                    .HasColumnType("varchar(6)")
+                    .HasComment("统计月份")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Status)
+                    .HasColumnType("int(11)")
+                    .HasComment("状态");
+
+                entity.Property(e => e.UpdateDate)
+                    .HasColumnType("datetime")
+                    .HasComment("更新时间");
+
+                entity.Property(e => e.UpdateMan)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("更新人")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.UserId)
+                    .HasColumnType("int(11)")
+                    .HasComment("创客");
+
+                entity.Property(e => e.Version)
+                    .HasColumnType("int(11)")
+                    .HasComment("版本号");
+            });
+
             modelBuilder.Entity<LeaderReserveRecord>(entity =>
             {
                 entity.Property(e => e.Id).HasColumnType("int(11)");
@@ -12267,6 +12386,12 @@ namespace MySystem.Models
             {
                 entity.Property(e => e.Id).HasColumnType("int(11)");
 
+                entity.Property(e => e.BannerPhoto)
+                    .HasColumnType("varchar(200)")
+                    .HasComment("Banner图例")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
                 entity.Property(e => e.Contents)
                     .HasColumnType("longtext")
                     .HasCharSet("utf8")
@@ -12279,6 +12404,11 @@ namespace MySystem.Models
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.IsBanner)
+                    .HasColumnType("bit(1)")
+                    .HasDefaultValueSql("b'0'")
+                    .HasComment("Banner推荐");
+
                 entity.Property(e => e.Lecturer)
                     .HasColumnType("varchar(30)")
                     .HasCharSet("utf8")
@@ -12618,6 +12748,10 @@ namespace MySystem.Models
                     .HasColumnType("bit(1)")
                     .HasDefaultValueSql("b'0'");
 
+                entity.Property(e => e.BuyUserId)
+                    .HasColumnType("int(11)")
+                    .HasComment("机具所属人");
+
                 entity.Property(e => e.CreateDate).HasColumnType("datetime");
 
                 entity.Property(e => e.CreditAmount).HasColumnType("decimal(18,2)");
@@ -12638,6 +12772,10 @@ namespace MySystem.Models
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.OperateType)
+                    .HasColumnType("int(11)")
+                    .HasComment("操作类型");
+
                 entity.Property(e => e.PosSn)
                     .HasColumnType("varchar(50)")
                     .HasCharSet("utf8")
@@ -15296,8 +15434,6 @@ namespace MySystem.Models
 
             modelBuilder.Entity<UserAccount>(entity =>
             {
-                entity.HasComment("创客账户");
-
                 entity.Property(e => e.Id).HasColumnType("int(11)");
 
                 entity.Property(e => e.AccountStatus).HasColumnType("int(11)");
@@ -15428,6 +15564,8 @@ namespace MySystem.Models
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.Kind).HasColumnType("int(11)");
+
                 entity.Property(e => e.ProductType).HasColumnType("int(11)");
 
                 entity.Property(e => e.QueryCount).HasColumnType("int(11)");

wwwroot/layuiadmin/modules_main/SetMerchantTypeRecord_Admin.js

@@ -91,21 +91,15 @@ layui.config({
         , url: '/Admin/SetMerchantTypeRecord/IndexData' //模拟接口
         , cols: [[
             { type: 'checkbox', fixed: 'left' }
-            , { field: 'StoreIdStoreNo', width: 200, title: '仓库编号', sort: true }
-            , { field: 'StoreIdStoreName', width: 200, title: '仓库名称', sort: true }
-            , { field: 'BrandId', width: 200, title: '产品类型', sort: true }
-            , { field: 'TransType', width: 200, title: '交易类型', sort: true }
             , { field: 'SnNo', width: 200, title: 'SN编号', sort: true }
-            , { field: 'StockOpDirect', width: 200, title: '库存操作方向', sort: true }
-            , { field: 'SnStatus', width: 200, title: 'SN状态', sort: true }
-            , { field: 'BindStatus', width: 200, title: '绑定状态', sort: true }
-            , { field: 'BindMerchantMerchantNo', width: 200, title: '绑定商户编号', sort: true }
-            , { field: 'BindMerchantMerchantName', width: 200, title: '绑定商户姓名', sort: true }
-            , { field: 'ActiveStatus', width: 200, title: '激活状态', sort: true }
-            , { field: 'ExpressNo', width: 200, title: '快递单号', sort: true }
-            , { field: 'BrandType', width: 200, title: '品牌类型', sort: true }
-            , { field: 'CreateDate', width: 200, title: '变动时间', sort: true }
-            // SN、机具类型、操作类别（关联、取消关联）、商户型创客姓名、商户型创客编码、机具所属创客姓名、机具所属创客编码、转换时间、取消转换时间、操作人、操作
+            , { field: 'BrandName', width: 200, title: '产品类型', sort: true }
+            , { field: 'OperateTypeName', width: 200, title: '操作类别', sort: true }
+            , { field: 'MerUserTypeName', width: 200, title: '商户型创客姓名', sort: true }
+            , { field: 'MerUserTypeMakerCode', width: 200, title: '商户型创客编码', sort: true }
+            , { field: 'PosFromName', width: 200, title: '机具所属创客姓名', sort: true }
+            , { field: 'PosFromMakerCode', width: 200, title: '机具所属创客编码', sort: true }
+            , { field: 'CreateDate', width: 200, title: '操作时间', sort: true }
+            , { field: 'SeoTitle', width: 200, title: '操作人', sort: true }
         ]]
         , where: {