Merge branch 'feature-降扣' into develop

AppStart/Helper/Profit/ProfitHelperV2.cs

@@ -410,7 +410,7 @@ namespace MySystem
                 string sqlstr = "";
                 if (BankCardType == 1)
                 {
-                    sqlstr = "select UserId,QueryCount,sum(HelpDirectTradeAmt),sum(NotHelpDirectTradeAmt) from TradeDaySummary where Id>2194000 and TradeDate='" + Date + "' and SeoTitle='self' and BrandId=" + BrandId + " group by UserId,QueryCount having sum(HelpDirectTradeAmt)>0 or sum(NotHelpDirectTradeAmt)>0 order by UserId" + LimitString;
+                    sqlstr = "select UserId,QueryCount,sum(HelpDirectTradeAmt),sum(NotHelpDirectTradeAmt),sum(ProfitHelpDirectTradeAmt) from TradeDaySummary where Id>2194000 and TradeDate='" + Date + "' and SeoTitle='self' and BrandId=" + BrandId + " group by UserId,QueryCount having sum(HelpDirectTradeAmt)>0 or sum(NotHelpDirectTradeAmt)>0 or sum(ProfitHelpDirectTradeAmt)>0 order by UserId" + LimitString;
                 }
                 if (BankCardType == 0)
                 {
@@ -464,6 +464,7 @@ namespace MySystem
                                 function.WriteLog(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff") + ":贷记卡", "分润监控日志");
                                 decimal HelpDirectTradeAmt = decimal.Parse(dr[2].ToString()); //贷记卡扶持期交易额
                                 decimal NotHelpDirectTradeAmt = decimal.Parse(dr[3].ToString()); //贷记卡稳定期交易额
+                                decimal ProfitHelpDirectTradeAmt = decimal.Parse(dr[4].ToString()); //贷记卡盈利期期交易额
                                 int maxLevel = obj.MaxLevel; //最大等级
                                 decimal diffLevelProfit = 0;  //等级级差
                                 int curLevel = 0; //当前层级的会员等级
@@ -662,6 +663,74 @@ namespace MySystem
                                             curLevel = UserLevel;
                                         }
                                     }
