重新统计分润，去除互斥机器的分润和补贴

AppStart/Helper/Profit/ProfitHelperV2.cs

@@ -19,7 +19,7 @@ namespace MySystem
         
         #region 获取分润规则Id
 
-        private int GetLevelKindId(int BrandId, int Help, int BankCardType)
+        public int GetLevelKindId(int BrandId, int Help, int BankCardType)
         {
             return RedisDbconn.Instance.Get<int>("pobjlv:kid:" + BrandId + ":" + Help + ":" + BankCardType);
         }

AppStart/Helper/SycnSpServer/SycnSpMerchantService.cs

@@ -55,9 +55,40 @@ namespace MySystem
                                 { 
                                     BrandId = 5;
                                 }
+
                                 PxcModels.PosMerchantInfo add = db.PosMerchantInfo.FirstOrDefault(m => m.KqMerNo == Mer.MerNo);
                                 if (add == null)
                                 {
+                                    int IsFirst = 0;
+                                    if(!string.IsNullOrEmpty(Mer.MerIdcardNo))
+                                    {
+                                        string startNo = Mer.MerIdcardNo.Substring(0, 6);
+                                        string endNo = Mer.MerIdcardNo.Substring(14, 4);
+                                        string Name = Mer.MerName;
+                                        if (Mer.ProductType == "2")
+                                        {
+                                            if (Name.Contains("-"))
+                                            {
+                                                Name = Name.Split('-')[1];
+                                            }
+                                            else if (Name.Contains("_"))
+                                            {
+                                                Name = Name.Split('_')[1];
+                                            }
+                                        }
+                                        else if (Mer.ProductType == "4")
+                                        {
+                                            Name = Mer.SeoTitle;
+                                        }
+                                        Name = Name.Replace("个体户", "");
+                                        Name = Name.Replace("个体商户", "");
+                                        bool check = db.PosMerchantInfo.Any(m => m.MerIdcardNo.StartsWith(startNo) && m.MerIdcardNo.EndsWith(endNo) && m.MerRealName.Contains(Name));
+                                        if(!check)
+                                        {
+                                            IsFirst = 1;
+                                        }
+                                        pos.IsFirst = IsFirst;
+                                    }
                                     add = db.PosMerchantInfo.Add(new PxcModels.PosMerchantInfo()
                                     {
                                         CreateDate = Mer.CreateTime,

AppStart/Helper/SycnSpServer/SycnSpTradeService.cs

@@ -184,7 +184,7 @@ namespace MySystem
                                         {
                                             ulong MerHelpFlag = 0;
                                             decimal DepositAmt = decimal.Parse(function.CheckNum(pos.SeoKeyword));
-                                            if (DepositAmt > 0)
+                                            if (DepositAmt > 0 && pos.IsFirst == 1)
                                             {
                                                 int Days = int.Parse(RedisDbconn.Instance.Get<string>("pobjrule:" + pos.BrandId + ":HelpPolicy:Days")); //天数
                                                 if (pos.BindingTime != null)

AppStart/Helper/TestService.cs

@@ -17,7 +17,7 @@ namespace MySystem
 
         public void Start()
         {
-            Thread th = new Thread(ResetTradeRecordUserId);
+            Thread th = new Thread(statTrade);
             th.IsBackground = true;
             th.Start();
         }
@@ -65,250 +65,6 @@ namespace MySystem
             WebCMSEntities db = new WebCMSEntities();
             List<int> posids = new List<int>();
             posids.Add(13312);
-            posids.Add(14757);
-            posids.Add(14752);
-            posids.Add(8959);
-            posids.Add(9071);
-            posids.Add(7555);
-            posids.Add(13864);
-            posids.Add(12385);
-            posids.Add(12165);
-            posids.Add(11184);
-            posids.Add(8380);
-            posids.Add(8364);
-            posids.Add(15101);
-            posids.Add(12024);
-            posids.Add(8806);
-            posids.Add(7557);
-            posids.Add(10155);
-            posids.Add(7602);
-            posids.Add(12667);
-            posids.Add(8948);
-            posids.Add(15075);
-            posids.Add(12542);
-            posids.Add(12031);
-            posids.Add(8455);
-            posids.Add(22920);
-            posids.Add(7381);
-            posids.Add(10616);
-            posids.Add(22921);
-            posids.Add(26354);
-            posids.Add(22169);
-            posids.Add(25804);
-            posids.Add(23287);
-            posids.Add(7966);
-            posids.Add(25853);
-            posids.Add(26536);
-            posids.Add(16886);
-            posids.Add(14096);
-            posids.Add(16649);
-            posids.Add(7481);
-            posids.Add(9165);
-            posids.Add(25654);
-            posids.Add(19725);
-            posids.Add(26375);
-            posids.Add(9349);
-            posids.Add(11962);
-            posids.Add(7037);
-            posids.Add(10338);
-            posids.Add(7042);
-            posids.Add(13747);
-            posids.Add(9389);
-            posids.Add(53888);
-            posids.Add(23694);
-            posids.Add(21112);
-            posids.Add(7508);
-            posids.Add(25358);
-            posids.Add(12740);
-            posids.Add(12263);
-            posids.Add(7021);
-            posids.Add(15625);
-            posids.Add(7636);
-            posids.Add(16954);
-            posids.Add(37681);
-            posids.Add(21239);
-            posids.Add(17964);
-            posids.Add(6443);
-            posids.Add(13078);
-            posids.Add(10611);
-            posids.Add(37161);
-            posids.Add(6416);
-            posids.Add(45486);
-            posids.Add(44299);
-            posids.Add(39722);
-            posids.Add(9763);
-            posids.Add(42464);
-            posids.Add(42482);
-            posids.Add(24100);
-            posids.Add(21303);
-            posids.Add(18860);
-            posids.Add(41920);
-            posids.Add(37145);
-            posids.Add(13980);
-            posids.Add(17192);
-            posids.Add(45163);
-            posids.Add(17433);
-            posids.Add(46836);
-            posids.Add(11995);
-            posids.Add(17439);
-            posids.Add(19421);
-            posids.Add(15299);
-            posids.Add(39943);
-            posids.Add(12533);
-            posids.Add(37642);
-            posids.Add(12164);
-            posids.Add(6614);
-            posids.Add(17963);
-            posids.Add(16924);
-            posids.Add(37892);
-            posids.Add(26476);
-            posids.Add(7026);
-            posids.Add(6612);
-            posids.Add(26849);
-            posids.Add(48996);
-            posids.Add(51592);
-            posids.Add(50563);
-            posids.Add(17375);
-            posids.Add(37386);
-            posids.Add(69062);
-            posids.Add(38055);
-            posids.Add(55287);
-            posids.Add(44777);
-            posids.Add(52971);
-            posids.Add(70045);
-            posids.Add(71043);
-            posids.Add(39676);
-            posids.Add(10668);
-            posids.Add(42474);
-            posids.Add(71491);
-            posids.Add(12216);
-            posids.Add(12768);
-            posids.Add(39848);
-            posids.Add(46869);
-            posids.Add(42462);
-            posids.Add(46264);
-            posids.Add(42385);
-            posids.Add(49042);
-            posids.Add(39751);
-            posids.Add(49297);
-            posids.Add(57634);
-            posids.Add(53132);
-            posids.Add(39768);
-            posids.Add(71497);
-            posids.Add(13565);
-            posids.Add(17164);
-            posids.Add(37100);
-            posids.Add(16645);
-            posids.Add(12382);
-            posids.Add(18760);
-            posids.Add(53033);
-            posids.Add(41664);
-            posids.Add(58426);
-            posids.Add(46828);
-            posids.Add(58876);
-            posids.Add(25953);
-            posids.Add(71009);
-            posids.Add(59036);
-            posids.Add(17139);
-            posids.Add(12111);
-            posids.Add(37960);
-            posids.Add(12830);
-            posids.Add(23699);
-            posids.Add(19279);
-            posids.Add(49853);
-            posids.Add(6199);
-            posids.Add(67544);
-            posids.Add(15267);
-            posids.Add(37473);
-            posids.Add(64494);
-            posids.Add(17155);
-            posids.Add(70452);
-            posids.Add(40840);
-            posids.Add(15117);
-            posids.Add(79301);
-            posids.Add(55673);
-            posids.Add(18981);
-            posids.Add(59025);
-            posids.Add(53409);
-            posids.Add(20441);
-            posids.Add(49529);
-            posids.Add(20234);
-            posids.Add(43502);
-            posids.Add(64547);
-            posids.Add(70388);
-            posids.Add(42550);
-            posids.Add(46721);
-            posids.Add(49982);
-            posids.Add(16734);
-            posids.Add(16682);
-            posids.Add(14748);
-            posids.Add(21290);
-            posids.Add(38879);
-            posids.Add(23899);
-            posids.Add(64401);
-            posids.Add(51837);
-            posids.Add(54803);
-            posids.Add(58395);
-            posids.Add(13468);
-            posids.Add(70590);
-            posids.Add(58814);
-            posids.Add(9645);
-            posids.Add(55687);
-            posids.Add(6934);
-            posids.Add(40073);
-            posids.Add(44265);
-            posids.Add(51561);
-            posids.Add(18445);
-            posids.Add(49884);
-            posids.Add(71583);
-            posids.Add(51613);
-            posids.Add(40371);
-            posids.Add(49988);
-            posids.Add(68378);
-            posids.Add(18904);
-            posids.Add(50958);
-            posids.Add(49675);
-            posids.Add(48582);
-            posids.Add(64082);
-            posids.Add(25078);
-            posids.Add(67061);
-            posids.Add(65140);
-            posids.Add(70658);
-            posids.Add(49662);
-            posids.Add(49561);
-            posids.Add(24305);
-            posids.Add(37468);
-            posids.Add(21622);
-            posids.Add(71575);
-            posids.Add(66173);
-            posids.Add(38747);
-            posids.Add(50415);
-            posids.Add(56611);
-            posids.Add(56484);
-            posids.Add(67504);
-            posids.Add(50408);
-            posids.Add(70744);
-            posids.Add(47424);
-            posids.Add(49666);
-            posids.Add(7396);
-            posids.Add(7870);
-            posids.Add(17681);
-            posids.Add(52031);
-            posids.Add(25632);
-            posids.Add(23011);
-            posids.Add(39087);
-            posids.Add(16924);
-            posids.Add(42265);
-            posids.Add(16550);
-            posids.Add(40137);
-            posids.Add(53416);
-            posids.Add(21258);
-            posids.Add(60884);
-            posids.Add(49855);
-            posids.Add(69014);
-            posids.Add(43116);
-            posids.Add(53031);
-            posids.Add(22150);
             // OtherMySqlConn.connstr = Library.ConfigurationManager.AppSettings["Pxc1SqlConnStr"].ToString();
             foreach (int posid in posids)
             {
@@ -482,5 +238,158 @@ namespace MySystem
                 }
             }
         }
+
+
+
+        public void statTrade()
+        {
+            OtherMySqlConn.connstr = Library.ConfigurationManager.AppSettings["Pxc1SqlConnStr"].ToString();
+            WebCMSEntities db = new WebCMSEntities();
+            DataTable dt = OtherMySqlConn.dtable("select UserId,BrandId,MerchantId,QrPayFlag,PayType,VipFlag,DATE_FORMAT(CreateDate,'%Y%m%d'),sum(TradeAmount) from TradeRecord where Id>=574439 and UserId>0 and MerchantId in (5962,32731,14396,14,855,2586,2911,1839,6368,2598,79,47,21884,3243,3259,11637,5082,9767,5381,7091,4652,16159,24752,6183,18417,5285,17980,20862,3678,6567,11,21529,2647,10799,9024,24367,17045,14977,17249,847,3901,35077,21982,4496,5121,1383,153,12051,13036,20036,24984,21155,4720,15512,26592,4073,15241,7981,7079,9853,23689,24284,23731,4103,5959,85,31,24936,23781,9566,5658,10898,4929,26997,248,15916,9444,4760,7022,8697,9754,3482,255,793,14351,14149,3049,13390,3796,9209,27862,656,2413,9017,1649,282,8,14112,16313,15545,5639,2809,3733,16717,11541,9774,18000,20341,20273,10047,16151,28510,20193,4650,2498,2597,23242,11325,34592,12362,29281,15165,208,2196,3709,2715,6494,16034,3368,17283,4513,3309,2979,2854,6497,251,17906,7598,2327,6856,2347,2675,4,10991,138,784,350,7961,3385,29349,23533,31893,5036,15382,6934,3778,5922,24357,6222,6755,8887) and CreateDate>='2022-06-01 00:00:00' and MerHelpFlag=1 and BankCardType!=0 and CreateDate<'2022-07-01 00:00:00' group by UserId,BrandId,MerchantId,QrPayFlag,PayType,VipFlag,DATE_FORMAT(CreateDate,'%Y%m%d') order by DATE_FORMAT(CreateDate,'%Y%m%d')");
+            List<string> IdBrands = new List<string>();
+            if(dt.Rows.Count > 0)
+            {
+                foreach(DataRow dr in dt.Rows)
+                {
+                    int UserId = int.Parse(dr["UserId"].ToString());
+                    int MerchantId = int.Parse(dr["MerchantId"].ToString());
+                    int BrandId = int.Parse(dr["BrandId"].ToString());
+                    int QrPayFlag = int.Parse(dr["QrPayFlag"].ToString());
+                    int PayType = int.Parse(dr["PayType"].ToString());
+                    int VipFlag = int.Parse(dr["VipFlag"].ToString());
+                    string TradeDate = dr[6].ToString();
+                    decimal HelpDirectTradeAmt = decimal.Parse(dr[7].ToString());
+                    function.WriteLog("update TradeDaySummary set HelpDirectTradeAmt=HelpDirectTradeAmt-" + HelpDirectTradeAmt + ",NotHelpDirectTradeAmt=NotHelpDirectTradeAmt+" + HelpDirectTradeAmt + " where UserId=" + UserId + " and BrandId=" + BrandId + " and TradeDate='" + TradeDate + "' and QueryCount=" + QrPayFlag + " and PayType=" + PayType + " and VipFlag=" + VipFlag + " and SeoTitle='self';\n", "多余机器分润");
+                    Users user = db.Users.FirstOrDefault(m => m.Id == UserId) ?? new Users();
+                    string ParentNav = user.ParentNav;
+                    ParentNav += "," + UserId + ",";
+                    if (!string.IsNullOrEmpty(ParentNav))
+                    {
+                        string[] ParentNavList = ParentNav.Trim(',').Replace(",,", ",").Split(',');
+                        foreach (string NavUserIdString in ParentNavList)
+                        {
+                            function.WriteLog("update TradeDaySummary set HelpNonDirectTradeAmt=HelpNonDirectTradeAmt-" + HelpDirectTradeAmt + ",NotHelpNonDirectTradeAmt=NotHelpNonDirectTradeAmt+" + HelpDirectTradeAmt + " where UserId=" + NavUserIdString + " and BrandId=" + BrandId + " and TradeDate='" + TradeDate + "' and QueryCount=" + QrPayFlag + " and PayType=" + PayType + " and VipFlag=" + VipFlag + " and SeoTitle='team';\n", "多余机器分润");
+                        }
+                    }
+
+                    List<ProfitResult> results = StartProftForPosByDate(BrandId, UserId, HelpDirectTradeAmt);
+                    foreach(ProfitResult result in results)
+                    {
+                        int DirectFlag = result.DirectFlag;
+                        function.WriteLog("update ProfitRecord set ProfitAmount=ProfitAmount-" + result.Money + " where UserId=" + result.UserId + " and SeoTitle='202206' and DirectFlag=" + DirectFlag + " and BrandId=" + BrandId + ";\n", "多余机器分润");
+                        function.WriteLog("update UserMachineData set TradeProfit=TradeProfit-" + result.Money + " where IdBrand='" + UserId + "_" + BrandId + "';\n", "多余机器分润");
+                    }
+                    if(!IdBrands.Contains(UserId+"-"+MerchantId))
+                    {
+                        IdBrands.Add(UserId + "-" + MerchantId);
+                        DataTable sub = OtherMySqlConn.dtable("select SubsidyProfit from ProfitSubsidyDetail where TradeMonth='202206' and SubsidyUserId=" + UserId + " and MerchantId=" + MerchantId + "");
+                        if(sub.Rows.Count > 0)
+                        {
+                            string SubsidyProfit = sub.Rows[0][0].ToString();
+                            function.WriteLog("delete from ProfitSubsidyDetail where TradeMonth='202206' and SubsidyUserId=" + UserId + " and MerchantId=" + MerchantId + ";\n", "多余机器分润");                    
+                            function.WriteLog("update UserMachineData set OtherProfit=OtherProfit-" + SubsidyProfit + " where IdBrand='" + UserId + "_" + BrandId + "';\n", "多余机器分润");
+                        }
+                    }
+                }
+            }
+            db.Dispose();
+        }
+
+        public List<ProfitResult> StartProftForPosByDate(int BrandId, int UserId, decimal HelpDirectTradeAmt)
+        {
+            List<ProfitResult> result = new List<ProfitResult>();
+            ProfitObjects obj = RedisDbconn.Instance.Get<ProfitObjects>("pobj" + BrandId);
+            if (obj.Status == 1) //判断分润是否开启
+            {
+                WebCMSEntities dbnew = new WebCMSEntities();
+                try
+                {
+                    List<UserLevelSet> levels = dbnew.UserLevelSet.ToList();
+                    Users selfUser = dbnew.Users.FirstOrDefault(m => m.Id == UserId) ?? new Users();
+                    int Days = int.Parse(RedisDbconn.Instance.Get<string>("pobjrule:" + BrandId + ":HelpPolicy:Days")); //天数
+                    int maxLevel = obj.MaxLevel; //最大等级
+                    decimal diffLevelProfit = 0;  //等级级差
+                    int curLevel = 0; //当前层级的会员等级
+                    string ParentNav = selfUser.ParentNav;
+                    if (string.IsNullOrEmpty(ParentNav))
+                    {
+                        ParentNav = ",0,";
+                    }
+                    if (!string.IsNullOrEmpty(ParentNav))
+                    {
+                        ParentNav += "," + UserId + ",";
+                        string[] ParentNavList = ParentNav.Trim(',').Replace(",,", ",").Split(',');
+                        Array.Reverse(ParentNavList); //反转顺序
+                        int level = 0;
+                        DateTime now = DateTime.Now;
+                        if (HelpDirectTradeAmt > 0)
+                        {
+                            foreach (string UserIdString in ParentNavList)
+                            {
+                                level += 1;
+                                int uid = int.Parse(UserIdString);
+                                Users user = dbnew.Users.FirstOrDefault(m => m.Id == uid) ?? new Users();
+                                int UserLevel = user.UserLevel; //当前会员等级
+                                UserRankWhite rank = dbnew.UserRankWhite.FirstOrDefault(m => m.Id == user.Id && m.UpdateDate > now);
+                                if (rank != null)
+                                {
+                                    if (rank.Rank > UserLevel)
+                                    {
+                                        UserLevel = rank.Rank;
+                                    }
+                                }
+                                if (curLevel == maxLevel) //判断当前创客是否有直推的激活机具，并且在活动时间内
+                                {
+                                    break;
+                                }
+                                if (UserLevel <= maxLevel && UserLevel > curLevel)
+                                {
+                                    int LevelKindId = ProfitHelperV2.Instance.GetLevelKindId(BrandId, 1, 1);
+                                    ProfitObjectLevels objlevel = RedisDbconn.Instance.Get<ProfitObjectLevels>("pobjlv" + LevelKindId + ":" + UserLevel); //获取当前等级参数
+                                    int LevelKindId2 = ProfitHelperV2.Instance.GetLevelKindId(BrandId, 0, 1);
+                                    ProfitObjectLevels objlevel2 = RedisDbconn.Instance.Get<ProfitObjectLevels>("pobjlv" + LevelKindId2 + ":" + UserLevel); //获取当前等级参数
+                                    if (objlevel != null && objlevel2 != null)
+                                    {
+                                        decimal getLevelProfit = 0;  //等级分润
+                                        if (objlevel.Percents > 0 && objlevel2.Percents > 0)
+                                        {
+                                            //获取创客分润规则，注册日开始算起，3个自然月内算扶持期
+                                            getLevelProfit += HelpDirectTradeAmt * (objlevel.Percents - objlevel2.Percents);
+                                        }
+                                        decimal money = getLevelProfit;
+                                        getLevelProfit -= diffLevelProfit;
+                                        diffLevelProfit = money;
+                                        if (getLevelProfit >= obj.MinProfitVal)
+                                        {
+                                            result.Add(new ProfitResult()
+                                            {
+                                                UserId = user.Id,
+                                                UserNav = user.ParentNav,
+                                                Money = PublicFunction.NumberFormat(getLevelProfit),
+                                                ProfitRate = objlevel.Percents,
+                                                Message = "交易分润",
+                                                BankCardType = 1,
+                                                DirectFlag = selfUser.Id == user.Id ? 1 : 0,
+                                                BrandId = BrandId,
+                                                IsSubsidy = 0,
+                                                TradeAmount = HelpDirectTradeAmt,
+                                                HelpFlag = 1,
+                                            });
+                                        }
+                                    }
+                                }
+                                curLevel = UserLevel;
+                            }
+                        }
+                    }
+                }
+                catch (Exception ex)
+                {
+                    function.WriteLog(DateTime.Now.ToString() + "\n" + ex.ToString(), "每月统计分润异常");
+                }
+                dbnew.Dispose();
+            }
+            return result;
+        }
     }
 }

Models/LeaderReserveRecord.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models
+{
+    public partial class LeaderReserveRecord
+    {
+        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 ChangeType { get; set; }
+        public int OrderId { get; set; }
+        public int SourceUserId { get; set; }
+        public string Remark { get; set; }
+        public decimal AfterAmt { get; set; }
+        public decimal BeforeAmt { get; set; }
+        public decimal ChangeAmt { get; set; }
+        public string TradeDate { get; set; }
+        public string TradeMonth { get; set; }
+        public int UserId { get; set; }
+    }
+}

Models/Orders.cs

@@ -63,5 +63,6 @@ namespace MySystem.Models
         public string RealName { get; set; }
         public string OrderNo { get; set; }
         public int UserId { get; set; }
+        public int ParentOrderId { get; set; }
     }
 }

