更新交易统计表盈利期字段

交易记录盈利期标记

AppStart/Helper/SycnSpServer/SycnSpTradeService.cs

@@ -197,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)
@@ -228,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号

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/WebCMSEntities.cs

@@ -13508,6 +13508,42 @@ namespace MySystem.Models
 
                 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)

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

@@ -13508,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)