+                                    function.WriteLog(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff") + ":盈利期:" + ProfitHelpDirectTradeAmt, "分润监控日志");
+                                    if (ProfitHelpDirectTradeAmt > 0)
+                                    {
+                                        level = 0;
+                                        curLevel = 0;
+                                        diffLevelProfit = 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.CreateDate < ThisMonth && m.UpdateDate > now);
+                                            if (rank != null)
+                                            {
+                                                if (rank.Rank > UserLevel)
+                                                {
+                                                    UserLevel = rank.Rank;
+                                                }
+                                            }
+                                            if (curLevel == maxLevel) //判断当前创客是否有直推的激活机具，并且在活动时间内
+                                            {
+                                                break;
+                                            }
+                                            if (UserLevel <= maxLevel && UserLevel > curLevel)
+                                            {
+                                                int LevelKindId = GetLevelKindId(BrandId, 2, 1);
+                                                ProfitObjectLevels objlevel = RedisDbconn.Instance.Get<ProfitObjectLevels>("pobjlv" + LevelKindId + ":" + UserLevel); //获取当前等级参数
+                                                if (objlevel != null)
+                                                {
+                                                    decimal getLevelProfit = 0;  //等级分润
+                                                    if (objlevel.Percents > 0)
+                                                    {
+                                                        getLevelProfit += ProfitHelpDirectTradeAmt * objlevel.Percents;
+                                                    }
+                                                    if (objlevel.AddProfitVal > 0)
+                                                    {
+                                                        getLevelProfit += objlevel.AddProfitVal;
+                                                    }
+                                                    decimal money = getLevelProfit;
+                                                    getLevelProfit -= diffLevelProfit;
+                                                    if (objlevel.LevelDiff == 1)  //判断是否有级差
+                                                    {
+                                                        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 = BankCardType,
+                                                            QrPayFlag = QrPayFlag,
+                                                            BrandId = BrandId,
+                                                            DirectFlag = selfUser.Id == user.Id ? 1 : 0,
+                                                            IsSubsidy = 0,
+                                                            TradeAmount = ProfitHelpDirectTradeAmt,
+                                                            HelpFlag = 0,
+                                                        });
+                                                    }
+                                                }
+                                            }
+                                            curLevel = UserLevel;
+                                        }
+                                    }
                                 }
                             }
                             function.WriteLog(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff") + ":over", "分润监控日志");

AppStart/Helper/SycnSpServer/SycnSpTradeService.cs

@@ -94,7 +94,6 @@ namespace MySystem
                                     {
                                         TopUserId = int.Parse(user.ParentNav.Trim(',').Replace(",,", ",").Split(',')[0]);
                                     }
-                                    // TODO: 交易记录表，每月的Id单独存放，解决查询效率问题
                                     bool check = db.SpOrderNos.Any(m => m.OrderNo == trade.TradeSerialNo);
                                     if (!check)
                                     {
@@ -198,7 +197,11 @@ namespace MySystem
                                         {
                                             ulong MerHelpFlag = 0;
                                             decimal DepositAmt = decimal.Parse(function.CheckNum(pos.SeoKeyword));
-                                            if (DepositAmt > 0 && pos.IsFirst == 1)
+                                            if (pos.UpFeeFlag == 1 && pos.DownFeeFlag == 1)
+                                            {
+                                                MerHelpFlag = 2;
+                                            }
+                                            else if (DepositAmt > 0 && pos.IsFirst == 1)
                                             {
                                                 int Days = int.Parse(RedisDbconn.Instance.Get<string>("pobjrule:" + pos.BrandId + ":HelpPolicy:Days")); //天数
                                                 if (pos.BindingTime != null)
@@ -229,7 +232,7 @@ namespace MySystem
                                                 UserId = pos.UserId, //创客
                                                 MerchantId = pos.BindMerchantId, //商户
                                                 MerNo = trade.MerNo, //渠道商户编号
-                                                MerHelpFlag = MerHelpFlag, //是否属于扶持周期内商户
+                                                MerHelpFlag = MerHelpFlag, //1扶持周,0稳定期,2盈利期
                                                 HelpMonthCount = 0, //扶持第几个月
                                                 MerBuddyType = user.MerchantType, //商户创客类型
                                                 SnNo = trade.TradeSnNo, //渠道SN号

AppStart/Tables/SetDepositList.cs

@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+namespace MySystem
+{
+    public class SetDepositList
+    {
+        public string productSubType { get; set; }
+        public decimal updateValue { get; set; }
+        public int updateType { get; set; }
+    }
+}

Models/AppBottomNavs.cs

@@ -25,5 +25,8 @@ namespace MySystem.Models
         public string NormalIcon { get; set; }
         public string SelectIcon { get; set; }
         public string Title { get; set; }
+        public string PagPath { get; set; }
+        public string ScrollerAnimationImages { get; set; }
+        public string Style { get; set; }
     }
 }

Models/BackEndOpRecord.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/BrokenMachineChange.cs

@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models
+{
+    public partial class BrokenMachineChange
+    {
+        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 OutStoreManagerMobile { get; set; }
+        public string OutStoreManager { get; set; }
+        public string OutStoreAddress { get; set; }
+        public string OutStoreAreas { get; set; }
+        public string OutStoreName { get; set; }
+        public int OutStoreId { get; set; }
+        public string OutProductName { get; set; }
+        public int OutProductType { get; set; }
+        public int BackStoreUserId { get; set; }
+        public string Remark { get; set; }
+        public string BackStoreName { get; set; }
+        public int BackStoreId { get; set; }
+        public string ChangeSnExpand { get; set; }
+        public string OrderExpand { get; set; }
+        public DateTime? CompleteTime { get; set; }
+        public string AuditRemark { get; set; }
+        public int AuditResult { get; set; }
+        public DateTime? AuditTime { get; set; }
+        public string AuditBy { get; set; }
+        public DateTime? ChangeTime { get; set; }
+        public int ChangeDeviceNum { get; set; }
+        public string ChangeDeviceName { get; set; }
+        public string BackProductName { get; set; }
+        public int BackProductType { get; set; }
+        public int UserId { get; set; }
+        public string ChangeNo { get; set; }
+    }
+}

Models/BrokenMachineChangeDetail.cs

@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models
+{
+    public partial class BrokenMachineChangeDetail
+    {
+        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 BackSnType { get; set; }
+        public string Remark { get; set; }
+        public int OutSnType { get; set; }
+        public string OutSnNo { get; set; }
+        public string OutProductName { get; set; }
+        public int OutProductType { get; set; }
+        public int BackDeviceStatus { get; set; }
+        public string BackSnNo { get; set; }
+        public int UserId { get; set; }
+        public string BackProductName { get; set; }
+        public int BackProductType { get; set; }
+        public int ChangeId { get; set; }
+        public string ChangeNo { get; set; }
+    }
+}

Models/HelpProfitAccountRecord.cs

@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models
+{
+    public partial class HelpProfitAccountRecord
+    {
+        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 TransRecordNo { get; set; }
+        public string Remark { get; set; }
+        public decimal AfterBalanceAmount { get; set; }
+        public decimal BeforeBalanceAmount { get; set; }
+        public decimal AfterFreezeAmount { get; set; }
+        public decimal BeforeFreezeAmount { get; set; }
+        public decimal AfterTotalAmount { get; set; }
+        public decimal BeforeTotalAmount { get; set; }
+        public decimal ChangeAmount { get; set; }
+        public int ProductType { get; set; }
+        public int ChangeType { get; set; }
+        public int UserId { get; set; }
+    }
+}

Models/HelpProfitExchange.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models
+{
+    public partial class HelpProfitExchange
+    {
+        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 ExchangeCount { get; set; }
+        public int UserId { get; set; }
+    }
+}

Models/HelpProfitExchangeDetail.cs

@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models
+{
+    public partial class HelpProfitExchangeDetail
+    {
+        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 RecordId { get; set; }
+        public string ExchangeCode { get; set; }
+        public int PosCouponId { get; set; }
+        public int UserId { get; set; }
+    }
+}

Models/HelpProfitMerIds.cs

@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models
+{
+    public partial class HelpProfitMerIds
+    {
+        public int MerchantId { get; set; }
+        public int UserId { get; set; }
+    }
+}

Models/HelpProfitMerTradeSummay.cs

@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models
+{
+    public partial class HelpProfitMerTradeSummay
+    {
+        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 BrandId { get; set; }
+        public decimal TradeAmount { get; set; }
+        public string TradeDate { get; set; }
+        public string TradeMonth { get; set; }
+        public int MerchantId { get; set; }
+    }
+}

Models/HelpProfitMerchantForUser.cs

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

Models/HelpProfitRebateDetail.cs

@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models
+{
+    public partial class HelpProfitRebateDetail
+    {
+        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 DebitRewardAmount { get; set; }
+        public decimal CreditRewardAmount { get; set; }
+        public int MerchantId { get; set; }
+        public int ProductType { get; set; }
+        public int UserId { get; set; }
+        public string TradeDate { get; set; }
+        public string TradeMonth { get; set; }
+    }
+}

Models/HelpProfitReward.cs

@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models
+{
+    public partial class HelpProfitReward
+    {
+        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 TopUserId { get; set; }
+        public int CheckStatus { get; set; }
+        public int RewardMerCount { get; set; }
+        public string Remark { get; set; }
+        public string RewardDesc { get; set; }
+        public string OpenRewardNo { get; set; }
+        public decimal DebitRewardAmount { get; set; }
+        public decimal CreditRewardAmount { get; set; }
+        public decimal DebitTradeAmt { get; set; }
+        public decimal CreditTradeAmt { get; set; }
+        public int RewardType { get; set; }
+        public int BrandId { get; set; }
+        public int UserId { get; set; }
+        public DateTime? TradeDate { get; set; }
+        public string TradeMonth { get; set; }
+    }
+}

Models/HelpProfitRewardDetail.cs

@@ -0,0 +1,44 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models
+{
+    public partial class HelpProfitRewardDetail
+    {
+        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 TopUserId { get; set; }
+        public int CheckStatus { get; set; }
+        public string OpenDetailRec { get; set; }
+        public string Remark { get; set; }
+        public string RewardDesc { get; set; }
+        public string OpenRewardNo { get; set; }
+        public decimal DebitRewardAmount { get; set; }
+        public decimal CreditRewardAmount { get; set; }
+        public decimal DebitTradeAmt { get; set; }
+        public decimal CreditTradeAmt { get; set; }
+        public string RewardTips { get; set; }
+        public int RewardType { get; set; }
+        public int MerBuddyType { get; set; }
+        public int SnStoreId { get; set; }
+        public DateTime? StandardDate { get; set; }
+        public int SnApplyUserId { get; set; }
+        public int SnType { get; set; }
+        public string MerNo { get; set; }
+        public string SnNo { get; set; }
+        public int DirectUserId { get; set; }
+        public int MerchantId { get; set; }
+        public string ProductName { get; set; }
+        public int BrandId { get; set; }
+        public int UserId { get; set; }
+        public DateTime? TradeDate { get; set; }
+        public string TradeMonth { get; set; }
+    }
+}

Models/LeaderAccountRecord.cs

@@ -9,8 +9,11 @@ namespace MySystem.Models
         public int Sort { get; set; }
         public int QueryCount { get; set; }
         public int Status { get; set; }
+        public int Version { get; set; }
         public DateTime? CreateDate { get; set; }
         public DateTime? UpdateDate { get; set; }
+        public string CreateMan { get; set; }
+        public string UpdateMan { get; set; }
         public string SeoTitle { get; set; }
         public string SeoKeyword { get; set; }
         public string SeoDescription { get; set; }

Models/PosCoupons.cs

@@ -20,5 +20,8 @@ namespace MySystem.Models
         public string ExchangeCode { get; set; }
         public int UserId { get; set; }
         public int LeaderUserId { get; set; }
+        public int HelpProfitMerchantId { get; set; }
+        public int HelpProfitStatus { get; set; }
+        public ulong HelpProfitFlag { get; set; }
     }
 }