Models/PosMachinesTwo.cs

@@ -45,5 +45,6 @@ namespace MySystem.Models
         public int BindingState { get; set; }
         public int LeaderUserId { get; set; }
         public int PreUserId { get; set; }
+        public int IsFirst { get; set; }
     }
 }

Models/StoreHouse.cs

@@ -37,5 +37,7 @@ namespace MySystem.Models
         public int UserId { get; set; }
         public string StoreName { get; set; }
         public string StoreNo { get; set; }
+        public DateTime? AuthDate { get; set; }
+        public ulong AuthFlag { get; set; }
     }
 }

Models/StoreHouseAmountRecord.cs

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

Models/StoreMachineApply.cs

@@ -9,26 +9,19 @@ 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 DateTime? ApplyTime { get; set; }
-        public int? BrandId { get; set; }
+        public int UserId { get; set; }
+        public string SendSn { get; set; }
+        public string ErpCode { get; set; }
+        public string SendMode { get; set; }
+        public decimal UseAmount { get; set; }
+        public int SendNum { get; set; }
+        public int ApplyNum { 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; }
+        public int BrandId { get; set; }
     }
 }

Models/UserAccount.cs

@@ -32,5 +32,8 @@ namespace MySystem.Models
         public int UserProperty { get; set; }
         public int UserType { get; set; }
         public int UserId { get; set; }
