同步main数据库模型

增加生成红包算法

AppStart/Timer/RedPackageHelper.cs

@@ -0,0 +1,95 @@
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Linq;
+using System.Data;
+using MySystem;
+using MySystem.PxcModels;
+using Library;
+
+public class RedPackageHelper
+{
+    public readonly static RedPackageHelper Instance = new RedPackageHelper();
+    private RedPackageHelper()
+    {
+    }
+
+    public void Start()
+    {
+        Thread th = new Thread(DoWorks);
+        th.IsBackground = true;
+        th.Start();
+    }
+
+    private void DoWorks()
+    {
+        while (true)
+        {
+            if (DateTime.Now.Hour >= 3 && DateTime.Now.Hour <= 5)
+            {
+                string ActivityDate = DateTime.Now.ToString("yyyyMMdd");
+                string check = function.ReadInstance("/Activity/RedPackage/" + ActivityDate + ".txt");
+                if (string.IsNullOrEmpty(check))
+                {
+                    function.WritePage("/Activity/RedPackage/", ActivityDate + ".txt", DateTime.Now.ToString());
+                    function.WriteLog(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff"), "生成指定未领取红包日志");
+                    WebCMSEntities db = new WebCMSEntities();
+                    try
+                    {
+                        decimal TotalPrize = 888.88M;
+                        DateTime start = DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd") + " 22:00:00");
+                        DateTime today = DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd") + " 00:00:00");
+                        string PreDate = DateTime.Now.AddDays(-1).ToString("yyyyMMdd");
+                        List<decimal> list = new List<decimal>();
+                        list.Add(88.88M);
+                        TotalPrize -= 88.88M;
+                        for (int i = 1; i < 300; i++)
+                        {
+                            list.Add(0.88M);
+                            TotalPrize -= 0.88M;
+                        }
+                        for (int i = 0; i < 100; i++)
+                        {
+                            if (TotalPrize > 0)
+                            {
+                                int BigPrize = function.get_Random(1, 300);
+                                decimal PrizeAmt = function.get_Random(88, 4000) / 100;
+                                if (TotalPrize > PrizeAmt)
+                                {
+                                    list[BigPrize] += PrizeAmt;
+                                    TotalPrize -= PrizeAmt;
+                                }
+                                else
+                                {
+                                    list[BigPrize] += TotalPrize;
+                                    TotalPrize = 0;
+                                }
+                            }
+                            else
+                            {
+                                break;
+                            }
+                        }
+                        foreach (decimal PrizeAmt in list)
+                        {
+                            db.ActivityRedPackageStock.Add(new ActivityRedPackageStock()
+                            {
+                                CreateDate = DateTime.Now,
+                                PrizeAmt = PrizeAmt,
+                                ActivityDate = ActivityDate,
+                            });
+                        }
+                        db.SaveChanges();
+                    }
+                    catch (Exception ex)
+                    {
+                        function.WriteLog(DateTime.Now.ToString() + "\n" + ex.ToString(), "生成指定未领取红包异常");
+                    }
+                    db.Dispose();
+                    function.WriteLog(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff") + "\n\n", "生成指定未领取红包日志");
+                }
+            }
+            Thread.Sleep(60000);
+        }
+    }
+}

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/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/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/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/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/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 uint? BrandId { get; set; }
+        public string ApplyNo { get; set; }
+        public uint? ApplyNum { get; set; }
+        public uint? SendNum { get; set; }
+        public uint? BoxNum { get; set; }
+        public uint? LastApply { get; set; }
+        public uint? MaxApply { get; set; }
+        public uint? ActualApply { get; set; }
+        public uint? UserId { get; set; }
+        public uint? StoreId { get; set; }
+        public uint? OrderId { get; set; }
+        public string SwapSnExpand { 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,7 @@ 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; }
     }
 }

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/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/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/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/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/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 uint? BrandId { get; set; }
+        public string ApplyNo { get; set; }
+        public uint? ApplyNum { get; set; }
+        public uint? SendNum { get; set; }
+        public uint? BoxNum { get; set; }
+        public uint? LastApply { get; set; }
+        public uint? MaxApply { get; set; }
+        public uint? ActualApply { get; set; }
+        public uint? UserId { get; set; }
+        public uint? StoreId { get; set; }
+        public uint? OrderId { get; set; }
+        public string SwapSnExpand { get; set; }
+    }
+}

PxcModels/WebCMSEntities.cs