Models/PosMachinesFeeChangeRecord.cs

@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models
+{
+    public partial class PosMachinesFeeChangeRecord
+    {
+        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 PosUserId { get; set; }
+        public string MerNo { get; set; }
+        public int MerchantId { get; set; }
+        public string PosSn { get; set; }
+        public decimal ChangeFee { get; set; }
+        public int PosId { get; set; }
+        public int UserId { get; set; }
+    }
+}

Models/PosMachinesTwo.cs

@@ -46,5 +46,11 @@ namespace MySystem.Models
         public int LeaderUserId { get; set; }
         public int PreUserId { get; set; }
         public int IsFirst { get; set; }
+        public string DownFeeMan { get; set; }
+        public string UpFeeMan { get; set; }
+        public DateTime? DownFeeDate { get; set; }
+        public DateTime? UpFeeDate { get; set; }
+        public ulong DownFeeFlag { get; set; }
+        public ulong UpFeeFlag { get; set; }
     }
 }

Models/ProfitRewardExport.cs

@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models
+{
+    public partial class ProfitRewardExport
+    {
+        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 decimal DebitTradeProfit { get; set; }
+        public decimal DebitTradeAmt { get; set; }
+        public decimal NotHelpCreditTradeProfit { get; set; }
+        public decimal NotHelpCreditTradeAmt { get; set; }
+        public decimal HelpCreditTradeProfit { get; set; }
+        public decimal HelpCreditTradeAmt { get; set; }
+        public decimal NonQrCreditTradeProfit { get; set; }
+        public decimal NonQrCreditTradeAmt { get; set; }
+        public decimal QrCreditTradeProfit { get; set; }
+        public decimal QrCreditTradeAmt { get; set; }
+        public decimal CreditTradeProfit { get; set; }
+        public decimal CreditTradeAmt { get; set; }
+        public string BrandName { get; set; }
+        public string DirectFlag { get; set; }
+        public int Rank { get; set; }
+        public int UserLevel { get; set; }
+        public string RealName { get; set; }
+        public string MakerCode { get; set; }
+    }
+}