+        public decimal TempAmount { get; set; }
+        public decimal FixedAmount { get; set; }
+        public decimal LeaderReserve { get; set; }
     }
 }

Models/Users.cs

@@ -82,5 +82,6 @@ namespace MySystem.Models
         public int CashStatus { get; set; }
         public string CashNote { get; set; }
         public decimal ThisMonthTrade { get; set; }
+        public int LeaderLevel { get; set; }
     }
 }

Models/WebCMSEntities.cs

@@ -48,6 +48,7 @@ namespace MySystem.Models
         public virtual DbSet<KqProductOrgs> KqProductOrgs { get; set; }
         public virtual DbSet<KqProductRuleSet> KqProductRuleSet { get; set; }
         public virtual DbSet<KqProducts> KqProducts { get; set; }
+        public virtual DbSet<LeaderReserveRecord> LeaderReserveRecord { get; set; }
         public virtual DbSet<MachineApply> MachineApply { get; set; }
         public virtual DbSet<MachineApplyDetail> MachineApplyDetail { get; set; }
         public virtual DbSet<MachineChange> MachineChange { get; set; }
@@ -147,6 +148,7 @@ namespace MySystem.Models
         public virtual DbSet<StoreForCode> StoreForCode { get; set; }
         public virtual DbSet<StoreForName> StoreForName { get; set; }
         public virtual DbSet<StoreHouse> StoreHouse { get; set; }
