交易记录入库，增加会员VIP和支付方式两个字段

AppStart/Helper/StatService.cs

@@ -1216,7 +1216,7 @@ namespace MySystem
                     int UserId = int.Parse(userDr["Id"].ToString());
                     string ParentNav = userDr["ParentNav"].ToString();
                     function.WriteLog(UserId + ":" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff") + "\n\n", "执行昨天交易额日志");
-                    DataTable selfdt = OtherMySqlConn.dtable("select BrandId,BankCardType,QrPayFlag,MerHelpFlag,CapFlag,sum(TradeAmount),count(Id) from TradeRecord where Id>=" + startId + " and CreateDate>='" + start + "' and CreateDate<'" + end + "' and UserId=" + UserId + " group by BrandId,BankCardType,QrPayFlag,MerHelpFlag,CapFlag");
+                    DataTable selfdt = OtherMySqlConn.dtable("select BrandId,BankCardType,QrPayFlag,MerHelpFlag,CapFlag,VipFlag,PayType,sum(TradeAmount),count(Id) from TradeRecord where Id>=" + startId + " and CreateDate>='" + start + "' and CreateDate<'" + end + "' and UserId=" + UserId + " group by BrandId,BankCardType,QrPayFlag,MerHelpFlag,CapFlag,VipFlag,PayType");
                     function.WriteLog(UserId + ":" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff") + "\n\n", "执行昨天交易额日志");
                     foreach (DataRow selfDr in selfdt.Rows)
                     {
@@ -1225,9 +1225,11 @@ namespace MySystem
                         int QrPayFlag = int.Parse(selfDr["QrPayFlag"].ToString());
                         int MerHelpFlag = int.Parse(selfDr["MerHelpFlag"].ToString());
                         int CapFlag = int.Parse(selfDr["CapFlag"].ToString());
-                        decimal TradeAmount = decimal.Parse(selfDr[5].ToString());
-                        int TradeCount = int.Parse(selfDr[6].ToString());
-                        TradeDaySummary selfStat = db.TradeDaySummary.FirstOrDefault(m => m.UserId == UserId && m.TradeMonth == TradeMonth && m.TradeDate == TradeDate && m.BrandId == BrandId && m.QueryCount == QrPayFlag && m.SeoTitle == "self");
+                        int VipFlag = int.Parse(selfDr["VipFlag"].ToString());
+                        int PayType = int.Parse(selfDr["PayType"].ToString());
+                        decimal TradeAmount = decimal.Parse(selfDr[7].ToString());
+                        int TradeCount = int.Parse(selfDr[8].ToString());
+                        TradeDaySummary selfStat = db.TradeDaySummary.FirstOrDefault(m => m.UserId == UserId && m.TradeMonth == TradeMonth && m.TradeDate == TradeDate && m.BrandId == BrandId && m.QueryCount == QrPayFlag && m.VipFlag == VipFlag && m.PayType == PayType && m.SeoTitle == "self");
                         if (selfStat == null)
                         {
                             selfStat = db.TradeDaySummary.Add(new TradeDaySummary()
@@ -1237,6 +1239,8 @@ namespace MySystem
                                 TradeDate = TradeDate,
                                 BrandId = BrandId,
                                 QueryCount = QrPayFlag,
+                                VipFlag = VipFlag,
+                                PayType = PayType,
                                 SeoTitle = "self",
                             }).Entity;
                             db.SaveChanges();
@@ -1286,7 +1290,7 @@ namespace MySystem
                                 uids.Add(NavUserIdString + start);
                                 int NavUserId = int.Parse(NavUserIdString);
                                 function.WriteLog(NavUserId + ":team:" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff") + "\n\n", "执行昨天交易额日志");
-                                DataTable teamDt = OtherMySqlConn.dtable("select BrandId,BankCardType,QrPayFlag,MerHelpFlag,CapFlag,sum(TradeAmount),count(Id) from TradeRecord where Id>=" + startId + " and CreateDate>='" + start + "' and CreateDate<'" + end + "' and UserId in (select Id from Users where ParentNav like '%," + NavUserId + ",%' or Id=" + NavUserId + ") group by BrandId,BankCardType,QrPayFlag,MerHelpFlag,CapFlag");
+                                DataTable teamDt = OtherMySqlConn.dtable("select BrandId,BankCardType,QrPayFlag,MerHelpFlag,CapFlag,VipFlag,PayType,sum(TradeAmount),count(Id) from TradeRecord where Id>=" + startId + " and CreateDate>='" + start + "' and CreateDate<'" + end + "' and UserId in (select Id from Users where ParentNav like '%," + NavUserId + ",%' or Id=" + NavUserId + ") group by BrandId,BankCardType,QrPayFlag,MerHelpFlag,CapFlag,VipFlag,PayType");
                                 function.WriteLog(NavUserId + ":team:" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff") + "\n\n", "执行昨天交易额日志");
                                 foreach (DataRow teamDr in teamDt.Rows)
                                 {
@@ -1295,9 +1299,11 @@ namespace MySystem
                                     int QrPayFlag = int.Parse(teamDr["QrPayFlag"].ToString());
                                     int MerHelpFlag = int.Parse(teamDr["MerHelpFlag"].ToString());
                                     int CapFlag = int.Parse(teamDr["CapFlag"].ToString());
-                                    decimal TradeAmount = decimal.Parse(teamDr[5].ToString());
-                                    int TradeCount = int.Parse(teamDr[6].ToString());
-                                    TradeDaySummary teamStat = db.TradeDaySummary.FirstOrDefault(m => m.UserId == NavUserId && m.TradeMonth == TradeMonth && m.TradeDate == TradeDate && m.BrandId == BrandId && m.QueryCount == QrPayFlag && m.SeoTitle == "team");
+                                    int VipFlag = int.Parse(teamDr["VipFlag"].ToString());
+                                    int PayType = int.Parse(teamDr["PayType"].ToString());
+                                    decimal TradeAmount = decimal.Parse(teamDr[7].ToString());
+                                    int TradeCount = int.Parse(teamDr[8].ToString());
+                                    TradeDaySummary teamStat = db.TradeDaySummary.FirstOrDefault(m => m.UserId == NavUserId && m.TradeMonth == TradeMonth && m.TradeDate == TradeDate && m.BrandId == BrandId && m.QueryCount == QrPayFlag && m.VipFlag == VipFlag && m.PayType == PayType && m.SeoTitle == "team");
                                     if (teamStat == null)
                                     {
                                         teamStat = db.TradeDaySummary.Add(new TradeDaySummary()
@@ -1307,6 +1313,8 @@ namespace MySystem
                                             TradeDate = TradeDate,
                                             BrandId = BrandId,
                                             QueryCount = QrPayFlag,
+                                            VipFlag = VipFlag,
+                                            PayType = PayType,
                                             SeoTitle = "team",
                                         }).Entity;
                                         db.SaveChanges();

AppStart/Helper/SycnSpServer/SycnSpTradeService.cs

@@ -90,11 +90,15 @@ namespace MySystem
                                         decimal TradeAmount = trade.TradeAmount;
                                         int BankCardType = -1;
                                         int QrPayFlag = 0;
+                                        int VipFlag = 0;
+                                        int PayType = 0;
                                         if (pos.BrandId == 1 || pos.BrandId == 3)
                                         {
                                             TradeAmount = TradeAmount / 100;
                                             BankCardType = int.Parse(trade.BankCardType);
                                             if (trade.TradeType == "02") QrPayFlag = 1;
+                                            else if (trade.TradeType == "NQ") PayType = 1;
+                                            if (trade.SettleMethod == "E") VipFlag = 1;
                                         }
                                         else if (pos.BrandId == 2)
                                         {
@@ -120,6 +124,7 @@ namespace MySystem
                                                 BankCardType = 0;
                                             }
                                             if (trade.TradeType == "200") QrPayFlag = 1;
+                                            if (trade.Field1 == "1") VipFlag = 1;
                                         }
                                         else if (pos.BrandId == 6)
                                         {
@@ -201,6 +206,8 @@ namespace MySystem
                                                 BankCardType = BankCardType, //银行卡类型
                                                 QrPayFlag = QrPayFlag, //云闪付标识
                                                 CapFlag = CapFlag, //借记卡是否封顶
+                                                VipFlag = VipFlag, //会员标记
+                                                PayType = PayType, //支付方式
                                                 BrandId = BrandId, //品牌
                                                 Remark = trade.Remark, //备注
                                                 TopUserId = TopUserId, //顶级创客

Models/ActivityRedPackageJoins.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models
+{
+    public partial class ActivityRedPackageJoins
+    {
+        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 decimal PrizeAmt { get; set; }
+        public string ActivityDate { get; set; }
+        public int UserId { get; set; }
+    }
+}

Models/ActivityRedPackageJoinss.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models
+{
+    public partial class ActivityRedPackageJoinss
+    {
+        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 decimal PrizeAmt { get; set; }
+        public string ActivityDate { get; set; }
+        public int UserId { get; set; }
+    }
+}

Models/ActivityRedPackageStock.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models
+{
+    public partial class ActivityRedPackageStock
+    {
+        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 string ActivityDate { get; set; }
+        public decimal PrizeAmt { get; set; }
+        public int UserId { get; set; }
+    }
+}

Models/ActivityRedPackageStocks.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models
+{
+    public partial class ActivityRedPackageStocks
+    {
+        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 string ActivityDate { get; set; }
+        public decimal PrizeAmt { get; set; }
+        public int UserId { get; set; }
+    }
+}

Models/ActivityRedPackageTop10.cs

@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models
+{
+    public partial class ActivityRedPackageTop10
+    {
+        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 Kind { get; set; }
+        public int TimeNum { get; set; }
+        public decimal PrizeAmt { get; set; }
+        public int UserId { get; set; }
+    }
+}

Models/ActivityRedPackageTop10s.cs

@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models
+{
+    public partial class ActivityRedPackageTop10s
+    {
+        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 Kind { get; set; }
+        public int TimeNum { get; set; }
+        public decimal PrizeAmt { get; set; }
+        public int UserId { get; set; }
+    }
+}

Models/AgentLevelSet.cs

@@ -9,14 +9,17 @@ namespace MySystem.Models
         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 decimal AreasProfitPercent { get; set; }
         public ulong LevelDiff { get; set; }
         public decimal ProfitPercent { get; set; }
         public string Name { get; set; }
-        public decimal AreasProfitPercent { get; set; }
     }
 }

Models/ConsumerOrders.cs

@@ -17,6 +17,8 @@ namespace MySystem.Models
         public string SeoTitle { get; set; }
         public string SeoKeyword { get; set; }
         public string SeoDescription { get; set; }
+        public decimal CurDivi { get; set; }
+        public decimal MaxDivi { get; set; }
         public string SnNo { get; set; }
         public decimal ReturnMoney { get; set; }
         public decimal PayMoney { get; set; }
@@ -24,8 +26,6 @@ namespace MySystem.Models
         public string OrderNo { get; set; }
         public int ConsumerId { get; set; }
         public int MerchantId { get; set; }
-        public decimal CurDivi { get; set; }
-        public decimal MaxDivi { get; set; }
         public ulong IsAct { get; set; }
     }
 }

Models/ConsumerProfit.cs

@@ -17,9 +17,9 @@ namespace MySystem.Models
         public string SeoTitle { get; set; }
         public string SeoKeyword { get; set; }
         public string SeoDescription { get; set; }
+        public int OrderId { get; set; }
         public decimal GetMoney { get; set; }
         public int MerchantId { get; set; }
         public int ConsumerId { get; set; }
-        public int OrderId { get; set; }
     }
 }

