暂存

Areas/Admin/Controllers/BsServer/ColController.cs

@@ -133,6 +133,10 @@ namespace MySystem.Areas.Admin.Controllers
         public string Add(Col col, string PColId = "", string CurColId = "")
         {
             //构造ColId
+            if (string.IsNullOrEmpty(PColId) && string.IsNullOrEmpty(CurColId))
+            {
+                return "请选择上级栏目！";
+            }
             string code = "";
             int len = PColId.Length + 3;
             Col model = bsdb.Col.Where(m => m.ColId.StartsWith(PColId) && m.ColId.Length == len).OrderByDescending(m => m.ColId).FirstOrDefault();

Areas/Admin/Views/BsServer/Col/Add.cshtml

@@ -29,7 +29,7 @@
                                 <div class="layui-inline">
                                     <label class="layui-form-label">上级栏目</label>
                                     <div class="layui-input-inline">
-                                        <select id="PColId" name="PColId" lay-search="" lay-verify="required">
+                                        <select id="PColId" name="PColId" lay-search="" lay-verify="required|">
                                             <option value="@CurColId">作为顶级栏目</option>
                                             @{
                                                 List<MySystem.BsModels.Col> ColId = new MySystem.BsModels.WebCMSEntities().Col.Where(m => m.ColId.StartsWith(CurColId)).OrderBy(m

Areas/Admin/Views/BsServer/Col/Edit.cshtml

@@ -35,7 +35,7 @@
                                 <div class="layui-inline">
                                     <label class="layui-form-label">上级栏目</label>
                                     <div class="layui-input-inline">
-                                        <select id="PColId" name="PColId" lay-search="" lay-verify="required">
+                                        <select id="PColId" name="PColId" lay-search="" lay-verify="required|">
                                             <option value="@CurColId">作为顶级栏目</option>
                                             @{
                                                 List<MySystem.BsModels.Col> ColId = new MySystem.BsModels.WebCMSEntities().Col.Where(m => m.ColId.StartsWith(CurColId)).OrderBy(m

Models/ExportExcels.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models
+{
+    public partial class ExportExcels
+    {
+        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 FileName { get; set; }
+        public int SysId { get; set; }
+        public string FileUrl { get; set; }
+    }
+}

Models/PosCoupons.cs

@@ -24,5 +24,6 @@ namespace MySystem.Models
         public int HelpProfitStatus { get; set; }
         public ulong HelpProfitFlag { get; set; }
         public int OpId { get; set; }
+        public int OrderId { get; set; }
     }
 }

Models/ProductNorm.cs

@@ -30,5 +30,6 @@ namespace MySystem.Models
         public decimal Price { get; set; }
         public string IdList { get; set; }
         public string ColName { get; set; }
+        public int StartBuyCount { get; set; }
     }
 }

Models/Products.cs

@@ -54,5 +54,9 @@ namespace MySystem.Models
         public string Contents { get; set; }
         public string Details { get; set; }
         public string ProductName { get; set; }
+        public int ProductKind { get; set; }
+        public int BannerSort { get; set; }
+        public string BannerPhoto { get; set; }
+        public ulong IsBanner { get; set; }
     }
 }

Models/WebCMSEntities.cs

@@ -48,6 +48,7 @@ namespace MySystem.Models
         public virtual DbSet<CouponsForUser> CouponsForUser { get; set; }
         public virtual DbSet<CustomTagSet> CustomTagSet { get; set; }
         public virtual DbSet<ErpCompanys> ErpCompanys { get; set; }
+        public virtual DbSet<ExportExcels> ExportExcels { get; set; }
         public virtual DbSet<FileUpdateInfo> FileUpdateInfo { get; set; }
         public virtual DbSet<FluxProfitDetail> FluxProfitDetail { get; set; }
         public virtual DbSet<FluxProfitSummary> FluxProfitSummary { get; set; }
@@ -2731,6 +2732,48 @@ namespace MySystem.Models
                 entity.Property(e => e.Version).HasColumnType("int(11)");
             });
 