+        public virtual DbSet<StoreHouseAmountRecord> StoreHouseAmountRecord { get; set; }
         public virtual DbSet<StoreMachineApply> StoreMachineApply { get; set; }
         public virtual DbSet<StoreMallOrderSummary> StoreMallOrderSummary { get; set; }
         public virtual DbSet<StoreSnActivateSummary> StoreSnActivateSummary { get; set; }
@@ -2514,6 +2516,65 @@ namespace MySystem.Models
                 entity.Property(e => e.Version).HasColumnType("int(11)");
             });
 
+            modelBuilder.Entity<LeaderReserveRecord>(entity =>
+            {
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.AfterAmt).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.BeforeAmt).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.ChangeAmt).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.ChangeType).HasColumnType("int(11)");
+
+                entity.Property(e => e.CreateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.OrderId).HasColumnType("int(11)");
+
+                entity.Property(e => e.QueryCount).HasColumnType("int(11)");
+
+                entity.Property(e => e.Remark)
+                    .HasColumnType("varchar(200)")
+                    .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.SourceUserId).HasColumnType("int(11)");
+
+                entity.Property(e => e.Status).HasColumnType("int(11)");
+
+                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");
+
+                entity.Property(e => e.UserId).HasColumnType("int(11)");
+            });
+
             modelBuilder.Entity<MachineApply>(entity =>
             {
                 entity.Property(e => e.Id).HasColumnType("int(11)");
@@ -6109,6 +6170,8 @@ namespace MySystem.Models
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.ParentOrderId).HasColumnType("int(11)");
+
                 entity.Property(e => e.PayDate).HasColumnType("datetime");
 
                 entity.Property(e => e.PayMode).HasColumnType("int(11)");
@@ -6790,6 +6853,8 @@ namespace MySystem.Models
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.IsFirst).HasColumnType("int(11)");
+
                 entity.Property(e => e.IsPurchase).HasColumnType("int(11)");
 
                 entity.Property(e => e.IsVip)