Models/Consumers.cs

@@ -17,6 +17,10 @@ namespace MySystem.Models
         public string SeoTitle { get; set; }
         public string SeoKeyword { get; set; }
         public string SeoDescription { get; set; }
+        public string WechatOpenId { get; set; }
+        public ulong CardFlag { get; set; }
+        public ulong AlipayFlag { get; set; }
+        public ulong WeChatPayFlag { get; set; }
         public DateTime? LastConsumDate { get; set; }
         public int TotalConsumCount { get; set; }
         public decimal TotalAmount { get; set; }
@@ -28,6 +32,5 @@ namespace MySystem.Models
         public string Mobile { get; set; }
         public string HeadPhoto { get; set; }
         public string NickName { get; set; }
-        public string WechatOpenId { get; set; }
     }
 }

Models/MachineForQrCode.cs

@@ -6,9 +6,9 @@ namespace MySystem.Models
     public partial class MachineForQrCode
     {
         public string DataId { get; set; }
-        public DateTime? BindDate { get; set; }
+        public int MerchantId { get; set; }
         public string MachineSnNo { get; set; }
         public string SnNo { get; set; }
-        public int MerchantId { get; set; }
+        public DateTime? BindDate { get; set; }
     }
 }

Models/MerchantAddInfo.cs