Models/ProfitRewardRecordCopy1.cs

@@ -0,0 +1,77 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models
+{
+    public partial class ProfitRewardRecordCopy1
+    {
+        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 TopUserId { get; set; }
+        public string RecordNo { get; set; }
+        public string TradeMonth { get; set; }
+        public string Remark { get; set; }
+        public int CheckStatus { get; set; }
+        public decimal QrDebitAddOrSubRate { get; set; }
+        public decimal QrDebitProfitStandardRate { get; set; }
+        public decimal QrDebitProfitRate { get; set; }
+        public decimal QrCreditAddOrSubRate { get; set; }
+        public decimal QrCreditProfitStandardRate { get; set; }
+        public decimal QrCreditProfitRate { get; set; }
+        public decimal DebitCapSingleReward { get; set; }
+        public decimal HelpDebitAddOrSubRate { get; set; }
+        public decimal HelpDebitProfitStandardRate { get; set; }
+        public decimal HelpDebitProfitRate { get; set; }
+        public decimal NotHelpDebitAddOrSubRate { get; set; }
+        public decimal NotHelpDebitProfitStandardRate { get; set; }
+        public decimal NotHelpDebitProfitRate { get; set; }
+        public decimal HelpCreditAddOrSubRate { get; set; }
+        public decimal HelpCreditProfitStandardRate { get; set; }
+        public decimal HelpCreditProfitRate { get; set; }
+        public decimal NotHelpCreditAddOrSubRate { get; set; }
+        public decimal NotHelpCreditProfitStandardRate { get; set; }
+        public decimal NotHelpCreditProfitRate { get; set; }
+        public decimal DebitTradeCapProfit { get; set; }
+        public decimal HelpDebitNonTradeCapProfit { get; set; }
+        public decimal NotHelpDebitNonTradeCapProfit { get; set; }
+        public decimal NonQrDebitNonTradeCapProfit { get; set; }
+        public decimal QrDebitNonTradeCapProfit { get; set; }
+        public decimal DebitNonTradeCapProfit { get; set; }
+        public decimal HelpCreditTradeProfit { get; set; }
+        public decimal NotHelpCreditTradeProfit { get; set; }
+        public decimal NonQrCreditTradeProfit { get; set; }
+        public decimal QrCreditTradeProfit { get; set; }
+        public decimal CreditTradeProfit { get; set; }
+        public decimal TradeProfit { get; set; }
+        public int DebitCapTradeNum { get; set; }
+        public decimal DebitCapTradeAmt { get; set; }
+        public decimal HelpDebitNonCapTradeAmt { get; set; }
+        public decimal NotHelpDebitNonCapTradeAmt { get; set; }
+        public decimal NonQrDebitNotCapTradeAmt { get; set; }
+        public decimal QrDebitNotCapTradeAmt { get; set; }
+        public decimal DebitNonCapTradeAmt { get; set; }
+        public decimal HelpCreditTradeAmt { get; set; }
+        public decimal NotHelpCreditTradeAmt { get; set; }
+        public decimal NonQrCreditTradeAmt { get; set; }
+        public decimal QrCreditTradeAmt { get; set; }
+        public decimal CreditTradeAmt { get; set; }
+        public decimal TradeAmt { get; set; }
+        public decimal OtherDebitNotCapTradeAmt { get; set; }
+        public decimal OtherCreditTradeAmt { get; set; }
+        public decimal OtherTradeAmt { get; set; }
+        public int ProfitType { get; set; }
+        public int BrandId { get; set; }
+        public int MerchantId { get; set; }
+        public int UserId { get; set; }
+    }
+}