@@ -9859,6 +9924,12 @@ namespace MySystem.Models
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.AuthDate).HasColumnType("datetime");
+
+                entity.Property(e => e.AuthFlag)
+                    .HasColumnType("bit(1)")
+                    .HasDefaultValueSql("b'0'");
+
                 entity.Property(e => e.BrandId)
                     .HasColumnType("varchar(30)")
                     .HasCharSet("utf8")
@@ -9960,60 +10031,83 @@ namespace MySystem.Models
                 entity.Property(e => e.Version).HasColumnType("int(11)");
             });
 
-            modelBuilder.Entity<StoreMachineApply>(entity =>
+            modelBuilder.Entity<StoreHouseAmountRecord>(entity =>
             {
-                entity.HasComment("机具申请记录表");
-
                 entity.Property(e => e.Id).HasColumnType("int(11)");
 
-                entity.Property(e => e.ActualApply)
-                    .HasColumnType("int(11)")
-                    .HasComment("实际申请台数");
+                entity.Property(e => e.AfterAmount).HasColumnType("decimal(18,2)");
 
-                entity.Property(e => e.ApplyNo)
-                    .HasColumnType("varchar(50)")
-                    .HasComment("申请单号")
-                    .HasCharSet("latin1")
-                    .HasCollation("latin1_swedish_ci");
+                entity.Property(e => e.AmountType).HasColumnType("int(11)");
+
+                entity.Property(e => e.ApplyId).HasColumnType("int(11)");
 
-                entity.Property(e => e.ApplyNum)
-                    .HasColumnType("int(11)")
-                    .HasComment("申请箱数");
+                entity.Property(e => e.BeforeAmount).HasColumnType("decimal(18,2)");
 
-                entity.Property(e => e.ApplyTime).HasColumnType("datetime");
+                entity.Property(e => e.CreateDate).HasColumnType("datetime");
 
-                entity.Property(e => e.BoxNum)
-                    .HasColumnType("int(11)")
-                    .HasComment("每箱台数");
+                entity.Property(e => e.OperateType).HasColumnType("int(11)");
 
-                entity.Property(e => e.BrandId)
-                    .HasColumnType("int(11)")
-                    .HasComment("产品Id");
+                entity.Property(e => e.QueryCount).HasColumnType("int(11)");
 
-                entity.Property(e => e.CreateDate).HasColumnType("datetime");
+                entity.Property(e => e.SeoDescription)
+                    .HasColumnType("varchar(500)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
 
-                entity.Property(e => e.CreateMan)
+                entity.Property(e => e.SeoKeyword)
+                    .HasColumnType("varchar(200)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoTitle)
+                    .HasColumnType("varchar(100)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Sort).HasColumnType("int(11)");
+
+                entity.Property(e => e.Status).HasColumnType("int(11)");
+
+                entity.Property(e => e.UpdateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.UseAmount).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.UserId).HasColumnType("int(11)");
+            });
+
+            modelBuilder.Entity<StoreMachineApply>(entity =>
+            {
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.ApplyNo)
                     .HasColumnType("varchar(50)")
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
-                entity.Property(e => e.LastApply)
-                    .HasColumnType("int(11)")
-                    .HasComment("上月申请台数");
+                entity.Property(e => e.ApplyNum).HasColumnType("int(11)");
 
-                entity.Property(e => e.MaxApply)
-                    .HasColumnType("int(11)")
-                    .HasComment("最多申请台数");
+                entity.Property(e => e.BrandId).HasColumnType("int(11)");
 
-                entity.Property(e => e.OrderId)
-                    .HasColumnType("int(11)")
-                    .HasComment("订单Id");
+                entity.Property(e => e.CreateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.ErpCode)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
 
                 entity.Property(e => e.QueryCount).HasColumnType("int(11)");
 
-                entity.Property(e => e.SendNum)
-                    .HasColumnType("int(11)")
-                    .HasComment("发货箱数");
+                entity.Property(e => e.SendMode)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SendNum).HasColumnType("int(11)");
+
+                entity.Property(e => e.SendSn)
+                    .HasColumnType("mediumtext")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
 
                 entity.Property(e => e.SeoDescription)
                     .HasColumnType("varchar(500)")
@@ -10034,28 +10128,11 @@ namespace MySystem.Models
 
                 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.UseAmount).HasColumnType("decimal(18,2)");
 
-                entity.Property(e => e.Version).HasColumnType("int(11)");
+                entity.Property(e => e.UserId).HasColumnType("int(11)");
             });
 
             modelBuilder.Entity<StoreMallOrderSummary>(entity =>
@@ -11309,6 +11386,9 @@ namespace MySystem.Models
 
             modelBuilder.Entity<TradeDaySummary>(entity =>
             {
+                entity.HasIndex(e => new { e.UserId, e.TradeMonth, e.TradeDate, e.BrandId, e.QueryCount, e.VipFlag, e.PayType, e.SeoTitle })
+                    .HasName("TradeDaySummaryIndex");
+
                 entity.Property(e => e.Id).HasColumnType("int(11)");
 
                 entity.Property(e => e.BrandId).HasColumnType("int(11)");
@@ -11744,8 +11824,12 @@ namespace MySystem.Models
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.FixedAmount).HasColumnType("decimal(18,2)");
+
                 entity.Property(e => e.FreezeAmount).HasColumnType("decimal(18,2)");
 
+                entity.Property(e => e.LeaderReserve).HasColumnType("decimal(18,2)");
+
                 entity.Property(e => e.LockStatus).HasColumnType("int(11)");
 
                 entity.Property(e => e.QueryCount).HasColumnType("int(11)");
@@ -11775,6 +11859,8 @@ namespace MySystem.Models
 
                 entity.Property(e => e.TeamTotalServiceProfit).HasColumnType("decimal(18,2)");
 
+                entity.Property(e => e.TempAmount).HasColumnType("decimal(18,2)");
+
                 entity.Property(e => e.TotalAmount).HasColumnType("decimal(18,2)");
 
                 entity.Property(e => e.TotalOverProfit).HasColumnType("decimal(18,2)");
@@ -14235,6 +14321,9 @@ namespace MySystem.Models
 
             modelBuilder.Entity<UserTradeMonthSummary>(entity =>
             {
+                entity.HasIndex(e => new { e.UserId, e.BrandId, e.TradeMonth, e.SeoKeyword, e.SeoTitle })
+                    .HasName("UserTradeMonthSummaryIndex");
+
                 entity.Property(e => e.Id).HasColumnType("int(11)");
 
                 entity.Property(e => e.ActiveBuddyMerStatus).HasColumnType("int(11)");
@@ -14444,6 +14533,8 @@ namespace MySystem.Models
                     .HasColumnType("bit(1)")
                     .HasDefaultValueSql("b'0'");
 
+                entity.Property(e => e.LeaderLevel).HasColumnType("int(11)");
+
                 entity.Property(e => e.LockStatus)
                     .HasColumnType("bit(1)")
                     .HasDefaultValueSql("b'0'");

PxcModels/LeaderReserveRecord.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class LeaderReserveRecord
+    {
+        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 ChangeType { get; set; }
+        public int OrderId { get; set; }
+        public int SourceUserId { get; set; }
+        public string Remark { get; set; }
+        public decimal AfterAmt { get; set; }
+        public decimal BeforeAmt { get; set; }
+        public decimal ChangeAmt { get; set; }
+        public string TradeDate { get; set; }
+        public string TradeMonth { get; set; }
+        public int UserId { get; set; }
+    }
+}

PxcModels/Orders.cs

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

PxcModels/PosMachinesTwo.cs

@@ -45,5 +45,6 @@ namespace MySystem.PxcModels
         public int BindingState { get; set; }
         public int LeaderUserId { get; set; }
         public int PreUserId { get; set; }
+        public int IsFirst { get; set; }
     }
 }

PxcModels/StoreHouse.cs

@@ -37,5 +37,7 @@ namespace MySystem.PxcModels
         public int UserId { get; set; }
         public string StoreName { get; set; }
         public string StoreNo { get; set; }
+        public DateTime? AuthDate { get; set; }
+        public ulong AuthFlag { get; set; }
     }
 }