@@ -17,6 +17,12 @@ namespace MySystem.Models
         public string SeoTitle { get; set; }
         public string SeoKeyword { get; set; }
         public string SeoDescription { get; set; }
+        public DateTime? CardPeriodEnd { get; set; }
+        public DateTime? CardPeriodBegin { get; set; }
+        public string IdCardNumber { get; set; }
+        public string IdCardName { get; set; }
+        public string IdCardNational { get; set; }
+        public string IdCardCopy { get; set; }
         public string AuditDetail { get; set; }
         public string ApplymentState { get; set; }
         public string SignUrl { get; set; }
@@ -90,11 +96,5 @@ namespace MySystem.Models
         public string ContactIdNumber { get; set; }
         public string ContactName { get; set; }
         public string BusinessCode { get; set; }
-        public DateTime? CardPeriodEnd { get; set; }
-        public DateTime? CardPeriodBegin { get; set; }
-        public string IdCardNumber { get; set; }
-        public string IdCardName { get; set; }
-        public string IdCardNational { get; set; }
-        public string IdCardCopy { get; set; }
     }
 }

Models/MerchantDepositReturns.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models
+{
+    public partial class MerchantDepositReturns
+    {
+        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 UserId { get; set; }
+        public string OperateMan { get; set; }
+        public decimal ReturnAmount { get; set; }
+        public string AlipayAccountNo { get; set; }
+        public int MerchantId { get; set; }
+    }
+}

Models/MerchantInfo.cs

@@ -17,6 +17,13 @@ namespace MySystem.Models
         public string SeoTitle { get; set; }
         public string SeoKeyword { get; set; }
         public string SeoDescription { get; set; }
+        public string ParentUserNav { get; set; }
+        public int UserId { get; set; }
+        public DateTime? LastConsumeDate { get; set; }
+        public int TotalConsumeCount { get; set; }
+        public DateTime? LastAddConsumerDate { get; set; }
+        public decimal TotalActual { get; set; }
+        public string Logo { get; set; }
         public string LoginPwd { get; set; }
         public int TotalUser { get; set; }
         public int TotalCustomer { get; set; }
@@ -27,13 +34,6 @@ namespace MySystem.Models
         public string Areas { get; set; }
         public string Mobile { get; set; }
         public string Name { get; set; }
-        public string Logo { get; set; }
-        public decimal TotalActual { get; set; }
-        public DateTime? LastConsumeDate { get; set; }
-        public int TotalConsumeCount { get; set; }
-        public DateTime? LastAddConsumerDate { get; set; }
-        public string ParentUserNav { get; set; }
-        public int UserId { get; set; }
         public DateTime? BindDate { get; set; }
         public int BindStatus { get; set; }
         public DateTime? ActivationDate { get; set; }

Models/MerchantQrCode.cs

@@ -9,8 +9,11 @@ namespace MySystem.Models
         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; }

Models/PosCoupons.cs

@@ -19,5 +19,6 @@ namespace MySystem.Models
         public ulong IsUse { get; set; }
         public string ExchangeCode { get; set; }
         public int UserId { get; set; }
+        public int LeaderUserId { get; set; }
     }
 }

Models/PosMachinesTwo.cs

@@ -43,5 +43,7 @@ namespace MySystem.Models
         public string Detail { get; set; }
         public int ActivationState { get; set; }
         public int BindingState { get; set; }
+        public int LeaderUserId { get; set; }
+        public int PreUserId { get; set; }
     }
 }

Models/PreSendStockDetail.cs

