Pārlūkot izejas kodu

导出表格判断存量和增量

lcl 1 gadu atpakaļ
vecāks
revīzija
bbe1884fd4

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 0
AppStart/Helper/Profit/ProfitCheckHelper.cs


+ 1 - 1
AppStart/Helper/Profit/ProfitHelperV2.cs

@@ -44,7 +44,7 @@ namespace MySystem
                     ProfitBeforeHelper.Instance.StatProfiting();
                     ProfitAfterHelper.Instance.StatProfiting();
                     HelpProfitHelper.Instance.StatProfitEveryDay(DateTime.Now.AddMonths(-1).ToString("yyyyMM")); //助利宝分润
-                    // ProfitCheckHelper.Instance.Start();
+                    ProfitCheckHelper.Instance.Start();
                 }
                 else
                 {

+ 5 - 0
PxcModels/AppBottomNavs.cs

@@ -28,5 +28,10 @@ namespace MySystem.PxcModels
         public string PagPath { get; set; }
         public string ScrollerAnimationImages { get; set; }
         public string Style { get; set; }
+        public string StatusBarColor { get; set; }
+        public int IconSize { get; set; }
+        public string PagDefaultIcon { get; set; }
+        public string PagLocalPath { get; set; }
+        public ulong ShowTitle { get; set; }
     }
 }

+ 1 - 0
PxcModels/MachineChangeDetail.cs

@@ -30,5 +30,6 @@ namespace MySystem.PxcModels
         public int BackProductType { get; set; }
         public int ChangeId { get; set; }
         public string ChangeNo { get; set; }
+        public ulong NoticeFlag { get; set; }
     }
 }

+ 1 - 0
PxcModels/MachineUnBind.cs

@@ -22,5 +22,6 @@ namespace MySystem.PxcModels
         public int BrandId { get; set; }
         public int UserId { get; set; }
         public string ApplyNo { get; set; }
+        public ulong NoticeFlag { get; set; }
     }
 }

+ 28 - 0
PxcModels/MerchantDepositRecord.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class MerchantDepositRecord
+    {
+        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 ulong NoticeFlag { get; set; }
+        public string OrderId { get; set; }
+        public int UserId { get; set; }
+        public decimal DepositAmount { get; set; }
+        public string MerNo { get; set; }
+        public string SnNo { get; set; }
+        public string AgentNo { get; set; }
+    }
+}

+ 1 - 0
PxcModels/PosMerchantInfo.cs

@@ -45,5 +45,6 @@ namespace MySystem.PxcModels
         public string MerchantNo { get; set; }
         public int StandardMonths { get; set; }
         public int StandardStatus { get; set; }
+        public ulong NoticeFlag { get; set; }
     }
 }

+ 20 - 0
PxcModels/ProfitRewardExport.cs

@@ -39,5 +39,25 @@ namespace MySystem.PxcModels
         public decimal ProfitCreditTradeAmt { get; set; }
         public decimal ProfitCreditTradeProfit2 { get; set; }
         public decimal ProfitCreditTradeAmt2 { get; set; }
+        public decimal ProfitCreditTradeProfit2Before { get; set; }
+        public decimal ProfitCreditTradeAmt2Before { get; set; }
+        public decimal ProfitCreditTradeProfitBefore { get; set; }
+        public decimal ProfitCreditTradeAmtBefore { get; set; }
+        public decimal DebitTradeProfitBefore { get; set; }
+        public decimal DebitTradeAmtBefore { get; set; }
+        public decimal NotHelpCreditTradeProfitBefore { get; set; }
+        public decimal NotHelpCreditTradeAmtBefore { get; set; }
+        public decimal HelpCreditTradeProfitBefore { get; set; }
+        public decimal HelpCreditTradeAmtBefore { get; set; }
+        public decimal NonQrCreditTradeProfitBefore { get; set; }
+        public decimal NonQrCreditTradeAmtBefore { get; set; }
+        public decimal QrCreditTradeProfitBefore { get; set; }
+        public decimal QrCreditTradeAmtBefore { get; set; }
+        public decimal CreditTradeProfitBefore { get; set; }
+        public decimal CreditTradeAmtBefore { get; set; }
+        public int BeforeRank { get; set; }
+        public int LeaderRank { get; set; }
+        public int OperateRank { get; set; }
+        public int MaxRank { get; set; }
     }
 }

