分润分离盈利期

AppStart/Helper/Profit/ProfitCheckHelper.cs

@@ -40,7 +40,7 @@ namespace MySystem
             WebCMSEntities db = new WebCMSEntities();
             string StartId = function.CheckInt(function.ReadInstance("/PublicParam/ProfitRewardRecordId/" + Month + ".txt"));
             OtherMySqlConn.connstr = Library.ConfigurationManager.AppSettings["Pxc1SqlConnStr"].ToString();
-            DataTable dt = OtherMySqlConn.dtable("select u.MakerCode,u.RealName,u.UserLevel,r.Rank,(case when ProfitType=1 then '直营' else '团队' end) as DirectFlag,k.Name,BrandId,CreditTradeAmt,CreditTradeProfit,QrCreditTradeAmt,QrCreditTradeProfit,NonQrCreditTradeAmt,NonQrCreditTradeProfit,HelpCreditTradeAmt,HelpCreditTradeProfit,NotHelpCreditTradeAmt,NotHelpCreditTradeProfit,DebitTradeAmt,DebitTradeProfit from (select UserId,ProfitType,BrandId,sum(CreditTradeAmt) as CreditTradeAmt,sum(CreditTradeProfit) as CreditTradeProfit,sum(QrCreditTradeAmt) as QrCreditTradeAmt,sum(QrCreditTradeProfit) as QrCreditTradeProfit,sum(NonQrCreditTradeAmt) as NonQrCreditTradeAmt,sum(NonQrCreditTradeProfit) as NonQrCreditTradeProfit,sum(HelpCreditTradeAmt) as HelpCreditTradeAmt,sum(HelpCreditTradeProfit) as HelpCreditTradeProfit,sum(NotHelpCreditTradeAmt) as NotHelpCreditTradeAmt,sum(NotHelpCreditTradeProfit) as NotHelpCreditTradeProfit,sum(DebitNonCapTradeAmt+DebitCapTradeAmt) as DebitTradeAmt,sum(DebitNonTradeCapProfit+DebitTradeCapProfit) as DebitTradeProfit from ProfitRewardRecord where Id>=" + StartId + " and TradeMonth='" + Month + "' GROUP BY UserId,ProfitType,BrandId) tb left join Users u on tb.UserId=u.Id LEFT JOIN KqProducts k ON k.Id=tb.BrandId left join UserRankWhite r on u.Id=r.Id and r.CreateDate<'" + DateTime.Now.ToString("yyyy-MM") + "-01 00:00:00' and r.UpdateDate>'" + DateTime.Now.ToString("yyyy-MM") + "-01 00:00:00' ORDER BY u.MakerCode");
+            DataTable dt = OtherMySqlConn.dtable("select u.MakerCode,u.RealName,u.UserLevel,r.Rank,(case when ProfitType=1 then '直营' else '团队' end) as DirectFlag,k.Name,BrandId,CreditTradeAmt,CreditTradeProfit,QrCreditTradeAmt,QrCreditTradeProfit,NonQrCreditTradeAmt,NonQrCreditTradeProfit,HelpCreditTradeAmt,HelpCreditTradeProfit,NotHelpCreditTradeAmt,NotHelpCreditTradeProfit,ProfitCreditTradeAmt,ProfitCreditTradeProfit,DebitTradeAmt,DebitTradeProfit from (select UserId,ProfitType,BrandId,sum(CreditTradeAmt) as CreditTradeAmt,sum(CreditTradeProfit) as CreditTradeProfit,sum(QrCreditTradeAmt) as QrCreditTradeAmt,sum(QrCreditTradeProfit) as QrCreditTradeProfit,sum(NonQrCreditTradeAmt) as NonQrCreditTradeAmt,sum(NonQrCreditTradeProfit) as NonQrCreditTradeProfit,sum(HelpCreditTradeAmt) as HelpCreditTradeAmt,sum(HelpCreditTradeProfit) as HelpCreditTradeProfit,sum(NotHelpCreditTradeAmt) as NotHelpCreditTradeAmt,sum(NotHelpCreditTradeProfit) as NotHelpCreditTradeProfit,sum(ProfitCreditTradeAmt) as ProfitCreditTradeAmt,sum(ProfitCreditTradeProfit) as ProfitCreditTradeProfit,sum(DebitNonCapTradeAmt+DebitCapTradeAmt) as DebitTradeAmt,sum(DebitNonTradeCapProfit+DebitTradeCapProfit) as DebitTradeProfit from ProfitRewardRecord where Id>=" + StartId + " and TradeMonth='" + Month + "' GROUP BY UserId,ProfitType,BrandId) tb left join Users u on tb.UserId=u.Id LEFT JOIN KqProducts k ON k.Id=tb.BrandId left join UserRankWhite r on u.Id=r.Id and r.CreateDate<'" + DateTime.Now.ToString("yyyy-MM") + "-01 00:00:00' and r.UpdateDate>'" + DateTime.Now.ToString("yyyy-MM") + "-01 00:00:00' ORDER BY u.MakerCode");
             function.WriteLog(DateTime.Now.ToString() + ":" + dt.Rows.Count, "分润结果检查");
             int index = 0;
             foreach(DataRow dr in dt.Rows)