@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models
+{
+    public partial class PreSendStockDetail
+    {
+        public int Id { get; set; }
+        public int Sort { get; set; }
+        public int QueryCount { get; set; }
+        public int Status { get; set; }
+        public int ReceivingStatus { get; set; }
+        public int IsUsed { 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 DateTime? CancelDate { get; set; }
+        public ulong CancelFlag { get; set; }
+        public int FromStoreId { get; set; }
+        public int FromUserId { get; set; }
+        public DateTime? ApplyDate { get; set; }
+        public ulong ApplyFlag { get; set; }
+        public int SourceStoreId { get; set; }
+        public string ToRemark { get; set; }
+        public int ToStoreId { get; set; }
+        public int ToUserId { get; set; }
+        public int SnId { get; set; }
+        public string SnNo { get; set; }
+        public int BrandId { get; set; }
+        public int StoreId { get; set; }
+    }
+}

Models/ProfitSubsidyDetail04.cs

@@ -0,0 +1,41 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models
+{
+    public partial class ProfitSubsidyDetail04
+    {
+        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 string Remark { get; set; }
+        public decimal SubsidyProfit { get; set; }
+        public decimal SubsidyProfitRate { get; set; }
+        public decimal CreditProfitRate { get; set; }
+        public decimal NonQrCreditTradeAmt { get; set; }
+        public decimal QrCreditTradeAmt { get; set; }
+        public decimal CreditTradeAmt { get; set; }
+        public int SubsidyType { get; set; }
+        public int SubsidyUserId { get; set; }
+        public ulong MerHelpFlag { get; set; }
+        public int BelongUserId { get; set; }
+        public DateTime? MerStandardDate { get; set; }
+        public DateTime? MerRegTime { get; set; }
+        public string SnNo { get; set; }
+        public string MerNo { get; set; }
+        public int MerchantId { get; set; }
+        public string TradeMonth { get; set; }
+        public string ProductName { get; set; }
+        public int BrandId { get; set; }
+        public string RecordNo { get; set; }
+    }
+}

Models/SetMerchantTypeRecord.cs

@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models
+{
+    public partial class SetMerchantTypeRecord
+    {
+        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 ulong IsRecyc { get; set; }
+        public decimal CreditAmount { get; set; }
+        public int PosSnType { get; set; }
+        public DateTime? ActDate { get; set; }
+        public DateTime? BindDate { get; set; }
+        public ulong ActStatus { get; set; }
+        public ulong BindStatus { get; set; }
+        public string MerNo { get; set; }
+        public string PosSn { get; set; }
+        public string Note { get; set; }
+        public int ToUserId { get; set; }
+        public int FromUserId { get; set; }
+    }
+}

Models/SmallStoreHouse.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models
+{
+    public partial class SmallStoreHouse
+    {
+        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 FromStoreId { get; set; }
+        public string Mobile { get; set; }
+        public string Remark { get; set; }
+        public int LaveNum { get; set; }
+        public int TotalNum { get; set; }
+        public string BrandId { get; set; }
+        public int UserId { get; set; }
+        public string StoreName { get; set; }
+        public string StoreNo { get; set; }
+    }
+}

Models/StoreMachineApply.cs

@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models
+{
+    public partial class StoreMachineApply
+    {
+        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 DateTime? ApplyTime { get; set; }
+        public int? BrandId { get; set; }
+        public string ApplyNo { get; set; }
+        public int? ApplyNum { get; set; }
+        public int? SendNum { get; set; }
+        public int? BoxNum { get; set; }
+        public int? LastApply { get; set; }
+        public int? MaxApply { get; set; }
+        public int? ActualApply { get; set; }
+        public int? UserId { get; set; }
+        public int? StoreId { get; set; }
+        public int? OrderId { get; set; }
+        public string SwapSnExpand { get; set; }
+    }
+}

Models/TradeDaySummary.cs

@@ -60,5 +60,7 @@ namespace MySystem.Models
         public string TradeMonth { get; set; }
         public string TradeDate { get; set; }
         public int UserId { get; set; }
+        public int PayType { get; set; }
+        public int VipFlag { get; set; }
     }
 }

Models/TradeRecord.cs

@@ -38,5 +38,7 @@ namespace MySystem.Models
         public int UserId { get; set; }
         public string RecordNo { get; set; }
         public string ParentNav { get; set; }
+        public int PayType { get; set; }
+        public int VipFlag { get; set; }
     }
 }

Models/UserAccount.cs

@@ -17,6 +17,12 @@ namespace MySystem.Models
         public string SeoTitle { get; set; }
         public string SeoKeyword { get; set; }
         public string SeoDescription { get; set; }
+        public decimal TotalOverProfit { get; set; }
+        public decimal TeamTotalServiceProfit { get; set; }
+        public decimal TeamTotalProfit { get; set; }
+        public decimal TeamTotalOverProfit { get; set; }
+        public decimal TotalServiceProfit { get; set; }
+        public decimal TotalProfit { get; set; }
         public decimal WithdrawAmount { get; set; }
         public int LockStatus { get; set; }
         public int AccountStatus { get; set; }
@@ -26,11 +32,5 @@ namespace MySystem.Models
         public int UserProperty { get; set; }
         public int UserType { get; set; }
         public int UserId { get; set; }
-        public decimal TotalOverProfit { get; set; }
-        public decimal TeamTotalServiceProfit { get; set; }
-        public decimal TeamTotalProfit { get; set; }
-        public decimal TeamTotalOverProfit { get; set; }
-        public decimal TotalServiceProfit { get; set; }
-        public decimal TotalProfit { get; set; }
     }
 }

Models/UserCardRecord.cs

@@ -17,8 +17,8 @@ namespace MySystem.Models
         public string SeoTitle { get; set; }
         public string SeoKeyword { get; set; }
         public string SeoDescription { get; set; }
+        public int MerchantId { get; set; }
         public int CardId { get; set; }
         public int ConsumerId { get; set; }
-        public int MerchantId { get; set; }
     }
 }

Models/Users.cs

@@ -17,6 +17,11 @@ namespace MySystem.Models
         public string SeoTitle { get; set; }
         public string SeoKeyword { get; set; }
         public string SeoDescription { get; set; }
+        public string AgentAreas { get; set; }
+        public int AgentLevel { get; set; }
+        public string SettleBankCardName { get; set; }
+        public DateTime? CertValidEndDate { get; set; }
+        public DateTime? CertValidStartDate { get; set; }
         public DateTime? CitySetDate { get; set; }
         public decimal ProfitRewardRate { get; set; }
         public decimal ActiveRewardAmount { get; set; }
@@ -74,10 +79,8 @@ namespace MySystem.Models
         public int Sex { get; set; }
         public string RealName { get; set; }
         public string NickName { get; set; }
-        public string SettleBankCardName { get; set; }
-        public DateTime? CertValidEndDate { get; set; }
-        public DateTime? CertValidStartDate { get; set; }
-        public string AgentAreas { get; set; }
-        public int AgentLevel { get; set; }
+        public int CashStatus { get; set; }
+        public string CashNote { get; set; }
+        public decimal ThisMonthTrade { get; set; }
     }
 }

PxcModels/ActivityRedPackageJoins.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class ActivityRedPackageJoins
+    {
+        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 decimal PrizeAmt { get; set; }
+        public string ActivityDate { get; set; }
+        public int UserId { get; set; }
+    }
+}

PxcModels/ActivityRedPackageJoinss.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class ActivityRedPackageJoinss
+    {
+        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 decimal PrizeAmt { get; set; }
+        public string ActivityDate { get; set; }
+        public int UserId { get; set; }
+    }
+}

PxcModels/ActivityRedPackageStock.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class ActivityRedPackageStock
+    {
+        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 string ActivityDate { get; set; }
+        public decimal PrizeAmt { get; set; }
+        public int UserId { get; set; }
+    }
+}

