소스 검색

更新模型

lichunlei 3 년 전
부모
커밋
9248ee14c0

+ 3 - 3
Models/MsgAlert.cs

@@ -9,11 +9,8 @@ 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; }
@@ -36,5 +33,8 @@ namespace MySystem.Models
         public string Summary { get; set; }
         public string Title { get; set; }
         public int MsgType { get; set; }
+        public string CreateMan { get; set; }
+        public string UpdateMan { get; set; }
+        public int Version { get; set; }
     }
 }

+ 1 - 1
Models/PosMachinesTwo.cs

@@ -52,9 +52,9 @@ namespace MySystem.Models
         public DateTime? UpFeeDate { get; set; }
         public ulong DownFeeFlag { get; set; }
         public ulong UpFeeFlag { get; set; }
-        public int OpId { get; set; }
         public decimal OpReserve3 { get; set; }
         public decimal OpReserve2 { get; set; }
         public decimal OpReserve1 { get; set; }
+        public int OpId { get; set; }
     }
 }

+ 2 - 0
Models/PosMerchantInfo.cs

@@ -43,5 +43,7 @@ namespace MySystem.Models
         public string MerchantMobile { get; set; }
         public string MerchantName { get; set; }
         public string MerchantNo { get; set; }
+        public int StandardMonths { get; set; }
+        public int StandardStatus { get; set; }
     }
 }

+ 0 - 38
Models/ProfitRecordCopy1.cs

@@ -1,38 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace MySystem.Models
-{
-    public partial class ProfitRecordCopy1
-    {
-        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 TradeId { get; set; }
-        public string ParentNav { get; set; }
-        public string Remark { get; set; }
-        public int BrandId { get; set; }
-        public ulong DirectFlag { get; set; }
-        public int CapFlag { get; set; }
-        public int QrPayFlag { get; set; }
-        public decimal ProfitAmount { get; set; }
-        public DateTime? ClearDate { get; set; }
-        public DateTime? TradeDate { get; set; }
-        public string SnNo { get; set; }
-        public int MerBuddyType { get; set; }
-        public int HelpMonthCount { get; set; }
-        public ulong MerHelpFlag { get; set; }
-        public string MerNo { get; set; }
-        public int MerchantId { get; set; }
-        public int UserId { get; set; }
-    }
-}

+ 0 - 77
Models/ProfitRewardRecordCopy1.cs

@@ -1,77 +0,0 @@
-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; }
-    }
-}

+ 0 - 41
Models/ProfitSubsidyDetail04.cs

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

+ 0 - 41
Models/ProfitSubsidyDetailCopy1.cs

@@ -1,41 +0,0 @@
-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; }
-    }
-}

+ 0 - 3
Models/SchoolMaterials.cs

@@ -9,11 +9,8 @@ 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; }

+ 0 - 3
Models/SchoolSignInData.cs

@@ -9,11 +9,8 @@ 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; }

+ 0 - 3
Models/SchoolSignInRecord.cs

@@ -9,11 +9,8 @@ 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; }

+ 0 - 3
Models/SchoolSignInTask.cs

@@ -9,11 +9,8 @@ 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; }

+ 0 - 3
Models/SchoolSignInTaskRecord.cs

@@ -9,11 +9,8 @@ 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; }

+ 0 - 35
Models/SubsidyRecordCopy1.cs

@@ -1,35 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace MySystem.Models
-{
-    public partial class SubsidyRecordCopy1
-    {
-        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 TradeId { get; set; }
-        public string ParentNav { get; set; }
-        public string Remark { get; set; }
-        public int BrandId { get; set; }
-        public ulong DirectFlag { get; set; }
-        public int CapFlag { get; set; }
-        public int QrPayFlag { get; set; }
-        public decimal ProfitAmount { get; set; }
-        public DateTime? ClearDate { get; set; }
-        public DateTime? TradeDate { get; set; }
-        public string SnNo { get; set; }
-        public int MerBuddyType { get; set; }
-        public int HelpMonthCount { get; set; }
-        public ulong MerHelpFlag { get; set; }
-        public string MerNo { get; set; }
-        public int MerchantId { get; set; }
-        public int UserId { get; set; }
-    }
-}

