交易记录判断激活状态

AppStart/Helper/StatBusinessService.cs

@@ -52,7 +52,7 @@ namespace MySystem
                     {
                         startId = "867041";
                     }
-                    DataTable idsDt = OtherMySqlConn.dtable("select Id from TradeRecord where Id>=" + startId + " and CreateDate>='2022-08-16 00:00:00' and UserId in (select Id from Users where BusinessFlag=1) and QueryCount=1 order by Id limit 50");
+                    DataTable idsDt = OtherMySqlConn.dtable("select Id from TradeRecord where Id>=" + startId + " and ActStatus=1 and CreateDate>='2022-08-16 00:00:00' and UserId in (select Id from Users where BusinessFlag=1) and QueryCount=1 order by Id limit 50");
                     if(idsDt.Rows.Count > 0)
                     {
                         string ids = "";

AppStart/Helper/StatHelpProfitService.cs

@@ -52,7 +52,7 @@ namespace MySystem
                     {
                         startId = "2750000";
                     }
-                    DataTable idsDt = OtherMySqlConn.dtable("select Id from TradeRecord where Id>=" + startId + " and CreateDate>='2022-09-05 00:00:00' and MerchantId in (select MerchantId from HelpProfitMerIds) and SeoTitle='HelpProfit' and QueryCount>0 and QueryCount<3 order by Id limit 50");
+                    DataTable idsDt = OtherMySqlConn.dtable("select Id from TradeRecord where Id>=" + startId + " and ActStatus=1 and CreateDate>='2022-09-05 00:00:00' and MerchantId in (select MerchantId from HelpProfitMerIds) and SeoTitle='HelpProfit' and QueryCount>0 and QueryCount<3 order by Id limit 50");
                     if (idsDt.Rows.Count > 0)
                     {
                         string ids = "";

AppStart/Helper/StatService.cs

@@ -54,7 +54,7 @@ namespace MySystem
                     {
                         startId = "867041";
                     }
-                    DataTable idsDt = OtherMySqlConn.dtable("select Id from TradeRecord where Id>=" + startId + " and QueryCount=0 order by Id limit 50");
+                    DataTable idsDt = OtherMySqlConn.dtable("select Id from TradeRecord where Id>=" + startId + " and ActStatus=1 and QueryCount=0 order by Id limit 50");
                     if(idsDt.Rows.Count > 0)
                     {
                         string ids = "";

PxcModels/Leaders.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class Leaders
+    {
+        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 int LeaderLevel { get; set; }
+        public int UserId { get; set; }
+    }
+}

PxcModels/MachineApply.cs

@@ -55,5 +55,6 @@ namespace MySystem.PxcModels
         public int BrandId { get; set; }
         public int UserId { get; set; }
         public string ApplyNo { get; set; }
+        public int OperateId { get; set; }
     }
 }

PxcModels/Orders.cs

@@ -64,5 +64,6 @@ namespace MySystem.PxcModels
         public string OrderNo { get; set; }
         public int UserId { get; set; }
         public int ParentOrderId { get; set; }
+        public int OpId { get; set; }
     }
 }

PxcModels/PosCouponRecord.cs

@@ -19,5 +19,6 @@ namespace MySystem.PxcModels
         public int ToUserId { get; set; }
         public int FromUserId { get; set; }
         public int PosCouponId { get; set; }
+        public int OpId { get; set; }
     }
 }

PxcModels/PosCoupons.cs

@@ -23,5 +23,6 @@ namespace MySystem.PxcModels
         public int HelpProfitMerchantId { get; set; }
         public int HelpProfitStatus { get; set; }
         public ulong HelpProfitFlag { get; set; }
+        public int OpId { get; set; }
     }
 }

PxcModels/PosMachinesTwo.cs

@@ -52,5 +52,12 @@ namespace MySystem.PxcModels
         public DateTime? UpFeeDate { get; set; }
         public ulong DownFeeFlag { get; set; }
         public ulong UpFeeFlag { get; set; }
+        public decimal OpReserve3 { get; set; }
+        public decimal OpReserve2 { get; set; }
+        public decimal OpReserve1 { get; set; }
+        public int OpId { get; set; }
+        public DateTime? RecycStartDate { get; set; }
+        public string SourcePosSn { get; set; }
+        public int RecycStatus { get; set; }
     }
 }

PxcModels/PosMerchantInfo.cs