Models/ProfitSubsidyDetailCopy1.cs

@@ -0,0 +1,41 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models
+{
+    public partial class ProfitSubsidyDetailCopy1
+    {
+        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/ProfitSubsidyExport.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models
+{
+    public partial class ProfitSubsidyExport
+    {
+        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 decimal SubsidyProfit { get; set; }
+        public decimal CreditTradeAmt { get; set; }
+        public string BrandName { get; set; }
+        public string DirectFlag { get; set; }
+        public string MerchantName { get; set; }
+        public string KqSnNo { get; set; }
+        public int Rank { get; set; }
+        public int UserLevel { get; set; }
+        public string RealName { get; set; }
+        public string MakerCode { get; set; }
+    }
+}

Models/SchoolMakerStudy.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models
+{
+    public partial class SchoolMakerStudy
+    {
+        public int Id { get; set; }
+        public int Sort { get; set; }
+        public int QueryCount { get; set; }
+        public int Status { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public string SeoTitle { get; set; }
+        public string SeoKeyword { get; set; }
+        public string SeoDescription { get; set; }
+        public string Url { get; set; }
+        public string Contents { get; set; }
+        public string ListPic { get; set; }
+        public string Detail { get; set; }
+        public string Title { get; set; }
+    }
+}

Models/SchoolMorningMeet.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models
+{
+    public partial class SchoolMorningMeet
+    {
+        public int Id { get; set; }
+        public int Sort { get; set; }
+        public int QueryCount { get; set; }
+        public int Status { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public string SeoTitle { get; set; }
+        public string SeoKeyword { get; set; }
+        public string SeoDescription { get; set; }
+        public string Contents { get; set; }
+        public string Url { get; set; }
+        public int StudyPerson { get; set; }
+        public string Photo { get; set; }
+        public string Lecturer { get; set; }
+        public string Title { get; set; }
+    }
+}

Models/SchoolMorningMeetLog.cs

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

Models/StoreHouseAmountPromiss.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/TradeDaySummary.cs

@@ -62,5 +62,23 @@ namespace MySystem.Models
         public int UserId { get; set; }
         public int PayType { get; set; }
         public int VipFlag { get; set; }
+        public decimal ProfitNonDirectNonQrDebitTradeAmt { get; set; }
+        public decimal ProfitDirectNonQrDebitTradeAmt { get; set; }
+        public decimal ProfitNonDirectQrDebitTradeAmt { get; set; }
+        public decimal ProfitDirectQrDebitTradeAmt { get; set; }
+        public decimal ProfitNonDirectDebitCapNum { get; set; }
+        public decimal ProfitNonDirectDebitCapTradeAmt { get; set; }
+        public decimal ProfitNonDirectDebitTradeAmt { get; set; }
+        public decimal ProfitDirectDebitCapNum { get; set; }
+        public decimal ProfitDirectDebitCapTradeAmt { get; set; }
+        public decimal ProfitDirectDebitTradeAmt { get; set; }
+        public decimal ProfitNonDirectNonQrCreditTradeAmt { get; set; }
+        public decimal ProfitDirectNonQrCreditTradeAmt { get; set; }
+        public decimal ProfitNonDirectQrCreditTradeAmt { get; set; }
+        public decimal ProfitDirectQrCreditTradeAmt { get; set; }
+        public decimal ProfitNonDirectCreditTradeAmt { get; set; }
+        public decimal ProfitDirectCreditTradeAmt { get; set; }
+        public decimal ProfitNonDirectTradeAmt { get; set; }
+        public decimal ProfitDirectTradeAmt { get; set; }
     }
 }

Models/UserAccount.cs

@@ -37,5 +37,6 @@ namespace MySystem.Models
         public decimal LeaderReserve { get; set; }
         public decimal ValidAmount { get; set; }
         public decimal LeaderBalanceAmount { get; set; }
+        public decimal HelpProfitBalanceAmount { get; set; }
     }
 }