@@ -63,6 +63,8 @@ namespace MySystem
                 decimal HelpCreditTradeProfit = decimal.Parse(function.CheckNum(dr["HelpCreditTradeProfit"].ToString()));
                 decimal NotHelpCreditTradeAmt = decimal.Parse(function.CheckNum(dr["NotHelpCreditTradeAmt"].ToString()));
                 decimal NotHelpCreditTradeProfit = decimal.Parse(function.CheckNum(dr["NotHelpCreditTradeProfit"].ToString()));
+                decimal ProfitCreditTradeAmt = decimal.Parse(function.CheckNum(dr["ProfitCreditTradeAmt"].ToString()));
+                decimal ProfitCreditTradeProfit = decimal.Parse(function.CheckNum(dr["ProfitCreditTradeProfit"].ToString()));
                 decimal DebitTradeAmt = decimal.Parse(function.CheckNum(dr["DebitTradeAmt"].ToString()));
                 decimal DebitTradeProfit = decimal.Parse(function.CheckNum(dr["DebitTradeProfit"].ToString()));
                 db.ProfitRewardExport.Add(new ProfitRewardExport()
@@ -86,6 +88,8 @@ namespace MySystem
                     HelpCreditTradeProfit = HelpCreditTradeProfit,
                     NotHelpCreditTradeAmt = NotHelpCreditTradeAmt,
                     NotHelpCreditTradeProfit = NotHelpCreditTradeProfit,
+                    ProfitCreditTradeAmt = ProfitCreditTradeAmt,
+                    ProfitCreditTradeProfit = ProfitCreditTradeProfit,
                     DebitTradeAmt = DebitTradeAmt,
                     DebitTradeProfit = DebitTradeProfit,
                 });

AppStart/Helper/Profit/ProfitHelperV2.cs

@@ -137,6 +137,12 @@ namespace MySystem
                                     decimal QrDebitProfitRate = 0;
                                     decimal QrDebitProfitStandardRate = 0;
                                     decimal QrDebitAddOrSubRate = 0;
+                                    decimal ProfitCreditTradeProfit = 0;
+                                    decimal ProfitCreditProfitRate = 0;
+                                    decimal ProfitCreditTradeAmt = 0;
+                                    decimal ProfitDebitNonCapTradeAmt = 0;
+                                    decimal ProfitDebitNonTradeCapProfit = 0;
+                                    decimal ProfitDebitProfitRate = 0;
                                     if (j == 1)
                                     {
                                         CreditTradeAmt = TradeAmt; //贷记卡交易总金额
@@ -157,6 +163,12 @@ namespace MySystem
                                                 HelpCreditProfitRate = ProfitRate; //(扶持期)(非云闪付)贷记卡商户交易对应分润比例
                                                 HelpCreditTradeAmt = TradeAmt; //(扶持期)(非云闪付)贷记卡交易总金额
                                             }
+                                            else if(sub.HelpFlag == 2)
+                                            {
+                                                ProfitCreditTradeProfit = ProfitAmt; //(扶持期)(非云闪付)贷记卡分润总金额
+                                                ProfitCreditProfitRate = ProfitRate; //(扶持期)(非云闪付)贷记卡商户交易对应分润比例
+                                                ProfitCreditTradeAmt = TradeAmt; //(扶持期)(非云闪付)贷记卡交易总金额
+                                            }
                                             else
                                             {
                                                 NotHelpCreditTradeAmt = TradeAmt; //(非扶持期)(非云闪付)贷记卡交易总金额
@@ -203,6 +215,15 @@ namespace MySystem
                                                 }
                                                 HelpDebitProfitRate = ProfitRate; //(扶持期)(非云闪付)借记卡商户交易对应分润比例
                                             }