+ 10 - 0
PxcModels/RecommendOrderCheck.cs

@@ -0,0 +1,10 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class RecommendOrderCheck
+    {
+        public int OrderId { get; set; }
+    }
+}

+ 1 - 0
PxcModels/ToChargeBackRecord.cs

@@ -22,5 +22,6 @@ namespace MySystem.PxcModels
         public decimal TotalAmount { get; set; }
         public int TimeNumber { get; set; }
         public DateTime? StartDate { get; set; }
+        public int Kind { get; set; }
     }
 }

+ 1 - 0
PxcModels/ToChargeBackRecordSub.cs

@@ -19,5 +19,6 @@ namespace MySystem.PxcModels
         public string Remark { get; set; }
         public decimal ChargeAmount { get; set; }
         public int ParentId { get; set; }
+        public int Kind { get; set; }
     }
 }

+ 1 - 0
PxcModels/ToChargeByStage.cs

@@ -20,5 +20,6 @@ namespace MySystem.PxcModels
         public string Remark { get; set; }
         public decimal ChargeAmount { get; set; }
         public int UserId { get; set; }
+        public int Kind { get; set; }
     }
 }

+ 32 - 0
PxcModels/TradeDaySummary2After.cs

@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class TradeDaySummary2After
+    {
+        public int Id { get; set; }
+        public int Sort { get; set; }
+        public int QueryCount { get; set; }
+        public int Status { get; set; }
+        public int Version { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public string CreateMan { get; set; }
+        public string UpdateMan { get; set; }
+        public string SeoTitle { get; set; }
+        public string SeoKeyword { get; set; }
+        public string SeoDescription { get; set; }
+        public decimal ProfitDebitCapNum { get; set; }
+        public decimal ProfitDebitCapTradeAmt { get; set; }
+        public decimal ProfitDebitTradeAmt { get; set; }
+        public decimal ProfitTradeAmt { get; set; }
+        public int PayType { get; set; }
+        public int VipFlag { get; set; }
+        public int TopUserId { get; set; }
+        public int BrandId { get; set; }
+        public string TradeMonth { get; set; }
+        public string TradeDate { get; set; }
+        public int UserId { get; set; }
+    }
+}

+ 32 - 0
PxcModels/TradeDaySummary2Before.cs

@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class TradeDaySummary2Before
+    {
+        public int Id { get; set; }
+        public int Sort { get; set; }
+        public int QueryCount { get; set; }
+        public int Status { get; set; }
+        public int Version { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public string CreateMan { get; set; }
+        public string UpdateMan { get; set; }
+        public string SeoTitle { get; set; }
+        public string SeoKeyword { get; set; }
+        public string SeoDescription { get; set; }
+        public decimal ProfitDebitCapNum { get; set; }
+        public decimal ProfitDebitCapTradeAmt { get; set; }
+        public decimal ProfitDebitTradeAmt { get; set; }
+        public decimal ProfitTradeAmt { get; set; }
+        public int PayType { get; set; }
+        public int VipFlag { get; set; }
+        public int TopUserId { get; set; }
+        public int BrandId { get; set; }
+        public string TradeMonth { get; set; }
+        public string TradeDate { get; set; }
+        public int UserId { get; set; }
+    }
+}

+ 84 - 0
PxcModels/TradeDaySummaryAfter.cs