@@ -43,5 +43,7 @@ namespace MySystem.PxcModels
         public string MerchantMobile { get; set; }
         public string MerchantName { get; set; }
         public string MerchantNo { get; set; }
+        public int StandardMonths { get; set; }
+        public int StandardStatus { get; set; }
     }
 }

PxcModels/PreAmountRecord.cs

@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class PreAmountRecord
+    {
+        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 int PayMode { get; set; }
+        public int OperateType { get; set; }
+        public int AmountType { get; set; }
+        public decimal AfterAmount { get; set; }
+        public decimal BeforeAmount { get; set; }
+        public decimal UseAmount { get; set; }
+        public int ApplyId { get; set; }
+        public int UserId { get; set; }
+    }
+}

PxcModels/ProfitRewardRecord.cs

@@ -77,5 +77,7 @@ namespace MySystem.PxcModels
         public decimal ProfitCreditProfitRate { get; set; }
         public decimal ProfitDebitNonTradeCapProfit { get; set; }
         public decimal ProfitCreditTradeProfit { get; set; }
+        public decimal ProfitDebitNonCapTradeAmt { get; set; }
+        public decimal ProfitCreditTradeAmt { get; set; }
     }
 }

PxcModels/RecycMachineOrder.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class RecycMachineOrder
+    {
+        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 int BrandId { get; set; }
+        public string RecycOrderNo { get; set; }
+        public DateTime? CancelDate { get; set; }
+        public DateTime? ResultDate { get; set; }
+        public string ErpCode { get; set; }
+        public string ErpName { get; set; }
+        public int PostType { get; set; }
+        public int RecycStoreId { get; set; }
+        public int UserId { get; set; }
+    }
+}

PxcModels/RecycMachineOrderPos.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class RecycMachineOrderPos
+    {
+        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 int BrandId { get; set; }
+        public DateTime? CancelDate { get; set; }
+        public DateTime? ResultDate { get; set; }
+        public string SnNo { get; set; }
+        public int OrderId { get; set; }
+    }
+}

PxcModels/StoreBalance.cs

@@ -29,5 +29,6 @@ namespace MySystem.PxcModels
         public int TransType { get; set; }
         public string TransRecordNo { get; set; }
         public int StoreId { get; set; }
+        public int OpId { get; set; }
     }
 }

PxcModels/StoreChangeHistory.cs

@@ -37,5 +37,6 @@ namespace MySystem.PxcModels
         public string ChangeRecordNo { get; set; }
         public int BrandId { get; set; }
         public int UserId { get; set; }
+        public int OpId { get; set; }
     }
 }

PxcModels/StoreHouse.cs

@@ -39,5 +39,9 @@ namespace MySystem.PxcModels
         public string StoreNo { get; set; }
         public DateTime? AuthDate { get; set; }
         public ulong AuthFlag { get; set; }
+        public int ThisMonthSendCount { get; set; }
+        public string FilePath { get; set; }
+        public decimal Deposit { get; set; }
+        public int OpId { get; set; }
     }
 }

PxcModels/StoreStockChange.cs

@@ -44,5 +44,6 @@ namespace MySystem.PxcModels
         public string ProductName { get; set; }
         public int BrandId { get; set; }
         public int StoreId { get; set; }
+        public int OpId { get; set; }
     }
 }

PxcModels/ToChargeBackRecord.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class ToChargeBackRecord
+    {
+        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 Field1 { get; set; }
+        public string Remark { get; set; }
+        public int ChargeType { get; set; }
+        public decimal ChargeAmount { get; set; }
+        public int UserId { get; set; }
+    }
+}

PxcModels/TradeRecord.cs

@@ -40,5 +40,6 @@ namespace MySystem.PxcModels
         public string ParentNav { get; set; }
         public int PayType { get; set; }
         public int VipFlag { get; set; }
+        public int ActStatus { get; set; }
     }
 }

PxcModels/UserAccount.cs

@@ -42,5 +42,9 @@ namespace MySystem.PxcModels
         public decimal ValidPreAmount { get; set; }
         public decimal ThisMonthPreAmount { get; set; }
         public decimal TempAmountForBalance { get; set; }
+        public decimal StoreDeposit { get; set; }
+        public decimal PreTempAmountForBalance { get; set; }
+        public decimal PreTempAmount { get; set; }
+        public decimal ToChargeAmount { get; set; }
     }
 }

PxcModels/Users.cs