PxcModels/StoreHouseAmountRecord.cs

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

PxcModels/StoreMachineApply.cs

@@ -9,26 +9,19 @@ namespace MySystem.PxcModels
         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 int UserId { get; set; }
+        public string SendSn { get; set; }
+        public string ErpCode { get; set; }
+        public string SendMode { get; set; }
+        public decimal UseAmount { get; set; }
+        public int SendNum { get; set; }
+        public int ApplyNum { 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; }
+        public int BrandId { get; set; }
     }
 }

PxcModels/UserAccount.cs

@@ -32,5 +32,8 @@ namespace MySystem.PxcModels
         public int UserProperty { get; set; }
         public int UserType { get; set; }
         public int UserId { get; set; }
+        public decimal TempAmount { get; set; }
+        public decimal FixedAmount { get; set; }
+        public decimal LeaderReserve { get; set; }
     }
 }

PxcModels/Users.cs

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

PxcModels/WebCMSEntities.cs

@@ -48,6 +48,7 @@ namespace MySystem.PxcModels
         public virtual DbSet<KqProductOrgs> KqProductOrgs { get; set; }
         public virtual DbSet<KqProductRuleSet> KqProductRuleSet { get; set; }
         public virtual DbSet<KqProducts> KqProducts { get; set; }
+        public virtual DbSet<LeaderReserveRecord> LeaderReserveRecord { get; set; }
         public virtual DbSet<MachineApply> MachineApply { get; set; }
         public virtual DbSet<MachineApplyDetail> MachineApplyDetail { get; set; }
         public virtual DbSet<MachineChange> MachineChange { get; set; }