PxcModels/ActivityRedPackageStocks.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class ActivityRedPackageStocks
+    {
+        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 string ActivityDate { get; set; }
+        public decimal PrizeAmt { get; set; }
+        public int UserId { get; set; }
+    }
+}

PxcModels/ActivityRedPackageTop10.cs

@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class ActivityRedPackageTop10
+    {
+        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 Kind { get; set; }
+        public int TimeNum { get; set; }
+        public decimal PrizeAmt { get; set; }
+        public int UserId { get; set; }
+    }
+}

PxcModels/ActivityRedPackageTop10s.cs

@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class ActivityRedPackageTop10s
+    {
+        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 Kind { get; set; }
+        public int TimeNum { get; set; }
+        public decimal PrizeAmt { get; set; }
+        public int UserId { get; set; }
+    }
+}

PxcModels/MerchantDepositReturns.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class MerchantDepositReturns
+    {
+        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 UserId { get; set; }
+        public string OperateMan { get; set; }
+        public decimal ReturnAmount { get; set; }
+        public string AlipayAccountNo { get; set; }
+        public int MerchantId { get; set; }
+    }
+}

PxcModels/PosCoupons.cs

@@ -19,5 +19,6 @@ namespace MySystem.PxcModels
         public ulong IsUse { get; set; }
         public string ExchangeCode { get; set; }
         public int UserId { get; set; }
+        public int LeaderUserId { get; set; }
     }
 }

PxcModels/PosMachinesTwo.cs

@@ -43,5 +43,7 @@ namespace MySystem.PxcModels
         public string Detail { get; set; }
         public int ActivationState { get; set; }
         public int BindingState { get; set; }
+        public int LeaderUserId { get; set; }
+        public int PreUserId { get; set; }
     }
 }

PxcModels/PreSendStockDetail.cs

@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class PreSendStockDetail
+    {
+        public int Id { get; set; }
+        public int Sort { get; set; }
+        public int QueryCount { get; set; }
+        public int Status { get; set; }
+        public int ReceivingStatus { get; set; }
+        public int IsUsed { 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 DateTime? CancelDate { get; set; }
+        public ulong CancelFlag { get; set; }
+        public int FromStoreId { get; set; }
+        public int FromUserId { get; set; }
+        public DateTime? ApplyDate { get; set; }
+        public ulong ApplyFlag { get; set; }
+        public int SourceStoreId { get; set; }
+        public string ToRemark { get; set; }
+        public int ToStoreId { get; set; }
+        public int ToUserId { get; set; }
+        public int SnId { get; set; }
+        public string SnNo { get; set; }
+        public int BrandId { get; set; }
+        public int StoreId { get; set; }
+    }
+}

PxcModels/ProfitSubsidyDetail04.cs

@@ -0,0 +1,41 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class ProfitSubsidyDetail04
+    {
+        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 string Remark { get; set; }
+        public decimal SubsidyProfit { get; set; }
+        public decimal SubsidyProfitRate { get; set; }
+        public decimal CreditProfitRate { get; set; }
+        public decimal NonQrCreditTradeAmt { get; set; }
+        public decimal QrCreditTradeAmt { get; set; }
+        public decimal CreditTradeAmt { get; set; }
+        public int SubsidyType { get; set; }
+        public int SubsidyUserId { get; set; }
+        public ulong MerHelpFlag { get; set; }
+        public int BelongUserId { get; set; }
+        public DateTime? MerStandardDate { get; set; }
+        public DateTime? MerRegTime { get; set; }
+        public string SnNo { get; set; }
+        public string MerNo { get; set; }
+        public int MerchantId { get; set; }
+        public string TradeMonth { get; set; }
+        public string ProductName { get; set; }
+        public int BrandId { get; set; }
+        public string RecordNo { get; set; }
+    }
+}

PxcModels/SmallStoreHouse.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class SmallStoreHouse
+    {
+        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 FromStoreId { get; set; }
+        public string Mobile { get; set; }
+        public string Remark { get; set; }
+        public int LaveNum { get; set; }
+        public int TotalNum { get; set; }
+        public string BrandId { get; set; }
+        public int UserId { get; set; }
+        public string StoreName { get; set; }
+        public string StoreNo { get; set; }
+    }
+}

PxcModels/StoreMachineApply.cs

@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class StoreMachineApply
+    {
+        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 DateTime? ApplyTime { get; set; }
+        public int? BrandId { get; set; }
+        public string ApplyNo { get; set; }
+        public int? ApplyNum { get; set; }
+        public int? SendNum { get; set; }
+        public int? BoxNum { get; set; }
+        public int? LastApply { get; set; }
+        public int? MaxApply { get; set; }
+        public int? ActualApply { get; set; }
+        public int? UserId { get; set; }
+        public int? StoreId { get; set; }
+        public int? OrderId { get; set; }
+        public string SwapSnExpand { get; set; }
+    }
+}

PxcModels/TradeDaySummary.cs

@@ -60,5 +60,7 @@ namespace MySystem.PxcModels
         public string TradeMonth { get; set; }
         public string TradeDate { get; set; }
         public int UserId { get; set; }
+        public int PayType { get; set; }
+        public int VipFlag { get; set; }
     }
 }

PxcModels/TradeRecord.cs

@@ -38,5 +38,7 @@ namespace MySystem.PxcModels
         public int UserId { get; set; }
         public string RecordNo { get; set; }
         public string ParentNav { get; set; }
+        public int PayType { get; set; }
+        public int VipFlag { get; set; }
     }
 }

PxcModels/Users.cs

@@ -81,5 +81,6 @@ namespace MySystem.PxcModels
         public string NickName { get; set; }
         public int CashStatus { get; set; }
         public string CashNote { get; set; }
+        public decimal ThisMonthTrade { get; set; }
     }
 }

PxcModels/WebCMSEntities.cs

@@ -19,6 +19,12 @@ namespace MySystem.PxcModels
         public virtual DbSet<ActivityEnrolRecord> ActivityEnrolRecord { get; set; }
         public virtual DbSet<ActivityInfo> ActivityInfo { get; set; }
         public virtual DbSet<ActivityPrizeDetail> ActivityPrizeDetail { get; set; }