Models/Users.cs

@@ -83,8 +83,10 @@ namespace MySystem.Models
         public string CashNote { get; set; }
         public decimal ThisMonthTrade { get; set; }
         public int LeaderLevel { get; set; }
-        public decimal ValidAmount { get; set; }
         public int BusinessFlag { get; set; }
+        public decimal ValidAmount { get; set; }
         public string DeviceType { get; set; }
+        public DateTime? HelpProfitAgreeDate { get; set; }
+        public ulong HelpProfitAgree { get; set; }
     }
 }

PxcModels/PosMachinesFeeChangeRecord.cs

@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class PosMachinesFeeChangeRecord
+    {
+        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 PosUserId { get; set; }
+        public string MerNo { get; set; }
+        public int MerchantId { get; set; }
+        public string PosSn { get; set; }
+        public decimal ChangeFee { get; set; }
+        public int PosId { get; set; }
+        public int UserId { get; set; }
+    }
+}

PxcModels/PosMachinesTwo.cs

@@ -46,5 +46,11 @@ namespace MySystem.PxcModels
         public int LeaderUserId { get; set; }
         public int PreUserId { get; set; }
         public int IsFirst { get; set; }
+        public string DownFeeMan { get; set; }
+        public string UpFeeMan { get; set; }
+        public DateTime? DownFeeDate { get; set; }
+        public DateTime? UpFeeDate { get; set; }
+        public ulong DownFeeFlag { get; set; }
+        public ulong UpFeeFlag { get; set; }
     }
 }

PxcModels/TradeDaySummary.cs

@@ -62,5 +62,23 @@ namespace MySystem.PxcModels
         public int UserId { get; set; }
         public int PayType { get; set; }
         public int VipFlag { get; set; }
