Merge branch 'feature-dgy-服务费功能调整' into DuGuYang

Areas/Admin/Controllers/MainServer/PosMerchantInfoListController.cs

@@ -696,6 +696,7 @@ namespace MySystem.Areas.Admin.Controllers
                 Ids += id + ",";
                 Dictionary<string, object> Fields = new Dictionary<string, object>();
                 Fields.Add("StandardStatus", 101);//设置为可退押状态
+                Fields.Add("MatchTime", DateTime.Now);//设置入口开放时间
                 new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("PosMerchantInfo", Fields, id);
             }
             string text = string.Format("商户押金退还批量通过，商户Id: '" + Ids.TrimEnd(',') + "'，操作人: '" + SysUserName + "_" + SysRealName + "'，Time'" + DateTime.Now + "'");

Models/HelpProfitUserTradeSummay.cs

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

Models/PosMachinesTwo.cs

@@ -61,6 +61,12 @@ namespace MySystem.Models
         public int RecycStatus { get; set; }
         public string OutBatchNo { get; set; }
         public int WithholdFlag { get; set; }
+        public int IsSupplement { get; set; }
+        public int IsOpAct { get; set; }
         public int LastMerchantId { get; set; }
+        public int CardType { get; set; }
+        public decimal DownFee { get; set; }
+        public int FirstFlag { get; set; }
+        public int IsExecute { get; set; }
     }
 }

Models/PosMerchantInfoBak.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; }
     }
 }

Models/ProfitRewardExport.cs

@@ -37,5 +37,7 @@ namespace MySystem.Models
         public string MakerCode { get; set; }
         public decimal ProfitCreditTradeProfit { get; set; }
         public decimal ProfitCreditTradeAmt { get; set; }
+        public decimal ProfitCreditTradeProfit2 { get; set; }
+        public decimal ProfitCreditTradeAmt2 { get; set; }
     }
 }

Models/ProfitRewardRecord.cs

@@ -79,5 +79,8 @@ namespace MySystem.Models
         public decimal ProfitCreditTradeProfit { get; set; }
         public decimal ProfitDebitNonCapTradeAmt { get; set; }
         public decimal ProfitCreditTradeAmt { get; set; }
+        public decimal ProfitCreditTradeAmt2 { get; set; }
+        public decimal ProfitCreditProfitRate2 { get; set; }
+        public decimal ProfitCreditTradeProfit2 { get; set; }
     }
 }

Models/SimCardDaySummary.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models
+{
+    public partial class SimCardDaySummary
+    {
+        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 NotHelpTradeAmount { get; set; }
+        public decimal HelpTradeAmount { get; set; }
+        public decimal TradeAmount { get; set; }
+        public string TradeMonth { get; set; }
+        public string TradeDay { get; set; }
+        public int UserId { get; set; }
+    }
+}

Models/SimposMerchantInfo.cs

@@ -0,0 +1,51 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models
+{
+    public partial class SimposMerchantInfo
+    {
+        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 EmployeeName { get; set; }
+        public string EmployeeNo { get; set; }
+        public decimal ActAmount { get; set; }
+        public string ActStatusName { get; set; }
+        public string ProductTypeName { get; set; }
+        public string ActivityName { get; set; }
+        public string ProductName { get; set; }
+        public int Type { get; set; }
+        public int StandardMonths { get; set; }
+        public int StandardStatus { get; set; }
+        public int TopUserId { get; set; }
+        public int MerUserType { get; set; }
+        public string Remark { get; set; }
+        public int BrandId { get; set; }
+        public int SnStoreId { get; set; }
+        public DateTime? MerStandardDate { get; set; }
+        public int SnType { get; set; }
+        public int MerUserId { get; set; }
+        public int UserId { get; set; }
+        public string MgrName { get; set; }
+        public int DirectUserId { get; set; }
+        public int ActiveStatus { get; set; }
+        public int MerStatus { get; set; }
+        public string KqSnNo { get; set; }
+        public string KqMerNo { get; set; }
+        public string MerIdcardNo { get; set; }
+        public string MerRealName { get; set; }
+        public string MerchantMobile { get; set; }
+        public string MerchantName { get; set; }
+        public string MerchantNo { get; set; }
+    }
+}

Models/TmpLeaders.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models
+{
+    public partial class TmpLeaders
+    {
+        public string MakerCode { get; set; }
+        public string RealName { get; set; }
+        public string LevelString { get; set; }
+        public DateTime? BuyDate { get; set; }
+        public int UserId { get; set; }
+    }
+}