+                                            else if (sub.HelpFlag == 2)
+                                            {
+                                                if (sub.Money < 1)
+                                                {
+                                                    ProfitDebitNonCapTradeAmt = TradeAmt; //(盈利期)(非云闪付)借记卡非封顶交易总金额
+                                                    ProfitDebitNonTradeCapProfit = ProfitAmt; //(盈利期)(非云闪付)借记卡非封顶交易分润总金额
+                                                }
+                                                ProfitDebitProfitRate = ProfitRate; //(盈利期)(非云闪付)借记卡商户交易对应分润比例
+                                            }
                                             else
                                             {
                                                 if (sub.Money < 1)
@@ -268,6 +289,12 @@ namespace MySystem
                                         QrDebitProfitRate = QrDebitProfitRate, //(云闪付)借记卡非封顶交易分润比例
                                         QrDebitProfitStandardRate = QrDebitProfitStandardRate, //(云闪付)借记卡非封顶交易分润基准
                                         QrDebitAddOrSubRate = QrDebitAddOrSubRate, //(云闪付)借记卡非封顶交易分润比例或增或减
+                                        ProfitCreditTradeProfit = ProfitCreditTradeProfit,  //(盈利期)(非云闪付)贷记卡分润总金额
+                                        ProfitCreditProfitRate = ProfitCreditProfitRate, //(盈利期)(非云闪付)贷记卡商户交易对应分润比例
+                                        ProfitCreditTradeAmt = ProfitCreditTradeAmt, //(盈利期)(非云闪付)贷记卡交易总金额
+                                        ProfitDebitNonCapTradeAmt = ProfitDebitNonCapTradeAmt, //(盈利期)(非云闪付)借记卡非封顶交易总金额
+                                        ProfitDebitNonTradeCapProfit = ProfitDebitNonTradeCapProfit, //(盈利期)(非云闪付)借记卡非封顶交易分润总金额
+                                        ProfitDebitProfitRate = ProfitDebitProfitRate, //(盈利期)(非云闪付)借记卡商户交易对应分润比例
                                     });
                                     // db.SaveChanges();
                                 }
@@ -395,12 +422,15 @@ namespace MySystem
                                 function.WriteLog(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff") + ":借记卡", "分润监控日志");
                                 decimal HelpDirectDebitTradeAmt = decimal.Parse(dr[2].ToString()); //借记卡扶持期交易额
                                 decimal NotHelpDirectDebitTradeAmt = decimal.Parse(dr[3].ToString()); //借记卡稳定期交易额
+                                decimal ProfitDirectDebitTradeAmt = decimal.Parse(dr[8].ToString()); //借记卡扶持期交易额
                                 decimal HelpDirectDebitCapTradeAmt = decimal.Parse(dr[4].ToString()); //借记卡扶持期封顶交易额
                                 decimal NotHelpDirectDebitCapTradeAmt = decimal.Parse(dr[5].ToString()); //借记卡稳定期封顶交易额
+                                decimal ProfitDirectDebitCapTradeAmt = decimal.Parse(dr[9].ToString()); //借记卡扶持期封顶交易额
                                 int HelpDirectDebitCapNum = int.Parse(dr[6].ToString().Split('.')[0]); //借记卡扶持期封顶交易笔数
                                 int NotHelpDirectDebitCapNum = int.Parse(dr[7].ToString().Split('.')[0]); //借记卡稳定期封顶交易笔数
+                                int ProfitDirectDebitCapNum = int.Parse(dr[10].ToString().Split('.')[0]); //借记卡扶持期封顶交易笔数
                                 int UserLevel = selfUser.UserLevel; //当前会员等级
-                                decimal getLevelProfit = (HelpDirectDebitTradeAmt + NotHelpDirectDebitTradeAmt - HelpDirectDebitCapTradeAmt - NotHelpDirectDebitCapTradeAmt) * 0.0006M + HelpDirectDebitCapNum + NotHelpDirectDebitCapNum;
+                                decimal getLevelProfit = (HelpDirectDebitTradeAmt + NotHelpDirectDebitTradeAmt + ProfitDirectDebitTradeAmt - HelpDirectDebitCapTradeAmt - NotHelpDirectDebitCapTradeAmt - ProfitDirectDebitCapTradeAmt) * 0.0006M + HelpDirectDebitCapNum + NotHelpDirectDebitCapNum + ProfitDirectDebitCapNum;
                                 result.Add(new ProfitResult()
                                 {
                                     UserId = selfUser.Id,
@@ -413,7 +443,7 @@ namespace MySystem
                                     BrandId = BrandId,
                                     DirectFlag = 1,
                                     IsSubsidy = 0,
-                                    TradeAmount = HelpDirectDebitTradeAmt + NotHelpDirectDebitTradeAmt,
+                                    TradeAmount = HelpDirectDebitTradeAmt + NotHelpDirectDebitTradeAmt + ProfitDirectDebitTradeAmt,
                                 });
                             }
                             else