+        public decimal ProfitNonDirectNonQrDebitTradeAmt { get; set; }
+        public decimal ProfitDirectNonQrDebitTradeAmt { get; set; }
+        public decimal ProfitNonDirectQrDebitTradeAmt { get; set; }
+        public decimal ProfitDirectQrDebitTradeAmt { get; set; }
+        public decimal ProfitNonDirectDebitCapNum { get; set; }
+        public decimal ProfitNonDirectDebitCapTradeAmt { get; set; }
+        public decimal ProfitNonDirectDebitTradeAmt { get; set; }
+        public decimal ProfitDirectDebitCapNum { get; set; }
+        public decimal ProfitDirectDebitCapTradeAmt { get; set; }
+        public decimal ProfitDirectDebitTradeAmt { get; set; }
+        public decimal ProfitNonDirectNonQrCreditTradeAmt { get; set; }
+        public decimal ProfitDirectNonQrCreditTradeAmt { get; set; }
+        public decimal ProfitNonDirectQrCreditTradeAmt { get; set; }
+        public decimal ProfitDirectQrCreditTradeAmt { get; set; }
+        public decimal ProfitNonDirectCreditTradeAmt { get; set; }
+        public decimal ProfitDirectCreditTradeAmt { get; set; }
+        public decimal ProfitNonDirectTradeAmt { get; set; }
+        public decimal ProfitDirectTradeAmt { get; set; }
     }
 }

PxcModels/WebCMSEntities.cs

@@ -121,6 +121,7 @@ namespace MySystem.PxcModels
         public virtual DbSet<PosCouponRecord> PosCouponRecord { get; set; }
         public virtual DbSet<PosCoupons> PosCoupons { get; set; }
         public virtual DbSet<PosMachines> PosMachines { get; set; }
+        public virtual DbSet<PosMachinesFeeChangeRecord> PosMachinesFeeChangeRecord { get; set; }
         public virtual DbSet<PosMachinesTwo> PosMachinesTwo { get; set; }
         public virtual DbSet<PosMerchantInfo> PosMerchantInfo { get; set; }
         public virtual DbSet<PosMerchantOtherInfo> PosMerchantOtherInfo { get; set; }
@@ -8143,6 +8144,56 @@ namespace MySystem.PxcModels
                 entity.Property(e => e.Version).HasColumnType("int(11)");
             });
 
+            modelBuilder.Entity<PosMachinesFeeChangeRecord>(entity =>
+            {
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.ChangeFee).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.CreateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.MerNo)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.MerchantId).HasColumnType("int(11)");
+
+                entity.Property(e => e.PosId).HasColumnType("int(11)");
+
+                entity.Property(e => e.PosSn)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.PosUserId).HasColumnType("int(11)");
+
+                entity.Property(e => e.QueryCount).HasColumnType("int(11)");
+
+                entity.Property(e => e.SeoDescription)
+                    .HasColumnType("varchar(500)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoKeyword)
+                    .HasColumnType("varchar(200)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoTitle)
+                    .HasColumnType("varchar(100)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Sort).HasColumnType("int(11)");
+
+                entity.Property(e => e.Status).HasColumnType("int(11)");
+
+                entity.Property(e => e.UpdateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.UserId).HasColumnType("int(11)");
+            });
+
             modelBuilder.Entity<PosMachinesTwo>(entity =>
             {
                 entity.Property(e => e.Id).HasColumnType("int(11)");
@@ -8197,6 +8248,17 @@ namespace MySystem.PxcModels
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.DownFeeDate).HasColumnType("datetime");
+
+                entity.Property(e => e.DownFeeFlag)
+                    .HasColumnType("bit(1)")
+                    .HasDefaultValueSql("b'0'");
+
+                entity.Property(e => e.DownFeeMan)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
                 entity.Property(e => e.IsFirst).HasColumnType("int(11)");
 
                 entity.Property(e => e.IsPurchase).HasColumnType("int(11)");
@@ -8256,6 +8318,17 @@ namespace MySystem.PxcModels
 
                 entity.Property(e => e.TransferTime).HasColumnType("datetime");
 
+                entity.Property(e => e.UpFeeDate).HasColumnType("datetime");
+
+                entity.Property(e => e.UpFeeFlag)
+                    .HasColumnType("bit(1)")
+                    .HasDefaultValueSql("b'0'");
+
+                entity.Property(e => e.UpFeeMan)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
                 entity.Property(e => e.UpdateDate).HasColumnType("datetime");
 
                 entity.Property(e => e.UserId).HasColumnType("int(11)");
@@ -13435,6 +13508,42 @@ namespace MySystem.PxcModels
 
                 entity.Property(e => e.PayType).HasColumnType("int(11)");
 
+                entity.Property(e => e.ProfitDirectCreditTradeAmt).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.ProfitDirectDebitCapNum).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.ProfitDirectDebitCapTradeAmt).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.ProfitDirectDebitTradeAmt).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.ProfitDirectNonQrCreditTradeAmt).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.ProfitDirectNonQrDebitTradeAmt).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.ProfitDirectQrCreditTradeAmt).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.ProfitDirectQrDebitTradeAmt).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.ProfitDirectTradeAmt).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.ProfitNonDirectCreditTradeAmt).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.ProfitNonDirectDebitCapNum).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.ProfitNonDirectDebitCapTradeAmt).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.ProfitNonDirectDebitTradeAmt).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.ProfitNonDirectNonQrCreditTradeAmt).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.ProfitNonDirectNonQrDebitTradeAmt).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.ProfitNonDirectQrCreditTradeAmt).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.ProfitNonDirectQrDebitTradeAmt).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.ProfitNonDirectTradeAmt).HasColumnType("decimal(18,2)");
+
                 entity.Property(e => e.QueryCount).HasColumnType("int(11)");
 
                 entity.Property(e => e.SeoDescription)