@@ -88,5 +88,11 @@ namespace MySystem.PxcModels
         public string DeviceType { get; set; }
         public DateTime? HelpProfitAgreeDate { get; set; }
         public ulong HelpProfitAgree { get; set; }
+        public string SignPic { get; set; }
+        public DateTime? SignDate { get; set; }
+        public ulong IsSign { get; set; }
+        public DateTime? CreateStoreDate { get; set; }
+        public int StoreStock { get; set; }
+        public int ThisMonthSend { get; set; }
     }
 }

PxcModels/WebCMSEntities.cs

@@ -69,6 +69,7 @@ namespace MySystem.PxcModels
         public virtual DbSet<KqProducts> KqProducts { get; set; }
         public virtual DbSet<LeaderAccountRecord> LeaderAccountRecord { get; set; }
         public virtual DbSet<LeaderReserveRecord> LeaderReserveRecord { get; set; }
+        public virtual DbSet<Leaders> Leaders { get; set; }
         public virtual DbSet<MachineApply> MachineApply { get; set; }
         public virtual DbSet<MachineApplyDetail> MachineApplyDetail { get; set; }
         public virtual DbSet<MachineChange> MachineChange { get; set; }
@@ -131,6 +132,7 @@ namespace MySystem.PxcModels
         public virtual DbSet<PosMerchantInfoBak> PosMerchantInfoBak { get; set; }
         public virtual DbSet<PosMerchantOtherInfo> PosMerchantOtherInfo { get; set; }
         public virtual DbSet<PosMerchantTradeSummay> PosMerchantTradeSummay { get; set; }
+        public virtual DbSet<PreAmountRecord> PreAmountRecord { get; set; }
         public virtual DbSet<PreSendStockDetail> PreSendStockDetail { get; set; }
         public virtual DbSet<ProductComment> ProductComment { get; set; }
         public virtual DbSet<ProductCommentAgree> ProductCommentAgree { get; set; }
@@ -166,6 +168,8 @@ namespace MySystem.PxcModels
         public virtual DbSet<PullnewSummary> PullnewSummary { get; set; }
         public virtual DbSet<RecommendDirectUser> RecommendDirectUser { get; set; }
         public virtual DbSet<RecommendTradeSummary> RecommendTradeSummary { get; set; }
+        public virtual DbSet<RecycMachineOrder> RecycMachineOrder { get; set; }
+        public virtual DbSet<RecycMachineOrderPos> RecycMachineOrderPos { get; set; }
         public virtual DbSet<RightDic> RightDic { get; set; }
         public virtual DbSet<SchoolMakerStudy> SchoolMakerStudy { get; set; }
         public virtual DbSet<SchoolMaterials> SchoolMaterials { get; set; }
@@ -209,6 +213,7 @@ namespace MySystem.PxcModels
         public virtual DbSet<TeamPersonDayTop> TeamPersonDayTop { get; set; }
         public virtual DbSet<TmpCert> TmpCert { get; set; }
         public virtual DbSet<TmpTradeNo> TmpTradeNo { get; set; }
+        public virtual DbSet<ToChargeBackRecord> ToChargeBackRecord { get; set; }
         public virtual DbSet<TradeDaySummary> TradeDaySummary { get; set; }
         public virtual DbSet<TradeRecord> TradeRecord { get; set; }
         public virtual DbSet<TradeRecordTest> TradeRecordTest { get; set; }