@@ -0,0 +1,84 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class TradeDaySummaryAfter
+    {
+        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 decimal HelpNonDirectNonQrDebitTradeAmt { get; set; }
+        public decimal HelpDirectNonQrDebitTradeAmt { get; set; }
+        public decimal HelpNonDirectQrDebitTradeAmt { get; set; }
+        public decimal HelpDirectQrDebitTradeAmt { get; set; }
+        public decimal HelpNonDirectDebitCapNum { get; set; }
+        public decimal HelpNonDirectDebitCapTradeAmt { get; set; }
+        public decimal HelpNonDirectDebitTradeAmt { get; set; }
+        public decimal HelpDirectDebitCapNum { get; set; }
+        public decimal HelpDirectDebitCapTradeAmt { get; set; }
+        public decimal HelpDirectDebitTradeAmt { get; set; }
+        public decimal HelpNonDirectNonQrCreditTradeAmt { get; set; }
+        public decimal HelpDirectNonQrCreditTradeAmt { get; set; }
+        public decimal HelpNonDirectQrCreditTradeAmt { get; set; }
+        public decimal HelpDirectQrCreditTradeAmt { get; set; }
+        public decimal HelpNonDirectCreditTradeAmt { get; set; }
+        public decimal HelpDirectCreditTradeAmt { get; set; }
+        public decimal HelpNonDirectTradeAmt { get; set; }
+        public decimal HelpDirectTradeAmt { get; set; }
+        public decimal NotHelpNonDirectNonQrDebitTradeAmt { get; set; }
+        public decimal NotHelpDirectNonQrDebitTradeAmt { get; set; }
+        public decimal NotHelpNonDirectQrDebitTradeAmt { get; set; }
+        public decimal NotHelpDirectQrDebitTradeAmt { get; set; }
+        public int NotHelpNonDirectDebitCapNum { get; set; }
+        public decimal NotHelpNonDirectDebitCapTradeAmt { get; set; }
+        public decimal NotHelpNonDirectDebitTradeAmt { get; set; }
+        public int NotHelpDirectDebitCapNum { get; set; }
+        public decimal NotHelpDirectDebitCapTradeAmt { get; set; }
+        public decimal NotHelpDirectDebitTradeAmt { get; set; }
+        public decimal NotHelpNonDirectNonQrCreditTradeAmt { get; set; }
+        public decimal NotHelpDirectNonQrCreditTradeAmt { get; set; }
+        public decimal NotHelpNonDirectQrCreditTradeAmt { get; set; }
+        public decimal NotHelpDirectQrCreditTradeAmt { get; set; }
+        public decimal NotHelpNonDirectCreditTradeAmt { get; set; }
+        public decimal NotHelpDirectCreditTradeAmt { get; set; }
+        public decimal NotHelpNonDirectTradeAmt { get; set; }
+        public decimal NotHelpDirectTradeAmt { get; set; }
+        public string MgrName { get; set; }
+        public string MgrNo { get; set; }
+        public int BrandId { get; set; }
+        public string TradeMonth { get; set; }
+        public string TradeDate { get; set; }
+        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; }
+    }
+}

+ 84 - 0
PxcModels/TradeDaySummaryBefore.cs

@@ -0,0 +1,84 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class TradeDaySummaryBefore
+    {
+        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 decimal HelpNonDirectNonQrDebitTradeAmt { get; set; }
+        public decimal HelpDirectNonQrDebitTradeAmt { get; set; }
+        public decimal HelpNonDirectQrDebitTradeAmt { get; set; }
+        public decimal HelpDirectQrDebitTradeAmt { get; set; }
+        public decimal HelpNonDirectDebitCapNum { get; set; }
+        public decimal HelpNonDirectDebitCapTradeAmt { get; set; }
+        public decimal HelpNonDirectDebitTradeAmt { get; set; }
+        public decimal HelpDirectDebitCapNum { get; set; }
+        public decimal HelpDirectDebitCapTradeAmt { get; set; }
+        public decimal HelpDirectDebitTradeAmt { get; set; }
+        public decimal HelpNonDirectNonQrCreditTradeAmt { get; set; }
+        public decimal HelpDirectNonQrCreditTradeAmt { get; set; }
+        public decimal HelpNonDirectQrCreditTradeAmt { get; set; }
+        public decimal HelpDirectQrCreditTradeAmt { get; set; }
+        public decimal HelpNonDirectCreditTradeAmt { get; set; }
+        public decimal HelpDirectCreditTradeAmt { get; set; }
+        public decimal HelpNonDirectTradeAmt { get; set; }
+        public decimal HelpDirectTradeAmt { get; set; }
+        public decimal NotHelpNonDirectNonQrDebitTradeAmt { get; set; }
+        public decimal NotHelpDirectNonQrDebitTradeAmt { get; set; }
+        public decimal NotHelpNonDirectQrDebitTradeAmt { get; set; }
+        public decimal NotHelpDirectQrDebitTradeAmt { get; set; }
+        public int NotHelpNonDirectDebitCapNum { get; set; }
+        public decimal NotHelpNonDirectDebitCapTradeAmt { get; set; }
+        public decimal NotHelpNonDirectDebitTradeAmt { get; set; }
+        public int NotHelpDirectDebitCapNum { get; set; }
+        public decimal NotHelpDirectDebitCapTradeAmt { get; set; }
+        public decimal NotHelpDirectDebitTradeAmt { get; set; }
+        public decimal NotHelpNonDirectNonQrCreditTradeAmt { get; set; }
+        public decimal NotHelpDirectNonQrCreditTradeAmt { get; set; }
+        public decimal NotHelpNonDirectQrCreditTradeAmt { get; set; }
+        public decimal NotHelpDirectQrCreditTradeAmt { get; set; }
+        public decimal NotHelpNonDirectCreditTradeAmt { get; set; }
+        public decimal NotHelpDirectCreditTradeAmt { get; set; }
+        public decimal NotHelpNonDirectTradeAmt { get; set; }
+        public decimal NotHelpDirectTradeAmt { get; set; }
+        public string MgrName { get; set; }
+        public string MgrNo { get; set; }
+        public int BrandId { get; set; }
+        public string TradeMonth { get; set; }
+        public string TradeDate { get; set; }
+        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; }
+    }
+}

