统计商户交易额调整

AppStart/Helper/StatService.cs

@@ -140,6 +140,7 @@ namespace MySystem
                                 merchant.TotalAmount += TradeAmount;
                                 merchant.TotalConsumeCount += TradeCount;
                                 merchant.TotalActual += ActualAmount;
+                                merchant.ActMaxAmount += MaxDivi; //活动应返金额
                                 if(IsAct == 1)
                                 {
                                     merchant.TotalActAmount += TradeAmount;

AppStart/Helper/StatService2.cs

@@ -139,6 +139,7 @@ namespace MySystem
                                 merchant.TotalAmount += TradeAmount;
                                 merchant.TotalConsumeCount += TradeCount;
                                 merchant.TotalActual += ActualAmount;
+                                merchant.ActMaxAmount += MaxDivi; //活动应返金额
                                 if(IsAct == 1)
                                 {
                                     merchant.TotalActAmount += TradeAmount;

PxcModels/BusinessScope.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class BusinessScope
+    {
+        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 KindId { get; set; }
+        public string Name { get; set; }
+    }
+}

PxcModels/BusinessScopeType.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class BusinessScopeType
+    {
+        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 KindName { get; set; }
+    }
+}

PxcModels/ConsumerOrders.cs

@@ -28,5 +28,6 @@ namespace MySystem.PxcModels
         public int MerchantId { get; set; }
         public ulong IsAct { get; set; }
         public int UserId { get; set; }
+        public decimal MerchantActualAmount { get; set; }
     }
 }

PxcModels/HaoDaAreaCode.cs

@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class HaoDaAreaCode
+    {
+        public string CityName { get; set; }
+        public string CityCode { get; set; }
+    }
+}

PxcModels/MerchantAccountLinkInfo.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class MerchantAccountLinkInfo
+    {
+        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 MerchantId { get; set; }
+        public int Kind { get; set; }
+        public int LoginId { get; set; }
+    }
+}

PxcModels/MerchantAddInfo.cs

@@ -97,5 +97,52 @@ namespace MySystem.PxcModels
         public string ContactName { get; set; }
         public string BusinessCode { get; set; }
         public string IdCardAddress { get; set; }
+        public string WeChatRemark { get; set; }
+        public string AlipayRemark { get; set; }
+        public string WeChatSignUrl { get; set; }
+        public string AlipaySignUrl { get; set; }
+        public string AlipayAuthToken { get; set; }
+        public string AlipayPid { get; set; }
+        public string Extra1 { get; set; }
+        public string FaceRecognition { get; set; }
+        public string IndustryLicense1 { get; set; }
+        public string TaxImage { get; set; }
+        public string Agreement { get; set; }
+        public string ProductImg { get; set; }
+        public string CheckstandImg { get; set; }
+        public string ShopFrontImg { get; set; }
+        public string Support { get; set; }
+        public string SignaturePicture { get; set; }
+        public string AgentIdCardBack { get; set; }
+        public string AgentIdCardFront { get; set; }
+        public string AgentCardIdPicture { get; set; }
+        public string HoldAgentProtocol { get; set; }
+        public string AgentProtocol { get; set; }
+        public string OperatorMcht { get; set; }
+        public string RentAgreement { get; set; }
+        public string OpenAccountLicenses { get; set; }
+        public string ChannelKind { get; set; }
+        public string TakeCreditCard { get; set; }
+        public string BankCard { get; set; }
+        public string PersonWithIdCard { get; set; }
+        public string BusinessId { get; set; }
+        public string AreaNo { get; set; }
+        public string OpenUnionNo { get; set; }
+        public string OpenCollectBankCode { get; set; }
+        public string OpenBankRegionCode { get; set; }
+        public string OpenBankAccout { get; set; }
+        public string OpenBankAccName { get; set; }
+        public string ZbankRegionCode { get; set; }
+        public string ZbankNo { get; set; }
+        public string AccountType { get; set; }
+        public string LicenceType { get; set; }
+        public string ResserveMobile { get; set; }
+        public string MchtNo { get; set; }
+        public string ToAcctNo { get; set; }
+        public int OpenAct { get; set; }
+        public string StoreNo { get; set; }
+        public string OutMchtNo { get; set; }
+        public string AliMerchantId { get; set; }
+        public string WeChatMerchantId { get; set; }
     }
 }

PxcModels/MerchantDiviSummay.cs

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

PxcModels/MerchantInfo.cs

@@ -40,5 +40,10 @@ namespace MySystem.PxcModels
         public int ActivationStatus { get; set; }
         public decimal TotalActActual { get; set; }
         public decimal TotalActAmount { get; set; }
+        public int ActStat { get; set; }
+        public DateTime? SignDate { get; set; }
+        public decimal AllocationAmount { get; set; }
+        public decimal ActMaxAmount { get; set; }
+        public decimal ActCurrentAmount { get; set; }
     }
 }

PxcModels/MerchantLoginInfo.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class MerchantLoginInfo
+    {
+        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 LoginPwd { get; set; }
+        public string LoginMobile { get; set; }
+    }
+}

PxcModels/MerchantTradeSummary.cs