@@ -147,6 +148,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<StoreHouseAmountRecord> StoreHouseAmountRecord { get; set; }
         public virtual DbSet<StoreMachineApply> StoreMachineApply { get; set; }
         public virtual DbSet<StoreMallOrderSummary> StoreMallOrderSummary { get; set; }
         public virtual DbSet<StoreSnActivateSummary> StoreSnActivateSummary { get; set; }
@@ -2514,6 +2516,65 @@ namespace MySystem.PxcModels
                 entity.Property(e => e.Version).HasColumnType("int(11)");
             });
 
+            modelBuilder.Entity<LeaderReserveRecord>(entity =>
+            {
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.AfterAmt).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.BeforeAmt).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.ChangeAmt).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.ChangeType).HasColumnType("int(11)");
+
+                entity.Property(e => e.CreateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.OrderId).HasColumnType("int(11)");
+
+                entity.Property(e => e.QueryCount).HasColumnType("int(11)");
+
+                entity.Property(e => e.Remark)
+                    .HasColumnType("varchar(200)")
+                    .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.SourceUserId).HasColumnType("int(11)");
+
+                entity.Property(e => e.Status).HasColumnType("int(11)");
+
+                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");
+
+                entity.Property(e => e.UserId).HasColumnType("int(11)");
+            });
+
             modelBuilder.Entity<MachineApply>(entity =>
             {
                 entity.Property(e => e.Id).HasColumnType("int(11)");
@@ -6109,6 +6170,8 @@ namespace MySystem.PxcModels
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.ParentOrderId).HasColumnType("int(11)");
+
                 entity.Property(e => e.PayDate).HasColumnType("datetime");
 
                 entity.Property(e => e.PayMode).HasColumnType("int(11)");
@@ -6790,6 +6853,8 @@ namespace MySystem.PxcModels
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.IsFirst).HasColumnType("int(11)");
+
                 entity.Property(e => e.IsPurchase).HasColumnType("int(11)");
 
                 entity.Property(e => e.IsVip)
@@ -9859,6 +9924,12 @@ namespace MySystem.PxcModels
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.AuthDate).HasColumnType("datetime");
+
+                entity.Property(e => e.AuthFlag)
+                    .HasColumnType("bit(1)")
+                    .HasDefaultValueSql("b'0'");
+
                 entity.Property(e => e.BrandId)
                     .HasColumnType("varchar(30)")
                     .HasCharSet("utf8")
@@ -9960,60 +10031,83 @@ namespace MySystem.PxcModels
                 entity.Property(e => e.Version).HasColumnType("int(11)");
             });
 