+ 2 - 0
PxcModels/UserAccount.cs

@@ -46,5 +46,7 @@ namespace MySystem.PxcModels
         public decimal PreTempAmountForBalance { get; set; }
         public decimal PreTempAmount { get; set; }
         public decimal ToChargeAmount { get; set; }
+        public decimal LeaderToChargeAmount { get; set; }
+        public decimal OperateToChargeAmount { get; set; }
     }
 }

+ 23 - 0
PxcModels/UserExchangeLeaderRecord.cs

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

+ 12 - 0
PxcModels/UserMoveInfo.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class UserMoveInfo
+    {
+        public int UserId { get; set; }
+        public string PayPwd { get; set; }
+        public string LoginPwd { get; set; }
+    }
+}

+ 23 - 0
PxcModels/UserRankWhiteBefore.cs

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

+ 20 - 0
PxcModels/UserYearEndInCome.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class UserYearEndInCome
+    {
+        public int Id { get; set; }
+        public int Sort { get; set; }
+        public int Status { get; set; }
+        public int Version { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public decimal InComeByYear { get; set; }
+        public string TradeYear { get; set; }
+        public int UserId { get; set; }
+        public int ParentUserId { get; set; }
+        public string ParentNav { get; set; }
+    }
+}

+ 30 - 0
PxcModels/UserYearEndSummary.cs

@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class UserYearEndSummary
+    {
+        public int Id { get; set; }
+        public int Sort { get; set; }
+        public int Status { get; set; }
+        public int Version { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public int SeniorShareHolder { get; set; }
+        public int MiddleShareHolder { get; set; }
+        public int JuniorShareHolder { get; set; }
+        public decimal PersonalTradeAmountByYear { get; set; }
+        public int FifteenMillionTradeAmountUserCount { get; set; }
+        public int EightMillionTradeAmountUserCount { get; set; }
+        public int ThreeMillionTradeAmountUserCount { get; set; }
+        public int TeamMerchantActCountByYear { get; set; }
+        public int TeamTotalMakerByYear { get; set; }
+        public int PersonalMakerAddByYear { get; set; }
+        public decimal TeamTradeAmountByYear { get; set; }
+        public string TradeYear { get; set; }
+        public int UserId { get; set; }
+        public int? ParentUserId { get; set; }
+        public string ParentNav { get; set; }
+    }
+}

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 889 - 55
PxcModels/WebCMSEntities.cs


+ 3 - 2
Startup.cs

@@ -166,8 +166,9 @@ namespace MySystem
             }
             if(Library.ConfigurationManager.EnvironmentFlag == 2)
             {
-                StatService.Instance.StatUserLevel(); //升级
-                ProfitHelperV2.Instance.StatProfit(); //创客分润
+                // StatService.Instance.StatUserLevel(); //升级
+                // ProfitHelperV2.Instance.StatProfit(); //创客分润
+                ProfitCheckHelper.Instance.Start();
             }
         }
 

Daži faili netika attēloti, jo izmaiņu fails ir pārāk liels