@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class MerchantTradeSummary
+    {
+        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 AliPayInFactAmount { get; set; }
+        public decimal WeChatInfactAmount { get; set; }
+        public int OderCount { get; set; }
+        public decimal InFactAmount { get; set; }
+        public decimal TradeAmount { get; set; }
+        public string TradeDate { get; set; }
+        public string TradeMonth { get; set; }
+        public int MerchantId { get; set; }
+        public decimal ActAmount { get; set; }
+        public decimal NonActAmount { get; set; }
+    }
+}

PxcModels/OpenBankAll.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class OpenBankAll
+    {
+        public string BankChild { get; set; }
+        public string BankChildNo { get; set; }
+        public string BankParentNo { get; set; }
+        public string BankParent { get; set; }
+    }
+}

PxcModels/UsersTmp.cs

@@ -0,0 +1,98 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class UsersTmp
+    {
+        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 AgentAreas { get; set; }
+        public int AgentLevel { get; set; }
+        public string SettleBankCardName { get; set; }
+        public DateTime? CertValidEndDate { get; set; }
+        public DateTime? CertValidStartDate { get; set; }
+        public DateTime? CitySetDate { get; set; }
+        public decimal ProfitRewardRate { get; set; }
+        public decimal ActiveRewardAmount { get; set; }
+        public decimal CashFreezeAmt { get; set; }
+        public decimal SettleAmount { get; set; }
+        public string MakerCode { get; set; }
+        public string HandPwd { get; set; }
+        public string Remark { get; set; }
+        public string BankCardPositiveImage { get; set; }
+        public string HandCertImage { get; set; }
+        public string CertReverseImage { get; set; }
+        public string CertFrontImage { get; set; }
+        public string DeviceToken { get; set; }
+        public string DeviceId { get; set; }
+        public DateTime? ExpiredDate { get; set; }
+        public string AccessToken { get; set; }
+        public string SettleRemark { get; set; }
+        public string RreezeRemark { get; set; }
+        public string RiskRemark { get; set; }
+        public ulong RiskFlag { get; set; }
+        public DateTime? AuthDate { get; set; }
+        public ulong AuthFlag { get; set; }
+        public ulong LockStatus { get; set; }
+        public int AuditStatus { get; set; }
+        public int LoginStatus { get; set; }
+        public DateTime? MerchantDate { get; set; }
+        public int MerchantType { get; set; }
+        public int UserProperty { get; set; }
+        public int UserType { get; set; }
+        public string SignImgUrl { get; set; }
+        public string ReferenceQrCode { get; set; }
+        public string CardRecCode { get; set; }
+        public int ReferralUserId { get; set; }
+        public string ReferenceCode { get; set; }
+        public string SettleBankName { get; set; }
+        public string SettleBankCardNo { get; set; }
+        public string IdCardEndNo { get; set; }
+        public ulong IsNewUser { get; set; }
+        public string AlipayUserId { get; set; }
+        public string OpenId { get; set; }
+        public string CarIds { get; set; }
+        public string PayPwd { get; set; }
+        public string LoginPwd { get; set; }
+        public string ParentNav { get; set; }
+        public string Tags { get; set; }
+        public string GroupId { get; set; }
+        public string Mobile { get; set; }
+        public string CardNo { get; set; }
+        public int UserLevel { get; set; }
+        public int ParentUserId { get; set; }
+        public string HeadPhoto { get; set; }
+        public string Address { get; set; }
+        public string Areas { get; set; }
+        public string CertId { get; set; }
+        public int Sex { get; set; }
+        public string RealName { get; set; }
+        public string NickName { get; set; }
+        public int CashStatus { get; set; }
+        public string CashNote { get; set; }
+        public decimal ThisMonthTrade { get; set; }
+        public int LeaderLevel { 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; }
+        public string SignPic { get; set; }
+        public DateTime? SignDate { get; set; }
+        public ulong IsSign { get; set; }
+        public DateTime? CreateStoreDate { get; set; }
+        public int StoreStock { get; set; }
+        public int ThisMonthSend { get; set; }
+    }
+}

PxcModels2/MerchantInfo.cs

@@ -43,5 +43,7 @@ namespace MySystem.PxcModels2
         public int ActStat { get; set; }
         public DateTime? SignDate { get; set; }
         public decimal AllocationAmount { get; set; }
+        public decimal ActMaxAmount { get; set; }
+        public decimal ActCurrentAmount { get; set; }
     }
 }

PxcModels2/WebCMSEntities.cs

@@ -6503,6 +6503,14 @@ namespace MySystem.PxcModels2
             {
                 entity.Property(e => e.Id).HasColumnType("int(11)");
 
+                entity.Property(e => e.ActCurrentAmount)
+                    .HasColumnType("decimal(18,2)")
+                    .HasComment("活动已返金额");
+
+                entity.Property(e => e.ActMaxAmount)
+                    .HasColumnType("decimal(18,2)")
+                    .HasComment("活动应返金额");
+
                 entity.Property(e => e.ActStat)
                     .HasColumnType("int(11)")
                     .HasComment("激活统计标记");