Startup.cs

@@ -91,8 +91,8 @@ namespace MySystem
             // services.AddHostedService<SycnSpTimer>(); //同步SP数据
 
             // services.AddHostedService<TimerStatTimer>(); //实时统计创客、激活商户数
-            services.AddHostedService<PosTradeStatTimer>(); // 统计头天的交易额、商户型创客、激活奖励、开机奖励
-            services.AddHostedService<AlipayPayBack2Timer>(); //支付宝回调处理
+            // services.AddHostedService<PosTradeStatTimer>(); // 统计头天的交易额、商户型创客、激活奖励、开机奖励
+            // services.AddHostedService<AlipayPayBack2Timer>(); //支付宝回调处理
 
             //services.AddHttpContextAccessor();
 
@@ -190,31 +190,33 @@ 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解绑数据
-            RedPackageV2Helper.Instance.Start(); //每天生成红包
-            RedPackageV2Helper.Instance.StartStatTop10(); //红包活动统计排行
-            RedPackageV2Helper.Instance.StartSendPrize(); //红包活动发奖
-            BalancePayBackService.Instance.Start(); //余额支付队列
-            ReservePayBackService.Instance.Start(); //储备金支付队列
-            LeaderPrizeService.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解绑数据
+            // RedPackageV2Helper.Instance.Start(); //每天生成红包
+            // RedPackageV2Helper.Instance.StartStatTop10(); //红包活动统计排行
+            // RedPackageV2Helper.Instance.StartSendPrize(); //红包活动发奖
+            // BalancePayBackService.Instance.Start(); //余额支付队列
+            // ReservePayBackService.Instance.Start(); //储备金支付队列
+            // LeaderPrizeService.Instance.Start(); //大盟主奖励发奖
             MessageCenterService.Instance.Start(); // 消息队列
-            RecommendActStatService.Instance.Start(); //推荐王奖励数据统计
-            StoreApplyHelper.Instance.Start(); // 每月1号重置仓库额度
-            StoreApplyHelper.Instance.StartEverTime();
-            StatService.Instance.StatUserLevel(); //升级并分润
+            // RecommendActStatService.Instance.Start(); //推荐王奖励数据统计
+            // StoreApplyHelper.Instance.Start(); // 每月1号重置仓库额度
+            // StoreApplyHelper.Instance.StartEverTime();
+            // StatService.Instance.StatUserLevel(); //升级并分润
             //必须打开的
 
-            HelpProfitHelper.Instance.Start();
-            HelpProfitPreMerchantHelper.Instance.Start();
+            // HelpProfitHelper.Instance.Start();
+            // HelpProfitPreMerchantHelper.Instance.Start();
+            SetDepositService.Instance.Start(); //费率设置队列
+
             // StatService.Instance.StartPosActNum(); //实时统计激活数
             // StatService.Instance.StartNewUserNum(); //实时统计新增创客数
             // StatService.Instance.StatProfit(); //实时统计创客收益

appsettings.json

@@ -17,8 +17,8 @@
     "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;",
+    "SqlConnStr": "server=47.109.31.237;port=3306;user=KxsMainServer2;password=FrW8ZfxlcaVdm1r0;database=KxsMainServer2;charset=utf8;",
+    "Pxc1SqlConnStr": "server=47.109.31.237;port=3306;user=KxsMainServer2;password=FrW8ZfxlcaVdm1r0;database=KxsMainServer2;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",