@@ -2734,7 +2739,7 @@ namespace MySystem.PxcModels
 
             modelBuilder.Entity<FluxProfitDetail>(entity =>
             {
-                entity.HasIndex(e => e.SnNo)
+                entity.HasIndex(e => new { e.SnNo, e.MerNo })
                     .HasName("FluxProfitDetailIndex");
 
                 entity.Property(e => e.Id).HasColumnType("int(11)");
@@ -3155,6 +3160,9 @@ namespace MySystem.PxcModels
 
             modelBuilder.Entity<HelpProfitMerTradeMonthSummay>(entity =>
             {
+                entity.HasIndex(e => new { e.MerchantId, e.TradeMonth })
+                    .HasName("HelpProfitMerTradeMonthSummayIndex");
+
                 entity.Property(e => e.Id).HasColumnType("int(11)");
 
                 entity.Property(e => e.BrandId).HasColumnType("int(11)");
@@ -4052,6 +4060,40 @@ namespace MySystem.PxcModels
                 entity.Property(e => e.UserId).HasColumnType("int(11)");
             });
 
+            modelBuilder.Entity<Leaders>(entity =>
+            {
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.CreateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.LeaderLevel).HasColumnType("int(11)");
+
+                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");
+
+                entity.Property(e => e.UserId).HasColumnType("int(11)");
+            });
+
             modelBuilder.Entity<MachineApply>(entity =>
             {
                 entity.Property(e => e.Id).HasColumnType("int(11)");
@@ -4122,6 +4164,8 @@ namespace MySystem.PxcModels
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.OperateId).HasColumnType("int(11)");
+
                 entity.Property(e => e.OrderExpand)
                     .HasColumnType("mediumtext")
                     .HasCharSet("utf8")
@@ -7816,6 +7860,8 @@ namespace MySystem.PxcModels
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.OpId).HasColumnType("int(11)");
+
                 entity.Property(e => e.OrderNo)
                     .HasColumnType("varchar(30)")
                     .HasCharSet("utf8")
@@ -8237,6 +8283,8 @@ namespace MySystem.PxcModels
 
                 entity.Property(e => e.FromUserId).HasColumnType("int(11)");
 
+                entity.Property(e => e.OpId).HasColumnType("int(11)");
+
                 entity.Property(e => e.OrderNo)
                     .HasColumnType("varchar(50)")
                     .HasCharSet("utf8")
@@ -8299,6 +8347,8 @@ namespace MySystem.PxcModels
 
                 entity.Property(e => e.LeaderUserId).HasColumnType("int(11)");
 
+                entity.Property(e => e.OpId).HasColumnType("int(11)");
+
                 entity.Property(e => e.QueryCount).HasColumnType("int(11)");
 
                 entity.Property(e => e.SeoDescription)
@@ -8586,6 +8636,14 @@ namespace MySystem.PxcModels
 
                 entity.Property(e => e.LeaderUserId).HasColumnType("int(11)");
 
+                entity.Property(e => e.OpId).HasColumnType("int(11)");
+
+                entity.Property(e => e.OpReserve1).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.OpReserve2).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.OpReserve3).HasColumnType("decimal(18,2)");
+
                 entity.Property(e => e.OrderId).HasColumnType("int(11)");
 
                 entity.Property(e => e.PosSn)
@@ -8608,6 +8666,10 @@ namespace MySystem.PxcModels
 
                 entity.Property(e => e.RecycEndDate).HasColumnType("datetime");
 
+                entity.Property(e => e.RecycStartDate).HasColumnType("datetime");
+
+                entity.Property(e => e.RecycStatus).HasColumnType("int(11)");
+
                 entity.Property(e => e.ScanQrTrade).HasColumnType("decimal(18,2)");
 
                 entity.Property(e => e.SeoDescription)
@@ -8627,6 +8689,11 @@ namespace MySystem.PxcModels
 
                 entity.Property(e => e.Sort).HasColumnType("int(11)");
 
+                entity.Property(e => e.SourcePosSn)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
                 entity.Property(e => e.SourceStoreId).HasColumnType("int(11)");
 
                 entity.Property(e => e.Status).HasColumnType("int(11)");
@@ -8777,6 +8844,10 @@ namespace MySystem.PxcModels
 
                 entity.Property(e => e.Sort).HasColumnType("int(11)");
 
+                entity.Property(e => e.StandardMonths).HasColumnType("int(11)");
+
+                entity.Property(e => e.StandardStatus).HasColumnType("int(11)");
+
                 entity.Property(e => e.Status).HasColumnType("int(11)");
 
                 entity.Property(e => e.TopUserId).HasColumnType("int(11)");
@@ -8995,6 +9066,52 @@ namespace MySystem.PxcModels
                 entity.Property(e => e.UpdateDate).HasColumnType("datetime");
             });
 