Models/HelpProfitAmountSummary.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models
+{
+    public partial class HelpProfitAmountSummary
+    {
+        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 TradeAmount { get; set; }
+        public decimal MaxAmount { get; set; }
+        public int MerCount { get; set; }
+        public string TradeMonth { get; set; }
+        public int UserId { get; set; }
+    }
+}

Models/ProfitRewardExport.cs

@@ -35,5 +35,7 @@ namespace MySystem.Models
         public int UserLevel { get; set; }
         public string RealName { get; set; }
         public string MakerCode { get; set; }
+        public decimal ProfitCreditTradeProfit { get; set; }
+        public decimal ProfitCreditTradeAmt { get; set; }
     }
 }

Models/ProfitRewardRecord.cs

@@ -73,5 +73,11 @@ namespace MySystem.Models
         public int BrandId { get; set; }
         public int MerchantId { get; set; }
         public int UserId { get; set; }
+        public decimal ProfitDebitProfitRate { get; set; }
+        public decimal ProfitCreditProfitRate { get; set; }
+        public decimal ProfitDebitNonTradeCapProfit { get; set; }
+        public decimal ProfitCreditTradeProfit { get; set; }
+        public decimal ProfitDebitNonCapTradeAmt { get; set; }
+        public decimal ProfitCreditTradeAmt { get; set; }
     }
 }

Models/WebCMSEntities.cs

@@ -52,6 +52,7 @@ namespace MySystem.Models
         public virtual DbSet<FluxProfitDetail> FluxProfitDetail { get; set; }
         public virtual DbSet<FluxProfitSummary> FluxProfitSummary { get; set; }
         public virtual DbSet<HelpProfitAccountRecord> HelpProfitAccountRecord { get; set; }
+        public virtual DbSet<HelpProfitAmountSummary> HelpProfitAmountSummary { get; set; }
         public virtual DbSet<HelpProfitExchange> HelpProfitExchange { get; set; }
         public virtual DbSet<HelpProfitExchangeDetail> HelpProfitExchangeDetail { get; set; }
         public virtual DbSet<HelpProfitMerIds> HelpProfitMerIds { get; set; }
@@ -2991,6 +2992,49 @@ namespace MySystem.Models
                 entity.Property(e => e.Version).HasColumnType("int(11)");
             });
 
+            modelBuilder.Entity<HelpProfitAmountSummary>(entity =>
+            {
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.CreateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.MaxAmount).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.MerCount).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.TradeAmount).HasColumnType("decimal(18,2)");
+
+                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<HelpProfitExchange>(entity =>
             {
                 entity.Property(e => e.Id).HasColumnType("int(11)");
@@ -10602,6 +10646,10 @@ namespace MySystem.Models
 
                 entity.Property(e => e.NotHelpCreditTradeProfit).HasColumnType("decimal(18,2)");
 
+                entity.Property(e => e.ProfitCreditTradeAmt).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.ProfitCreditTradeProfit).HasColumnType("decimal(18,2)");
+
                 entity.Property(e => e.QrCreditTradeAmt).HasColumnType("decimal(18,2)");
 
                 entity.Property(e => e.QrCreditTradeProfit).HasColumnType("decimal(18,2)");
@@ -10733,6 +10781,18 @@ namespace MySystem.Models
 
                 entity.Property(e => e.OtherTradeAmt).HasColumnType("decimal(18,2)");
 
+                entity.Property(e => e.ProfitCreditProfitRate).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.ProfitCreditTradeAmt).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.ProfitCreditTradeProfit).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.ProfitDebitNonCapTradeAmt).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.ProfitDebitNonTradeCapProfit).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.ProfitDebitProfitRate).HasColumnType("decimal(18,2)");
+
                 entity.Property(e => e.ProfitType).HasColumnType("int(11)");
 
                 entity.Property(e => e.QrCreditAddOrSubRate).HasColumnType("decimal(18,2)");