+        public virtual DbSet<ActivityRedPackageJoins> ActivityRedPackageJoins { get; set; }
+        public virtual DbSet<ActivityRedPackageJoinss> ActivityRedPackageJoinss { get; set; }
+        public virtual DbSet<ActivityRedPackageStock> ActivityRedPackageStock { get; set; }
+        public virtual DbSet<ActivityRedPackageStocks> ActivityRedPackageStocks { get; set; }
+        public virtual DbSet<ActivityRedPackageTop10> ActivityRedPackageTop10 { get; set; }
+        public virtual DbSet<ActivityRedPackageTop10s> ActivityRedPackageTop10s { get; set; }
         public virtual DbSet<Advertisment> Advertisment { get; set; }
         public virtual DbSet<AgentLevelSet> AgentLevelSet { get; set; }
         public virtual DbSet<AppBottomNavs> AppBottomNavs { get; set; }
@@ -62,6 +68,7 @@ namespace MySystem.PxcModels
         public virtual DbSet<MerchantClass> MerchantClass { get; set; }
         public virtual DbSet<MerchantCol> MerchantCol { get; set; }
         public virtual DbSet<MerchantComment> MerchantComment { get; set; }
+        public virtual DbSet<MerchantDepositReturns> MerchantDepositReturns { get; set; }
         public virtual DbSet<MerchantForCode> MerchantForCode { get; set; }
         public virtual DbSet<MerchantForMobile> MerchantForMobile { get; set; }
         public virtual DbSet<MerchantForName> MerchantForName { get; set; }
@@ -102,6 +109,7 @@ namespace MySystem.PxcModels
         public virtual DbSet<PosMerchantInfo> PosMerchantInfo { get; set; }
         public virtual DbSet<PosMerchantOtherInfo> PosMerchantOtherInfo { get; set; }
         public virtual DbSet<PosMerchantTradeSummay> PosMerchantTradeSummay { get; set; }
+        public virtual DbSet<PreSendStockDetail> PreSendStockDetail { get; set; }
         public virtual DbSet<ProductComment> ProductComment { get; set; }
         public virtual DbSet<ProductCommentAgree> ProductCommentAgree { get; set; }
         public virtual DbSet<ProductFareAreas> ProductFareAreas { get; set; }
@@ -128,6 +136,7 @@ namespace MySystem.PxcModels
         public virtual DbSet<ProfitRecord> ProfitRecord { get; set; }
         public virtual DbSet<ProfitRewardRecord> ProfitRewardRecord { get; set; }
         public virtual DbSet<ProfitSubsidyDetail> ProfitSubsidyDetail { get; set; }
+        public virtual DbSet<ProfitSubsidyDetail04> ProfitSubsidyDetail04 { get; set; }
         public virtual DbSet<PublicAccountSet> PublicAccountSet { get; set; }
         public virtual DbSet<PullNewAct> PullNewAct { get; set; }
         public virtual DbSet<PullNewDetail> PullNewDetail { get; set; }
@@ -135,11 +144,13 @@ namespace MySystem.PxcModels
         public virtual DbSet<RightDic> RightDic { get; set; }
         public virtual DbSet<ServiceCenter> ServiceCenter { get; set; }
         public virtual DbSet<SetMerchantTypeRecord> SetMerchantTypeRecord { get; set; }
+        public virtual DbSet<SmallStoreHouse> SmallStoreHouse { get; set; }
         public virtual DbSet<StoreBalance> StoreBalance { get; set; }
         public virtual DbSet<StoreChangeHistory> StoreChangeHistory { get; set; }
         public virtual DbSet<StoreForCode> StoreForCode { get; set; }
         public virtual DbSet<StoreForName> StoreForName { get; set; }
         public virtual DbSet<StoreHouse> StoreHouse { get; set; }
+        public virtual DbSet<StoreMachineApply> StoreMachineApply { get; set; }
         public virtual DbSet<StoreMallOrderSummary> StoreMallOrderSummary { get; set; }
         public virtual DbSet<StoreSnActivateSummary> StoreSnActivateSummary { get; set; }
         public virtual DbSet<StoreStockChange> StoreStockChange { get; set; }
@@ -572,6 +583,310 @@ namespace MySystem.PxcModels
                 entity.Property(e => e.Version).HasColumnType("int(11)");
             });
 
+            modelBuilder.Entity<ActivityRedPackageJoins>(entity =>
+            {
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.ActivityDate)
+                    .HasColumnType("varchar(8)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                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.PrizeAmt).HasColumnType("decimal(18,2)");
+
+                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.UpdateMan)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.UserId).HasColumnType("int(11)");
+
+                entity.Property(e => e.Version).HasColumnType("int(11)");
+            });
+
+            modelBuilder.Entity<ActivityRedPackageJoinss>(entity =>
+            {
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.ActivityDate)
+                    .HasColumnType("varchar(8)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                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.PrizeAmt).HasColumnType("decimal(18,2)");
+
+                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.UpdateMan)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.UserId).HasColumnType("int(11)");
+
+                entity.Property(e => e.Version).HasColumnType("int(11)");
+            });
+
+            modelBuilder.Entity<ActivityRedPackageStock>(entity =>
+            {
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.ActivityDate)
+                    .HasColumnType("varchar(8)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                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.PrizeAmt).HasColumnType("decimal(18,2)");
+
+                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.UpdateMan)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.UserId).HasColumnType("int(11)");
+
+                entity.Property(e => e.Version).HasColumnType("int(11)");
+            });
+
+            modelBuilder.Entity<ActivityRedPackageStocks>(entity =>
+            {
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.ActivityDate)
+                    .HasColumnType("varchar(8)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                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.PrizeAmt).HasColumnType("decimal(18,2)");
+
+                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.UpdateMan)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.UserId).HasColumnType("int(11)");
+
+                entity.Property(e => e.Version).HasColumnType("int(11)");
+            });
+
+            modelBuilder.Entity<ActivityRedPackageTop10>(entity =>
+            {
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                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.Kind).HasColumnType("int(11)");
+
+                entity.Property(e => e.PrizeAmt).HasColumnType("decimal(18,2)");
+
+                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.TimeNum).HasColumnType("int(11)");
+
+                entity.Property(e => e.UpdateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.UpdateMan)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.UserId).HasColumnType("int(11)");
+
+                entity.Property(e => e.Version).HasColumnType("int(11)");
+            });
+
+            modelBuilder.Entity<ActivityRedPackageTop10s>(entity =>
+            {
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                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.Kind).HasColumnType("int(11)");
+
+                entity.Property(e => e.PrizeAmt).HasColumnType("decimal(18,2)");
+
+                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.TimeNum).HasColumnType("int(11)");
+
+                entity.Property(e => e.UpdateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.UpdateMan)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.UserId).HasColumnType("int(11)");
+
+                entity.Property(e => e.Version).HasColumnType("int(11)");
+            });
+
             modelBuilder.Entity<Advertisment>(entity =>
             {
                 entity.Property(e => e.Id).HasColumnType("int(11)");
@@ -3941,6 +4256,52 @@ namespace MySystem.PxcModels
                 entity.Property(e => e.Version).HasColumnType("int(11)");
             });
 