-            modelBuilder.Entity<StoreMachineApply>(entity =>
+            modelBuilder.Entity<StoreHouseAmountRecord>(entity =>
             {
-                entity.HasComment("机具申请记录表");
-
                 entity.Property(e => e.Id).HasColumnType("int(11)");
 
-                entity.Property(e => e.ActualApply)
-                    .HasColumnType("int(11)")
-                    .HasComment("实际申请台数");
+                entity.Property(e => e.AfterAmount).HasColumnType("decimal(18,2)");
 
-                entity.Property(e => e.ApplyNo)
-                    .HasColumnType("varchar(50)")
-                    .HasComment("申请单号")
-                    .HasCharSet("latin1")
-                    .HasCollation("latin1_swedish_ci");
+                entity.Property(e => e.AmountType).HasColumnType("int(11)");
+
+                entity.Property(e => e.ApplyId).HasColumnType("int(11)");
 
-                entity.Property(e => e.ApplyNum)
-                    .HasColumnType("int(11)")
-                    .HasComment("申请箱数");
+                entity.Property(e => e.BeforeAmount).HasColumnType("decimal(18,2)");
 
-                entity.Property(e => e.ApplyTime).HasColumnType("datetime");
+                entity.Property(e => e.CreateDate).HasColumnType("datetime");
 
-                entity.Property(e => e.BoxNum)
-                    .HasColumnType("int(11)")
-                    .HasComment("每箱台数");
+                entity.Property(e => e.OperateType).HasColumnType("int(11)");
 
-                entity.Property(e => e.BrandId)
-                    .HasColumnType("int(11)")
-                    .HasComment("产品Id");
+                entity.Property(e => e.QueryCount).HasColumnType("int(11)");
 
-                entity.Property(e => e.CreateDate).HasColumnType("datetime");
+                entity.Property(e => e.SeoDescription)
+                    .HasColumnType("varchar(500)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
 
-                entity.Property(e => e.CreateMan)
+                entity.Property(e => e.SeoKeyword)
+                    .HasColumnType("varchar(200)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoTitle)
+                    .HasColumnType("varchar(100)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Sort).HasColumnType("int(11)");
+
+                entity.Property(e => e.Status).HasColumnType("int(11)");
+
+                entity.Property(e => e.UpdateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.UseAmount).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.UserId).HasColumnType("int(11)");
+            });
+
+            modelBuilder.Entity<StoreMachineApply>(entity =>
+            {
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.ApplyNo)
                     .HasColumnType("varchar(50)")
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
-                entity.Property(e => e.LastApply)
-                    .HasColumnType("int(11)")
-                    .HasComment("上月申请台数");
+                entity.Property(e => e.ApplyNum).HasColumnType("int(11)");
 
-                entity.Property(e => e.MaxApply)
-                    .HasColumnType("int(11)")
-                    .HasComment("最多申请台数");
+                entity.Property(e => e.BrandId).HasColumnType("int(11)");
 
-                entity.Property(e => e.OrderId)
-                    .HasColumnType("int(11)")
-                    .HasComment("订单Id");
+                entity.Property(e => e.CreateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.ErpCode)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
 
                 entity.Property(e => e.QueryCount).HasColumnType("int(11)");
 
-                entity.Property(e => e.SendNum)
-                    .HasColumnType("int(11)")
-                    .HasComment("发货箱数");
+                entity.Property(e => e.SendMode)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SendNum).HasColumnType("int(11)");
+
+                entity.Property(e => e.SendSn)
+                    .HasColumnType("mediumtext")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
 
                 entity.Property(e => e.SeoDescription)
                     .HasColumnType("varchar(500)")
@@ -10034,28 +10128,11 @@ namespace MySystem.PxcModels
 
                 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.UseAmount).HasColumnType("decimal(18,2)");
 
-                entity.Property(e => e.Version).HasColumnType("int(11)");
+                entity.Property(e => e.UserId).HasColumnType("int(11)");
             });
 
             modelBuilder.Entity<StoreMallOrderSummary>(entity =>
@@ -11309,6 +11386,9 @@ namespace MySystem.PxcModels
 
             modelBuilder.Entity<TradeDaySummary>(entity =>
             {
+                entity.HasIndex(e => new { e.UserId, e.TradeMonth, e.TradeDate, e.BrandId, e.QueryCount, e.VipFlag, e.PayType, e.SeoTitle })
+                    .HasName("TradeDaySummaryIndex");
+
                 entity.Property(e => e.Id).HasColumnType("int(11)");
 
                 entity.Property(e => e.BrandId).HasColumnType("int(11)");
@@ -11744,8 +11824,12 @@ namespace MySystem.PxcModels
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.FixedAmount).HasColumnType("decimal(18,2)");
+
                 entity.Property(e => e.FreezeAmount).HasColumnType("decimal(18,2)");
 
+                entity.Property(e => e.LeaderReserve).HasColumnType("decimal(18,2)");
+
                 entity.Property(e => e.LockStatus).HasColumnType("int(11)");
 
                 entity.Property(e => e.QueryCount).HasColumnType("int(11)");
@@ -11775,6 +11859,8 @@ namespace MySystem.PxcModels
 
                 entity.Property(e => e.TeamTotalServiceProfit).HasColumnType("decimal(18,2)");
 
+                entity.Property(e => e.TempAmount).HasColumnType("decimal(18,2)");
+
                 entity.Property(e => e.TotalAmount).HasColumnType("decimal(18,2)");
 
                 entity.Property(e => e.TotalOverProfit).HasColumnType("decimal(18,2)");
@@ -14235,6 +14321,9 @@ namespace MySystem.PxcModels
 
             modelBuilder.Entity<UserTradeMonthSummary>(entity =>
             {
+                entity.HasIndex(e => new { e.UserId, e.BrandId, e.TradeMonth, e.SeoKeyword, e.SeoTitle })
+                    .HasName("UserTradeMonthSummaryIndex");
+
                 entity.Property(e => e.Id).HasColumnType("int(11)");
 
                 entity.Property(e => e.ActiveBuddyMerStatus).HasColumnType("int(11)");
@@ -14444,6 +14533,8 @@ namespace MySystem.PxcModels
                     .HasColumnType("bit(1)")
                     .HasDefaultValueSql("b'0'");
 
+                entity.Property(e => e.LeaderLevel).HasColumnType("int(11)");
+
                 entity.Property(e => e.LockStatus)
                     .HasColumnType("bit(1)")
                     .HasDefaultValueSql("b'0'");

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();
 
@@ -190,22 +190,22 @@ 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交易数据
-            SycnSpChangeBindService.Instance.Start(); //同步SP换绑数据
-            SycnSpUnBindService.Instance.Start(); //同步SP解绑数据
-            RedPackageHelper.Instance.Start(); //每天生成300个红包
-            RedPackageHelper.Instance.StartStatTop10(); //红包活动统计排行
-            RedPackageHelper.Instance.StartSendPrize(); //红包活动发奖
-            BalancePayBackService.Instance.Start(); //余额支付队列
-            LeaderPrizeService.Instance.Start(); //大盟主奖励发奖
-            MessageCenterService.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交易数据
+            // SycnSpChangeBindService.Instance.Start(); //同步SP换绑数据
+            // SycnSpUnBindService.Instance.Start(); //同步SP解绑数据
+            // RedPackageHelper.Instance.Start(); //每天生成300个红包
+            // RedPackageHelper.Instance.StartStatTop10(); //红包活动统计排行
+            // RedPackageHelper.Instance.StartSendPrize(); //红包活动发奖
+            // BalancePayBackService.Instance.Start(); //余额支付队列
+            // LeaderPrizeService.Instance.Start(); //大盟主奖励发奖
+            // MessageCenterService.Instance.Start(); // 消息队列
             //必须打开的
 
             // StatService.Instance.StartPosActNum(); //实时统计激活数
@@ -220,6 +220,7 @@ namespace MySystem
             // StatService.Instance.ListenFluxRecord();
             // StatService.Instance.StartEverDay2();
             // TestHelper.Instance.Start();
+            TestService.Instance.Start();
             // StatService.Instance.StartEverDay();
             // RabbitMQClient.Instance.StartReceive("MerchantConfirmList");
             // RabbitMQClient.Instance.StartReceive("CheckWeChatSign");

appsettings.json

@@ -17,9 +17,9 @@
     "Host": "http://localhost:5047/",
     "SourceHost": "http://bs.kexiaoshuang.com/",
     "Database": "KxsMainServer",
-    "SqlConnStr": "server=47.108.231.170;port=3306;user=KxsMain;password=mzeqjriUWore0dwT;database=KxsMainServer;charset=utf8;",
-    "Pxc1SqlConnStr": "server=47.108.231.170;port=3306;user=KxsMain;password=mzeqjriUWore0dwT;database=KxsMainServer;charset=utf8;",
-    "SpSqlConnStr": "server=47.108.229.115;port=3306;user=KxsSpServer;password=jJ9qKsvwWgQA9xWG;database=KxsSpServer;charset=utf8;",
+    "SqlConnStr": "server=47.109.31.237;port=3306;user=KxsMainServer;password=Rw2imhXQQt5ODWIF;database=KxsMainServer;charset=utf8;",
+    "Pxc1SqlConnStr": "server=47.109.31.237;port=3306;user=KxsMainServer;password=Rw2imhXQQt5ODWIF;database=KxsMainServer;charset=utf8;",
+    "SpSqlConnStr": "server=47.109.31.237;port=3306;user=KxsSpServer;password=jJ9qKsvwWgQA9xWG;database=KxsSpServer;charset=utf8;",
     "RedisConnStr": "47.109.31.237:6379,password=klm@redis,DefaultDatabase=1,poolsize=500,preheat=50,asyncPipeline=true",
     "TendisConnStr": "47.109.31.237:6379,password=klm@redis,DefaultDatabase=1,poolsize=500,preheat=50,asyncPipeline=true",
     "IOSAppVersion": "1.0.0",