PxcModels/HelpProfitAmountSummary.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class HelpProfitAmountSummary
+    {
+        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 TradeAmount { get; set; }
+        public decimal MaxAmount { get; set; }
+        public int MerCount { get; set; }
+        public string TradeMonth { get; set; }
+        public int UserId { get; set; }
+    }
+}

PxcModels/ProfitRewardExport.cs

@@ -35,5 +35,7 @@ namespace MySystem.PxcModels
         public int UserLevel { get; set; }
         public string RealName { get; set; }
         public string MakerCode { get; set; }
+        public decimal ProfitCreditTradeProfit { get; set; }
+        public decimal ProfitCreditTradeAmt { get; set; }
     }
 }

PxcModels/ProfitRewardRecord.cs

@@ -73,5 +73,11 @@ namespace MySystem.PxcModels
         public int BrandId { get; set; }
         public int MerchantId { get; set; }
         public int UserId { get; set; }
+        public decimal ProfitDebitProfitRate { get; set; }
+        public decimal ProfitCreditProfitRate { get; set; }
+        public decimal ProfitDebitNonTradeCapProfit { get; set; }
+        public decimal ProfitCreditTradeProfit { get; set; }
+        public decimal ProfitDebitNonCapTradeAmt { get; set; }
+        public decimal ProfitCreditTradeAmt { get; set; }
     }
 }

PxcModels/WebCMSEntities.cs

@@ -52,6 +52,7 @@ namespace MySystem.PxcModels
         public virtual DbSet<FluxProfitDetail> FluxProfitDetail { get; set; }
         public virtual DbSet<FluxProfitSummary> FluxProfitSummary { get; set; }
         public virtual DbSet<HelpProfitAccountRecord> HelpProfitAccountRecord { get; set; }
+        public virtual DbSet<HelpProfitAmountSummary> HelpProfitAmountSummary { get; set; }
         public virtual DbSet<HelpProfitExchange> HelpProfitExchange { get; set; }
         public virtual DbSet<HelpProfitExchangeDetail> HelpProfitExchangeDetail { get; set; }
         public virtual DbSet<HelpProfitMerIds> HelpProfitMerIds { get; set; }
@@ -2991,6 +2992,49 @@ namespace MySystem.PxcModels
                 entity.Property(e => e.Version).HasColumnType("int(11)");
             });
 
+            modelBuilder.Entity<HelpProfitAmountSummary>(entity =>
+            {
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.CreateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.MaxAmount).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.MerCount).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.TradeAmount).HasColumnType("decimal(18,2)");
+
+                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<HelpProfitExchange>(entity =>
             {
                 entity.Property(e => e.Id).HasColumnType("int(11)");
@@ -10602,6 +10646,10 @@ namespace MySystem.PxcModels
 
                 entity.Property(e => e.NotHelpCreditTradeProfit).HasColumnType("decimal(18,2)");
 
+                entity.Property(e => e.ProfitCreditTradeAmt).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.ProfitCreditTradeProfit).HasColumnType("decimal(18,2)");
+
                 entity.Property(e => e.QrCreditTradeAmt).HasColumnType("decimal(18,2)");
 
                 entity.Property(e => e.QrCreditTradeProfit).HasColumnType("decimal(18,2)");
@@ -10733,6 +10781,18 @@ namespace MySystem.PxcModels
 
                 entity.Property(e => e.OtherTradeAmt).HasColumnType("decimal(18,2)");
 
+                entity.Property(e => e.ProfitCreditProfitRate).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.ProfitCreditTradeAmt).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.ProfitCreditTradeProfit).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.ProfitDebitNonCapTradeAmt).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.ProfitDebitNonTradeCapProfit).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.ProfitDebitProfitRate).HasColumnType("decimal(18,2)");
+
                 entity.Property(e => e.ProfitType).HasColumnType("int(11)");
 
                 entity.Property(e => e.QrCreditAddOrSubRate).HasColumnType("decimal(18,2)");