+            modelBuilder.Entity<MerchantDepositReturns>(entity =>
+            {
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.AlipayAccountNo)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.CreateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.MerchantId).HasColumnType("int(11)");
+
+                entity.Property(e => e.OperateMan)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.QueryCount).HasColumnType("int(11)");
+
+                entity.Property(e => e.ReturnAmount).HasColumnType("decimal(18,2)");
+
+                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<MerchantForCode>(entity =>
             {
                 entity.HasKey(e => e.Code)
@@ -6369,6 +6730,8 @@ namespace MySystem.PxcModels
                     .HasColumnType("bit(1)")
                     .HasDefaultValueSql("b'0'");
 
+                entity.Property(e => e.LeaderUserId).HasColumnType("int(11)");
+
                 entity.Property(e => e.QueryCount).HasColumnType("int(11)");
 
                 entity.Property(e => e.SeoDescription)
@@ -6588,6 +6951,8 @@ namespace MySystem.PxcModels
                     .HasColumnType("bit(1)")
                     .HasDefaultValueSql("b'0'");
 
+                entity.Property(e => e.LeaderUserId).HasColumnType("int(11)");
+
                 entity.Property(e => e.OrderId).HasColumnType("int(11)");
 
                 entity.Property(e => e.PosSn)
@@ -6597,6 +6962,8 @@ namespace MySystem.PxcModels
 
                 entity.Property(e => e.PosSnType).HasColumnType("int(11)");
 
+                entity.Property(e => e.PreUserId).HasColumnType("int(11)");
+
                 entity.Property(e => e.PrizeParams)
                     .HasColumnType("varchar(200)")
                     .HasCharSet("utf8")
@@ -6836,17 +7203,89 @@ namespace MySystem.PxcModels
 
                 entity.Property(e => e.Status).HasColumnType("int(11)");
 
-                entity.Property(e => e.TradeAmount).HasColumnType("decimal(18,2)");
+                entity.Property(e => e.TradeAmount).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.TradeDate)
+                    .HasColumnType("varchar(8)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.TradeMonth)
+                    .HasColumnType("varchar(6)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.UpdateDate).HasColumnType("datetime");
+            });
+
+            modelBuilder.Entity<PreSendStockDetail>(entity =>
+            {
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.ApplyDate).HasColumnType("datetime");
+
+                entity.Property(e => e.ApplyFlag)
+                    .HasColumnType("bit(1)")
+                    .HasDefaultValueSql("b'0'");
+
+                entity.Property(e => e.BrandId).HasColumnType("int(11)");
+
+                entity.Property(e => e.CancelDate).HasColumnType("datetime");
+
+                entity.Property(e => e.CancelFlag)
+                    .HasColumnType("bit(1)")
+                    .HasDefaultValueSql("b'0'");
+
+                entity.Property(e => e.CreateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.FromStoreId).HasColumnType("int(11)");
+
+                entity.Property(e => e.FromUserId).HasColumnType("int(11)");
+
+                entity.Property(e => e.IsUsed).HasColumnType("int(11)");
+
+                entity.Property(e => e.QueryCount).HasColumnType("int(11)");
+
+                entity.Property(e => e.ReceivingStatus).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.SnId).HasColumnType("int(11)");
+
+                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.SourceStoreId).HasColumnType("int(11)");
+
+                entity.Property(e => e.Status).HasColumnType("int(11)");
+
+                entity.Property(e => e.StoreId).HasColumnType("int(11)");
 
-                entity.Property(e => e.TradeDate)
-                    .HasColumnType("varchar(8)")
+                entity.Property(e => e.ToRemark)
+                    .HasColumnType("varchar(64)")
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
-                entity.Property(e => e.TradeMonth)
-                    .HasColumnType("varchar(6)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
+                entity.Property(e => e.ToStoreId).HasColumnType("int(11)");
+
+                entity.Property(e => e.ToUserId).HasColumnType("int(11)");
 
                 entity.Property(e => e.UpdateDate).HasColumnType("datetime");
             });
@@ -8620,6 +9059,108 @@ namespace MySystem.PxcModels
                 entity.Property(e => e.Version).HasColumnType("int(11)");
             });
 
+            modelBuilder.Entity<ProfitSubsidyDetail04>(entity =>
+            {
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.BelongUserId).HasColumnType("int(11)");
+
+                entity.Property(e => e.BrandId).HasColumnType("int(11)");
+
+                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.CreditProfitRate).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.CreditTradeAmt).HasColumnType("decimal(18,2)");
+
+                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.MerRegTime).HasColumnType("datetime");
+
+                entity.Property(e => e.MerStandardDate).HasColumnType("datetime");
+
+                entity.Property(e => e.MerchantId).HasColumnType("int(11)");
+
+                entity.Property(e => e.NonQrCreditTradeAmt).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.ProductName)
+                    .HasColumnType("varchar(16)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.QrCreditTradeAmt).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.QueryCount).HasColumnType("int(11)");
+
+                entity.Property(e => e.RecordNo)
+                    .HasColumnType("varchar(32)")
+                    .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.SubsidyProfit).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.SubsidyProfitRate).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.SubsidyType).HasColumnType("int(11)");
+
+                entity.Property(e => e.SubsidyUserId).HasColumnType("int(11)");
+
+                entity.Property(e => e.TradeMonth)
+                    .HasColumnType("varchar(6)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.UpdateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.UpdateMan)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Version).HasColumnType("int(11)");
+            });
+
             modelBuilder.Entity<PublicAccountSet>(entity =>
             {
                 entity.Property(e => e.Id).HasColumnType("int(11)");
@@ -9196,6 +9737,69 @@ namespace MySystem.PxcModels
                 entity.Property(e => e.UpdateDate).HasColumnType("datetime");
             });
 
