Merge branch 'DuGuYang' into develop

Areas/Admin/Controllers/MainServer/LeadersController.cs

@@ -326,6 +326,7 @@ namespace MySystem.Areas.Admin.Controllers
                     var query = db.LeaderReserveRecord.Add(new LeaderReserveRecord()
                     {
                         CreateDate = DateTime.Now, //创建时间
+                        SeoDescription = Note,//备注
                         Sort = 11, //类型
                         //11：盟主储蓄金增减单(兑换机具券 机具券兑换 系统增加(盟主储蓄金) 系统扣减(盟主储蓄金) 储备金购买)
                         // 示例：+/-金额
@@ -363,6 +364,7 @@ namespace MySystem.Areas.Admin.Controllers
                     var query = db.LeaderReserveRecord.Add(new LeaderReserveRecord()
                     {
                         CreateDate = DateTime.Now, //创建时间
+                        SeoDescription = Note,//备注
                         Sort = 11, //类型
                         //11：盟主储蓄金增减单(兑换机具券 机具券兑换 系统增加(盟主储蓄金) 系统扣减(盟主储蓄金) 储备金购买)
                         // 示例：+/-金额
@@ -431,6 +433,7 @@ namespace MySystem.Areas.Admin.Controllers
                     var query = db.LeaderReserveRecord.Add(new LeaderReserveRecord()
                     {
                         CreateDate = DateTime.Now, //创建时间
+                        SeoDescription = Note,//备注
                         Sort = 12, //类型
                         //11：盟主储蓄金增减单(兑换机具券 机具券兑换 系统增加(盟主储蓄金) 系统扣减(盟主储蓄金) 储备金购买)
                         // 示例：+/-金额
@@ -468,6 +471,7 @@ namespace MySystem.Areas.Admin.Controllers
                     var query = db.LeaderReserveRecord.Add(new LeaderReserveRecord()
                     {
                         CreateDate = DateTime.Now, //创建时间
+                        SeoDescription = Note,//备注
                         Sort = 12, //类型
                         //11：盟主储蓄金增减单(兑换机具券 机具券兑换 系统增加(盟主储蓄金) 系统扣减(盟主储蓄金) 储备金购买)
                         // 示例：+/-金额

Areas/Admin/Controllers/MainServer/PosMachinesFeeChangeRecordController.cs

@@ -332,13 +332,13 @@ namespace MySystem.Areas.Admin.Controllers
                 var pos = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == PosNo) ?? new PosMachinesTwo();
                 if (pos.UpFeeFlag == 1 && pos.DownFeeFlag == 0)
                 {
-                    if (Kind != 2 || Amount != 0.6)
+                    if (Kind != 2 || Amount != 0.6 || Amount != 0.63)
                     {
                         warning += PosNo + ",该机具调低费率数值或类型不正确或已经调整，请检查好后全部重新导入";
                     }
                     else
                     {
-                        if (Kind == 2 && Amount == 0.6)
+                        if (Kind == 2 && (Amount == 0.6 || Amount == 0.63))
                         {
                             pos.DownFeeFlag = 1;
                             pos.DownFeeDate = DateTime.Now;

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 + "'");

Areas/Admin/Controllers/SpServer/ActivateRecordController.cs

@@ -106,9 +106,13 @@ namespace MySystem.Areas.Admin.Controllers
                 {
                     dic["SeoTitle"] = SeoTitle;
                 }
-                if (SeoTitle.Length > 3)
+                if (SeoTitle.Length == 4)
                 {
-                    dic["SeoTitle"] = SeoTitle.Substring(3);
+                    dic["SeoTitle"] = SeoTitle.Substring(0,2);
+                }
+                if (SeoTitle.Length == 5)
+                {
+                    dic["SeoTitle"] = SeoTitle.Substring(0,3);
                 }
                 // //产品类型
                 // string ProductType = dic["ProductType"].ToString();

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; }
+    }
+}

appsettings.json

@@ -1,37 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft": "Warning",
-      "Microsoft.Hosting.Lifetime": "Information"
-    }
-  },
-  "AllowedHosts": "*",
-  "Setting": {
-    "ConnectionStrings": "",
-    "OpHost": "http://operateadmin.kexiaoshuang.com/",
-    "Host": "http://admin.kexiaoshuang.com/",
-    "OssHost": "http://oss.kexiaoshuang.com",
-    "Database": "KxsMainServer",
-    "SqlConnStr": "server=rm-2vcs4j67tla603c9d5o.mysql.cn-chengdu.rds.aliyuncs.com;port=3306;user=KxsProfitServer;password=FrW8ZfxlcaVdm1r0;database=KxsProfitServer;charset=utf8;Max Pool Size=512",
-    "StatSqlConnStr": "server=rm-2vcs4j67tla603c9d5o.mysql.cn-chengdu.rds.aliyuncs.com;port=3306;user=KxsProfitServer;password=FrW8ZfxlcaVdm1r0;database=KxsProfitServer;charset=utf8;ConnectionTimeout=600;DefaultCommandTimeout=600;",
-    "OpSqlConnStr": "server=rm-2vcs4j67tla603c9d5o.mysql.cn-chengdu.rds.aliyuncs.com;port=3306;user=KxsProfitServer;password=FrW8ZfxlcaVdm1r0;database=KxsOpServer;charset=utf8;",
-    "BsSqlConnStr": "server=rm-2vcs4j67tla603c9d5o.mysql.cn-chengdu.rds.aliyuncs.com;port=3306;user=KxsProfitServer;password=FrW8ZfxlcaVdm1r0;database=KxsBsServer;charset=utf8;",
-    "SpSqlConnStr": "server=47.108.229.115;port=3306;user=KxsSpServer;password=jJ9qKsvwWgQA9xWG;database=KxsSpServer;charset=utf8;",
-    "CashSqlConnStr": "server=47.108.229.115;port=3306;user=KxsCashServer;password=LNGvM18W6SaIGKBC;database=KxsCashServer;charset=utf8;",
-    "RedisConnStr": "47.108.207.184:6379,password=skb@redis2022,DefaultDatabase=0,poolsize=500,preheat=50,asyncPipeline=true",
-    "IOSAppVersion": "1.0.0",
-    "AndroidAppVersion": "1.0.0",
-    "OSSKey": "",
-    "OSSSecret": "",
-    "OSSEndpoint": "",
-    "OSSBucketName": "",
-    "AppSource": "/skin/app/default/",
-    "JwtSecret": "JvDHuowbOnWiyxMIFc9gG5rw1LSSc0xx68L31oRfxS0",
-    "JwtIss": "KxsMainServer",
-    "JwtAud": "api",
-    "MqUserName": "guest",
-    "MqPassword": "123456",
-    "MqHostName": "localhost:5672"
-  }
-}