@@ -19,6 +19,9 @@ 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<ActivityRedPackageStock> ActivityRedPackageStock { get; set; }
+        public virtual DbSet<ActivityRedPackageTop10> ActivityRedPackageTop10 { 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 +65,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; }
@@ -128,6 +132,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; }
@@ -140,6 +145,7 @@ namespace MySystem.PxcModels
         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 +578,158 @@ 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<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<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<Advertisment>(entity =>
             {
                 entity.Property(e => e.Id).HasColumnType("int(11)");
@@ -3941,6 +4099,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)
@@ -8620,6 +8824,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)");
@@ -9515,6 +9821,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) unsigned zerofill")
+                    .HasComment("实际申请台数");
+
+                entity.Property(e => e.ApplyNo)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("申请单号")
+                    .HasCharSet("latin1")
+                    .HasCollation("latin1_swedish_ci");
+
+                entity.Property(e => e.ApplyNum)
+                    .HasColumnType("int(11) unsigned zerofill")
+                    .HasComment("申请箱数");
+
+                entity.Property(e => e.ApplyTime).HasColumnType("datetime");
+
+                entity.Property(e => e.BoxNum)
+                    .HasColumnType("int(11) unsigned zerofill")
+                    .HasComment("每箱台数");
+
+                entity.Property(e => e.BrandId)
+                    .HasColumnType("int(11) unsigned zerofill")
+                    .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) unsigned zerofill")
+                    .HasComment("上月申请台数");
+
+                entity.Property(e => e.MaxApply)
+                    .HasColumnType("int(11) unsigned zerofill")
+                    .HasComment("最多申请台数");
+
+                entity.Property(e => e.OrderId)
+                    .HasColumnType("int(11) unsigned zerofill")
+                    .HasComment("订单Id");
+
+                entity.Property(e => e.QueryCount).HasColumnType("int(11)");
+
+                entity.Property(e => e.SendNum)
+                    .HasColumnType("int(11) unsigned zerofill")
+                    .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) unsigned zerofill")
+                    .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) unsigned zerofill")
+                    .HasComment("创客Id");
+
+                entity.Property(e => e.Version).HasColumnType("int(11)");
+            });
+
             modelBuilder.Entity<StoreMallOrderSummary>(entity =>
             {
                 entity.Property(e => e.Id).HasColumnType("int(11)");
@@ -13830,7 +14234,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 +14318,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");
 

Startup.cs

@@ -90,9 +90,9 @@ namespace MySystem
             // services.AddHostedService<PopService>();
             // services.AddHostedService<SycnSpTimer>(); //同步SP数据
 
-            services.AddHostedService<TimerStatTimer>(); //实时统计创客、激活商户数
-            services.AddHostedService<PosTradeStatTimer>(); // 统计头天的交易额、商户型创客、激活奖励、开机奖励
-            services.AddHostedService<AlipayPayBack2Timer>(); //支付宝回调处理
+            // services.AddHostedService<TimerStatTimer>(); //实时统计创客、激活商户数
+            // services.AddHostedService<PosTradeStatTimer>(); // 统计头天的交易额、商户型创客、激活奖励、开机奖励
+            // services.AddHostedService<AlipayPayBack2Timer>(); //支付宝回调处理
 
             //services.AddHttpContextAccessor();
 
@@ -220,14 +220,14 @@ namespace MySystem
             // TradeStatTimer2.Instance.Start(); //交易统计
 
             //必须打开的
-            ActiveRewardTimer.Instance.Start(); //实时处理激活记录
-            TradeStatTimer.Instance.Start(); //交易统计
-            ChangePosTimer.Instance.Start(); //售后换新执行机具数据转移
-            MakeReferenceQrCodeService.Instance.StartListen(); //生成创客邀请二维码
-            SycnSpBindService.Instance.Start(); //同步SP绑定数据
-            SycnSpMerchantService.Instance.Start(); //同步SP商户数据
-            SycnSpActiveService.Instance.Start(); //同步SP激活数据
-            SycnSpTradeService.Instance.Start(); //同步SP交易数据
+            // ActiveRewardTimer.Instance.Start(); //实时处理激活记录
+            // TradeStatTimer.Instance.Start(); //交易统计
+            // ChangePosTimer.Instance.Start(); //售后换新执行机具数据转移
+            // MakeReferenceQrCodeService.Instance.StartListen(); //生成创客邀请二维码
+            // SycnSpBindService.Instance.Start(); //同步SP绑定数据
+            // SycnSpMerchantService.Instance.Start(); //同步SP商户数据
+            // SycnSpActiveService.Instance.Start(); //同步SP激活数据
+            // SycnSpTradeService.Instance.Start(); //同步SP交易数据
             // StatService.Instance.StartPosActNum(); //实时统计激活数
             // StatService.Instance.StartNewUserNum(); //实时统计新增创客数
             //必须打开的