+            modelBuilder.Entity<SmallStoreHouse>(entity =>
+            {
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.BrandId)
+                    .HasColumnType("varchar(30)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.CreateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.FromStoreId).HasColumnType("int(11)");
+
+                entity.Property(e => e.LaveNum).HasColumnType("int(11)");
+
+                entity.Property(e => e.Mobile)
+                    .HasColumnType("varchar(11)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.QueryCount).HasColumnType("int(11)");
+
+                entity.Property(e => e.Remark)
+                    .HasColumnType("varchar(128)")
+                    .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.StoreName)
+                    .HasColumnType("varchar(32)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.StoreNo)
+                    .HasColumnType("varchar(16)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.TotalNum).HasColumnType("int(11)");
+
+                entity.Property(e => e.UpdateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.UserId).HasColumnType("int(11)");
+            });
+
             modelBuilder.Entity<StoreBalance>(entity =>
             {
                 entity.Property(e => e.Id).HasColumnType("int(11)");
@@ -9515,6 +10119,104 @@ namespace MySystem.PxcModels
                 entity.Property(e => e.Version).HasColumnType("int(11)");
             });
 
+            modelBuilder.Entity<StoreMachineApply>(entity =>
+            {
+                entity.HasComment("机具申请记录表");
+
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.ActualApply)
+                    .HasColumnType("int(11)")
+                    .HasComment("实际申请台数");
+
+                entity.Property(e => e.ApplyNo)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("申请单号")
+                    .HasCharSet("latin1")
+                    .HasCollation("latin1_swedish_ci");
+
+                entity.Property(e => e.ApplyNum)
+                    .HasColumnType("int(11)")
+                    .HasComment("申请箱数");
+
+                entity.Property(e => e.ApplyTime).HasColumnType("datetime");
+
+                entity.Property(e => e.BoxNum)
+                    .HasColumnType("int(11)")
+                    .HasComment("每箱台数");
+
+                entity.Property(e => e.BrandId)
+                    .HasColumnType("int(11)")
+                    .HasComment("产品Id");
+
+                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.LastApply)
+                    .HasColumnType("int(11)")
+                    .HasComment("上月申请台数");
+
+                entity.Property(e => e.MaxApply)
+                    .HasColumnType("int(11)")
+                    .HasComment("最多申请台数");
+
+                entity.Property(e => e.OrderId)
+                    .HasColumnType("int(11)")
+                    .HasComment("订单Id");
+
+                entity.Property(e => e.QueryCount).HasColumnType("int(11)");
+
+                entity.Property(e => e.SendNum)
+                    .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)");
+
+                entity.Property(e => e.Status).HasColumnType("int(11)");
+
+                entity.Property(e => e.StoreId)
+                    .HasColumnType("int(11)")
+                    .HasComment("仓库Id");
+
+                entity.Property(e => e.SwapSnExpand)
+                    .HasColumnType("mediumtext")
+                    .HasComment("已发货机具SN号")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.UpdateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.UpdateMan)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.UserId)
+                    .HasColumnType("int(11)")
+                    .HasComment("创客Id");
+
+                entity.Property(e => e.Version).HasColumnType("int(11)");
+            });
+
             modelBuilder.Entity<StoreMallOrderSummary>(entity =>
             {
                 entity.Property(e => e.Id).HasColumnType("int(11)");
@@ -10859,6 +11561,8 @@ namespace MySystem.PxcModels
 
                 entity.Property(e => e.NotHelpNonDirectTradeAmt).HasColumnType("decimal(18,2)");
 
+                entity.Property(e => e.PayType).HasColumnType("int(11)");
+
                 entity.Property(e => e.QueryCount).HasColumnType("int(11)");
 
                 entity.Property(e => e.SeoDescription)
@@ -10902,6 +11606,8 @@ namespace MySystem.PxcModels
                 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<TradeRecord>(entity =>
@@ -10949,6 +11655,8 @@ namespace MySystem.PxcModels
                     .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)");
@@ -11008,6 +11716,8 @@ namespace MySystem.PxcModels
                 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<TradeRecordTest>(entity =>
@@ -13830,7 +14540,7 @@ namespace MySystem.PxcModels
                     .HasCollation("utf8_general_ci");
 
                 entity.Property(e => e.CertId)
-                    .HasColumnType("varchar(18)")
+                    .HasColumnType("varchar(30)")
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
@@ -13914,7 +14624,7 @@ namespace MySystem.PxcModels
                 entity.Property(e => e.MerchantType).HasColumnType("int(11)");
 
                 entity.Property(e => e.Mobile)
-                    .HasColumnType("varchar(11)")
+                    .HasColumnType("varchar(15)")
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
@@ -14033,6 +14743,8 @@ namespace MySystem.PxcModels
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.ThisMonthTrade).HasColumnType("decimal(18,2)");
+
                 entity.Property(e => e.UpdateDate).HasColumnType("datetime");
 
                 entity.Property(e => e.UpdateMan)

Startup.cs

@@ -231,7 +231,7 @@ namespace MySystem
 
             // StatService.Instance.StartPosActNum(); //实时统计激活数
             // StatService.Instance.StartNewUserNum(); //实时统计新增创客数
-            // StatService.Instance.StartEverDay("");
+            StatService.Instance.StartEverDay("");
             // StatService.Instance.StatProfit("");
             // StatService.Instance.StatUserLevel();
             // ProfitHelper.Instance.StatProfit("202205"); //统计分润