+            modelBuilder.Entity<ExportExcels>(entity =>
+            {
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.CreateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.FileName)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.FileUrl)
+                    .HasColumnType("varchar(500)")
+                    .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.SysId).HasColumnType("int(11)");
+
+                entity.Property(e => e.UpdateDate).HasColumnType("datetime");
+            });
+
             modelBuilder.Entity<FileUpdateInfo>(entity =>
             {
                 entity.HasComment("资源文件更新信息");
@@ -7751,8 +7794,6 @@ namespace MySystem.Models
                 entity.HasKey(e => e.OrderNo)
                     .HasName("PRIMARY");
 
-                entity.HasComment("订单号关联表");
-
                 entity.Property(e => e.OrderNo)
                     .HasColumnType("varchar(50)")
                     .HasCharSet("utf8")
@@ -7773,8 +7814,6 @@ namespace MySystem.Models
 
             modelBuilder.Entity<OrderProduct>(entity =>
             {
-                entity.HasComment("订单商品");
-
                 entity.HasIndex(e => e.OrderId)
                     .HasName("OrderProductIndex");
 
@@ -7870,8 +7909,6 @@ namespace MySystem.Models
 
             modelBuilder.Entity<OrderRefund>(entity =>
             {
-                entity.HasComment("退款申请");
-
                 entity.Property(e => e.Id).HasColumnType("int(11)");
 
                 entity.Property(e => e.Amount).HasColumnType("decimal(18,2)");
@@ -7953,8 +7990,6 @@ namespace MySystem.Models
 
             modelBuilder.Entity<OrderRefundReason>(entity =>
             {
-                entity.HasComment("退款原因");
-
                 entity.Property(e => e.Id).HasColumnType("int(11)");
 
                 entity.Property(e => e.CreateDate).HasColumnType("datetime");
@@ -8002,8 +8037,6 @@ namespace MySystem.Models
 
             modelBuilder.Entity<Orders>(entity =>
             {
-                entity.HasComment("创客订单");
-
                 entity.HasIndex(e => e.StoreId)
                     .HasName("OrdersStoreIdIndex");
 
@@ -8569,6 +8602,8 @@ namespace MySystem.Models
 
                 entity.Property(e => e.OpId).HasColumnType("int(11)");
 
+                entity.Property(e => e.OrderId).HasColumnType("int(11)");
+
                 entity.Property(e => e.QueryCount).HasColumnType("int(11)");
 
                 entity.Property(e => e.SeoDescription)
@@ -8782,8 +8817,6 @@ namespace MySystem.Models
 
             modelBuilder.Entity<PosMachinesTwo>(entity =>
             {
-                entity.HasComment("机具库");
-
                 entity.HasIndex(e => new { e.PosSn, e.BrandId })
                     .HasName("PosMachinesTwoIndex");
 
@@ -9721,6 +9754,8 @@ namespace MySystem.Models
 
                 entity.Property(e => e.Sort).HasColumnType("int(11)");
 
+                entity.Property(e => e.StartBuyCount).HasColumnType("int(11)");
+
                 entity.Property(e => e.Status).HasColumnType("int(11)");
 
                 entity.Property(e => e.Stock).HasColumnType("int(11)");
@@ -9856,6 +9891,13 @@ namespace MySystem.Models
 
                 entity.Property(e => e.Id).HasColumnType("int(11)");
 
+                entity.Property(e => e.BannerPhoto)
+                    .HasColumnType("varchar(200)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.BannerSort).HasColumnType("int(11)");
+
                 entity.Property(e => e.BuyCount).HasColumnType("int(11)");
 
                 entity.Property(e => e.ColId)
@@ -9897,6 +9939,10 @@ namespace MySystem.Models
 
                 entity.Property(e => e.Integral).HasColumnType("decimal(18,2)");
 
+                entity.Property(e => e.IsBanner)
+                    .HasColumnType("bit(1)")
+                    .HasDefaultValueSql("b'0'");
+
                 entity.Property(e => e.IsLimit)
                     .HasColumnType("bit(1)")
                     .HasDefaultValueSql("b'0'");
@@ -9960,6 +10006,8 @@ namespace MySystem.Models
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.ProductKind).HasColumnType("int(11)");
+
                 entity.Property(e => e.ProductName)
                     .HasColumnType("varchar(100)")
                     .HasCharSet("utf8")
@@ -14776,8 +14824,6 @@ namespace MySystem.Models
 
             modelBuilder.Entity<TradeDaySummary>(entity =>
             {
-                entity.HasComment("交易日汇总");
-
                 entity.HasIndex(e => new { e.UserId, e.TradeMonth, e.TradeDate, e.BrandId, e.QueryCount, e.VipFlag, e.PayType, e.SeoTitle })
                     .HasName("TradeDaySummaryIndex");
 
@@ -14961,7 +15007,8 @@ namespace MySystem.Models
 
             modelBuilder.Entity<TradeRecord>(entity =>
             {
-                entity.HasComment("交易记录");
+                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)");