+ 0 - 41
Models/TradeRecordTest.cs

@@ -1,41 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace MySystem.Models
-{
-    public partial class TradeRecordTest
-    {
-        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 MerUserId { get; set; }
-        public int TopUserId { get; set; }
-        public string Remark { get; set; }
-        public int BrandId { get; set; }
-        public ulong DirectFlag { get; set; }
-        public int CapFlag { get; set; }
-        public int QrPayFlag { get; set; }
-        public int BankCardType { get; set; }
-        public decimal TradeAmount { get; set; }
-        public string TradeSerialNo { get; set; }
-        public DateTime? ClearDate { get; set; }
-        public DateTime? TradeDate { get; set; }
-        public string SnNo { get; set; }
-        public int MerBuddyType { get; set; }
-        public int HelpMonthCount { get; set; }
-        public ulong MerHelpFlag { get; set; }
-        public string MerNo { get; set; }
-        public int MerchantId { get; set; }
-        public int UserId { get; set; }
-        public string RecordNo { get; set; }
-    }
-}

+ 3 - 3
Models/UserAccount.cs

@@ -38,10 +38,10 @@ namespace MySystem.Models
         public decimal ValidAmount { get; set; }
         public decimal LeaderBalanceAmount { get; set; }
         public decimal HelpProfitBalanceAmount { get; set; }
-        public decimal TempAmountForBalance { get; set; }
-        public decimal ThisMonthPreAmount { get; set; }
-        public decimal ValidPreAmount { get; set; }
         public decimal SmallStoreDeposit { get; set; }
+        public decimal ValidPreAmount { get; set; }
+        public decimal ThisMonthPreAmount { get; set; }
+        public decimal TempAmountForBalance { get; set; }
         public decimal StoreDeposit { get; set; }
     }
 }

+ 5 - 5
Models/Users.cs

@@ -88,11 +88,11 @@ namespace MySystem.Models
         public string DeviceType { get; set; }
         public DateTime? HelpProfitAgreeDate { get; set; }
         public ulong HelpProfitAgree { get; set; }
-        public int ThisMonthSend { get; set; }
-        public int StoreStock { get; set; }
-        public DateTime? CreateStoreDate { get; set; }
-        public ulong IsSign { get; set; }
-        public DateTime? SignDate { 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; }
     }
 }

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 78 - 652
Models/WebCMSEntities.cs


+ 2 - 2
appsettings.json

@@ -18,8 +18,8 @@
     "Host": "http://test.bs.kexiaoshuang.com/",
     "OssHost": "http://oss.kexiaoshuang.com",
     "Database": "KxsMainServer",
-    "SqlConnStr": "server=47.109.31.237;port=3306;user=KxsMainServer2;password=FrW8ZfxlcaVdm1r0;database=KxsMainServer2;charset=utf8;",
-    "StatSqlConnStr": "server=47.109.31.237;port=3306;user=KxsMainServer2;password=FrW8ZfxlcaVdm1r0;database=KxsMainServer2;charset=utf8;ConnectionTimeout=600;DefaultCommandTimeout=600;",
+    "SqlConnStr": "server=47.109.31.237;port=3306;user=KxsMainServer;password=FrW8ZfxlcaVdm1r0;database=KxsMainServer;charset=utf8;",
+    "StatSqlConnStr": "server=47.109.31.237;port=3306;user=KxsMainServer;password=FrW8ZfxlcaVdm1r0;database=KxsMainServer;charset=utf8;ConnectionTimeout=600;DefaultCommandTimeout=600;",
     "OpSqlConnStr": "server=47.109.31.237;port=3306;user=KxsOpServer;password=r7jwZ8ydLoeswDR4;database=KxsOpServer;charset=utf8;",
     "BsSqlConnStr": "server=47.109.31.237;port=3306;user=KxsBsServer;password=wyA1bEhi6aAkN8SB;database=KxsBsServer;charset=utf8;",
     "SpSqlConnStr": "server=47.109.31.237;port=3306;user=KxsSpServer;password=jJ9qKsvwWgQA9xWG;database=KxsSpServer;charset=utf8;",

이 변경점에서 너무 많은 파일들이 변경되어 몇몇 파일들은 표시되지 않았습니다.