+            modelBuilder.Entity<PreAmountRecord>(entity =>
+            {
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.AfterAmount).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.AmountType).HasColumnType("int(11)");
+
+                entity.Property(e => e.ApplyId).HasColumnType("int(11)");
+
+                entity.Property(e => e.BeforeAmount).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.CreateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.OperateType).HasColumnType("int(11)");
+
+                entity.Property(e => e.PayMode).HasColumnType("int(11)");
+
+                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");
+
+                entity.Property(e => e.UseAmount).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.UserId).HasColumnType("int(11)");
+            });
+
             modelBuilder.Entity<PreSendStockDetail>(entity =>
             {
                 entity.Property(e => e.Id).HasColumnType("int(11)");
@@ -10754,8 +10871,12 @@ namespace MySystem.PxcModels
 
                 entity.Property(e => e.ProfitCreditProfitRate).HasColumnType("decimal(18,2)");
 
+                entity.Property(e => e.ProfitCreditTradeAmt).HasColumnType("decimal(18,2)");
+
                 entity.Property(e => e.ProfitCreditTradeProfit).HasColumnType("decimal(18,2)");
 
+                entity.Property(e => e.ProfitDebitNonCapTradeAmt).HasColumnType("decimal(18,2)");
+
                 entity.Property(e => e.ProfitDebitNonTradeCapProfit).HasColumnType("decimal(18,2)");
 
                 entity.Property(e => e.ProfitDebitProfitRate).HasColumnType("decimal(18,2)");
@@ -11510,6 +11631,106 @@ namespace MySystem.PxcModels
                 entity.Property(e => e.UserId).HasColumnType("int(11)");
             });
 
+            modelBuilder.Entity<RecycMachineOrder>(entity =>
+            {
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.BrandId).HasColumnType("int(11)");
+
+                entity.Property(e => e.CancelDate).HasColumnType("datetime");
+
+                entity.Property(e => e.CreateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.ErpCode)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.ErpName)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.PostType).HasColumnType("int(11)");
+
+                entity.Property(e => e.QueryCount).HasColumnType("int(11)");
+
+                entity.Property(e => e.RecycOrderNo)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.RecycStoreId).HasColumnType("int(11)");
+
+                entity.Property(e => e.ResultDate).HasColumnType("datetime");
+
+                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");
+
+                entity.Property(e => e.UserId).HasColumnType("int(11)");
+            });
+
+            modelBuilder.Entity<RecycMachineOrderPos>(entity =>
+            {
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.BrandId).HasColumnType("int(11)");
+
+                entity.Property(e => e.CancelDate).HasColumnType("datetime");
+
+                entity.Property(e => e.CreateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.OrderId).HasColumnType("int(11)");
+
+                entity.Property(e => e.QueryCount).HasColumnType("int(11)");
+
+                entity.Property(e => e.ResultDate).HasColumnType("datetime");
+
+                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(50)")
+                    .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<RightDic>(entity =>
             {
                 entity.Property(e => e.Id)
@@ -12231,6 +12452,8 @@ namespace MySystem.PxcModels
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.OpId).HasColumnType("int(11)");
+
                 entity.Property(e => e.OpStoreNum).HasColumnType("int(11)");
 
                 entity.Property(e => e.OpSymbol)
@@ -12328,6 +12551,8 @@ namespace MySystem.PxcModels
 
                 entity.Property(e => e.FromUserId).HasColumnType("int(11)");
 
+                entity.Property(e => e.OpId).HasColumnType("int(11)");
+
                 entity.Property(e => e.QueryCount).HasColumnType("int(11)");
 
                 entity.Property(e => e.SeoDescription)
@@ -12445,6 +12670,13 @@ namespace MySystem.PxcModels
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.Deposit).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.FilePath)
+                    .HasColumnType("varchar(200)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
                 entity.Property(e => e.LaveNum).HasColumnType("int(11)");
 
                 entity.Property(e => e.LimitTopUserId)
@@ -12464,6 +12696,8 @@ namespace MySystem.PxcModels
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.OpId).HasColumnType("int(11)");
+
                 entity.Property(e => e.OutNum).HasColumnType("int(11)");
 
                 entity.Property(e => e.ParentNav)
@@ -12520,6 +12754,8 @@ namespace MySystem.PxcModels
 
                 entity.Property(e => e.StoreType).HasColumnType("int(11)");
 
+                entity.Property(e => e.ThisMonthSendCount).HasColumnType("int(11)");
+
                 entity.Property(e => e.TotalNum).HasColumnType("int(11)");
 
                 entity.Property(e => e.UpdateDate).HasColumnType("datetime");
@@ -12907,6 +13143,8 @@ namespace MySystem.PxcModels
 
                 entity.Property(e => e.FromUserId).HasColumnType("int(11)");
 
+                entity.Property(e => e.OpId).HasColumnType("int(11)");
+
                 entity.Property(e => e.ProductName)
                     .HasColumnType("varchar(32)")
                     .HasCharSet("utf8")
@@ -14046,6 +14284,52 @@ namespace MySystem.PxcModels
                     .HasCollation("latin1_swedish_ci");
             });
 
+            modelBuilder.Entity<ToChargeBackRecord>(entity =>
+            {
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.ChargeAmount).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.ChargeType).HasColumnType("int(11)");
+
+                entity.Property(e => e.CreateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.Field1)
+                    .HasColumnType("varchar(200)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.QueryCount).HasColumnType("int(11)");
+
+                entity.Property(e => e.Remark)
+                    .HasColumnType("varchar(500)")
+                    .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.UpdateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.UserId).HasColumnType("int(11)");
+            });
+
             modelBuilder.Entity<TradeDaySummary>(entity =>
             {
                 entity.HasIndex(e => new { e.UserId, e.TradeMonth, e.TradeDate, e.BrandId, e.QueryCount, e.VipFlag, e.PayType, e.SeoTitle })
@@ -14233,6 +14517,8 @@ namespace MySystem.PxcModels
             {
                 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)");
@@ -14534,6 +14820,10 @@ namespace MySystem.PxcModels
 
                 entity.Property(e => e.LockStatus).HasColumnType("int(11)");
 
+                entity.Property(e => e.PreTempAmount).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.PreTempAmountForBalance).HasColumnType("decimal(18,2)");
+
                 entity.Property(e => e.QueryCount).HasColumnType("int(11)");
 
                 entity.Property(e => e.SeoDescription)
@@ -14557,6 +14847,8 @@ namespace MySystem.PxcModels
 
                 entity.Property(e => e.Status).HasColumnType("int(11)");
 
+                entity.Property(e => e.StoreDeposit).HasColumnType("decimal(18,2)");
+
                 entity.Property(e => e.TeamTotalOverProfit).HasColumnType("decimal(18,2)");
 
                 entity.Property(e => e.TeamTotalProfit).HasColumnType("decimal(18,2)");
@@ -14569,6 +14861,8 @@ namespace MySystem.PxcModels
 
                 entity.Property(e => e.ThisMonthPreAmount).HasColumnType("decimal(18,2)");
 
+                entity.Property(e => e.ToChargeAmount).HasColumnType("decimal(18,2)");
+
                 entity.Property(e => e.TotalAmount).HasColumnType("decimal(18,2)");
 
                 entity.Property(e => e.TotalOverProfit).HasColumnType("decimal(18,2)");
@@ -14601,7 +14895,7 @@ namespace MySystem.PxcModels
 
             modelBuilder.Entity<UserAccountRecord>(entity =>
             {
-                entity.HasIndex(e => e.UserId)
+                entity.HasIndex(e => new { e.UserId, e.ChangeType })
                     .HasName("UserAccountRecordIndex");
 
                 entity.Property(e => e.Id).HasColumnType("int(11)");
@@ -17215,6 +17509,8 @@ namespace MySystem.PxcModels
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.CreateStoreDate).HasColumnType("datetime");
+
                 entity.Property(e => e.DeviceId)
                     .HasColumnType("varchar(128)")
                     .HasCharSet("utf8")
@@ -17267,6 +17563,10 @@ namespace MySystem.PxcModels
                     .HasColumnType("bit(1)")
                     .HasDefaultValueSql("b'0'");
 
+                entity.Property(e => e.IsSign)
+                    .HasColumnType("bit(1)")
+                    .HasDefaultValueSql("b'0'");
+
                 entity.Property(e => e.LeaderLevel).HasColumnType("int(11)");
 
                 entity.Property(e => e.LockStatus)
@@ -17395,20 +17695,31 @@ namespace MySystem.PxcModels
 
                 entity.Property(e => e.Sex).HasColumnType("int(11)");
 
+                entity.Property(e => e.SignDate).HasColumnType("datetime");
+
                 entity.Property(e => e.SignImgUrl)
                     .HasColumnType("varchar(200)")
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.SignPic)
+                    .HasColumnType("varchar(200)")
+                    .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.StoreStock).HasColumnType("int(11)");
+
                 entity.Property(e => e.Tags)
                     .HasColumnType("varchar(200)")
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.ThisMonthSend).HasColumnType("int(11)");
+
                 entity.Property(e => e.ThisMonthTrade).HasColumnType("decimal(18,2)");
 
                 entity.Property(e => e.UpdateDate).HasColumnType("datetime");