浏览代码

立刷费率逻辑调整

lcl 8 月之前
父节点
当前提交
c78fffdc51
共有 45 个文件被更改,包括 1463 次插入86 次删除
  1. 161 0
      AppStart/Helper/LiShuaFeeSetService.cs
  2. 18 6
      AppStart/Helper/PublicImportDataService.cs
  3. 36 43
      AppStart/Helper/SetDepositPostService.cs
  4. 5 2
      Controllers/HomeController.cs
  5. 12 0
      PxcModels/AdminMoveInfo.cs
  6. 20 0
      PxcModels/ApiUrlRewrite.cs
  7. 5 0
      PxcModels/AppBottomNavs.cs
  8. 17 0
      PxcModels/ChangeTypeKind.cs
  9. 1 0
      PxcModels/ChangeTypes.cs
  10. 2 0
      PxcModels/CustomQuery.cs
  11. 30 0
      PxcModels/CustomQuerySub.cs
  12. 3 0
      PxcModels/LeaderReserveRecord.cs
  13. 18 0
      PxcModels/LiShuaFeeSetRecord.cs
  14. 1 0
      PxcModels/MachineChangeDetail.cs
  15. 1 0
      PxcModels/MachineUnBind.cs
  16. 28 0
      PxcModels/MerchantDepositRecord.cs
  17. 20 0
      PxcModels/PosChannelSet.cs
  18. 20 0
      PxcModels/PosChannelSetRecord.cs
  19. 28 0
      PxcModels/PosFeeWarningRecord.cs
  20. 1 0
      PxcModels/PosMerchantInfo.cs
  21. 22 0
      PxcModels/PrizeFlowRecord.cs
  22. 20 0
      PxcModels/ProfitRewardExport.cs
  23. 30 0
      PxcModels/RadioCardInfo.cs
  24. 10 0
      PxcModels/RecommendOrderCheck.cs
  25. 2 0
      PxcModels/ToChargeBackRecord.cs
  26. 1 0
      PxcModels/ToChargeBackRecordSub.cs
  27. 1 0
      PxcModels/ToChargeByStage.cs
  28. 32 0
      PxcModels/TradeDaySummary2After.cs
  29. 32 0
      PxcModels/TradeDaySummary2Before.cs
  30. 84 0
      PxcModels/TradeDaySummaryAfter.cs
  31. 84 0
      PxcModels/TradeDaySummaryBefore.cs
  32. 12 0
      PxcModels/UpUserRelation.cs
  33. 2 0
      PxcModels/UserAccount.cs
  34. 23 0
      PxcModels/UserExchangeLeaderRecord.cs
  35. 13 0
      PxcModels/UserMoveInfo.cs
  36. 23 0
      PxcModels/UserRankWhiteBefore.cs
  37. 24 0
      PxcModels/UserRankWhiteSetRecord.cs
  38. 20 0
      PxcModels/UserSetUnAuthRecord.cs
  39. 18 0
      PxcModels/UserSimActSummary.cs
  40. 20 0
      PxcModels/UserYearEndInCome.cs
  41. 30 0
      PxcModels/UserYearEndSummary.cs
  42. 1 0
      PxcModels/Users.cs
  43. 519 22
      PxcModels/WebCMSEntities.cs
  44. 6 6
      Startup.cs
  45. 7 7
      appsettings.Development.json

+ 161 - 0
AppStart/Helper/LiShuaFeeSetService.cs

@@ -0,0 +1,161 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Threading;
+using MySystem.PxcModels;
+using Library;
+using LitJson;
+
+namespace MySystem
+{
+    /// <summary>
+    /// 设置机具费率标记并推送消息
+    /// </summary>
+    public class LiShuaFeeSetService
+    {
+        public readonly static LiShuaFeeSetService Instance = new LiShuaFeeSetService();
+        private LiShuaFeeSetService()
+        { }
+
+        public void Start()
+        {
+            Thread th = new Thread(doSomething);
+            th.IsBackground = true;
+            th.Start();
+        }
+
+        public void doSomething()
+        {
+            while (true)
+            {
+                try
+                {
+                    DateTime check = DateTime.Now.AddHours(1);
+                    WebCMSEntities db = new WebCMSEntities();
+                    var list = db.LiShuaFeeSetRecord.Where(m => m.CreateDate < check && string.IsNullOrEmpty(m.TradeFeeAmt) && string.IsNullOrEmpty(m.TradeFeeRate)).OrderBy(m => m.Id).ToList();
+                    foreach(var sub in list)
+                    {
+                        string back = PublicImportDataService.Instance.QueryLiSDeposit(sub.MerNo, "");
+                        JsonData jsonObj = JsonMapper.ToObject(back);
+                        if(jsonObj["ret_code"].ToString() == "00")
+                        {                            
+                            string TradeFeeAmt = "";
+                            string TradeFeeRate = "";
+                            JsonData feeList = jsonObj["feeList"];
+                            for (int i = 0; i < feeList.Count; i++)
+                            {
+                                string feeCalcType = feeList["feeCalcType"].ToString();
+                                if(feeCalcType == "M5") TradeFeeRate = feeList["rate"].ToString();
+                                if(feeCalcType == "T0") TradeFeeAmt = feeList["rate"].ToString();
+                            }
+                            if(!string.IsNullOrEmpty(TradeFeeAmt) && !string.IsNullOrEmpty(TradeFeeRate))
+                            {
+                                LiShuaFeeSetRecord edit = db.LiShuaFeeSetRecord.FirstOrDefault(m => m.Id == sub.Id);
+                                if(edit != null)
+                                {
+                                    edit.TradeFeeAmt = TradeFeeAmt;
+                                    edit.TradeFeeRate = TradeFeeRate;
+                                    db.SaveChanges();
+                                }
+                            }
+                        }
+                    }
+                    db.Dispose();
+                }
+                catch (Exception ex)
+                {
+                    function.WriteLog(DateTime.Now.ToString() + ":" + ex.ToString(), "立刷费率查询异常");
+                }
+                Thread.Sleep(600000);
+            }
+        }
+
+
+        public void StartDo()
+        {
+            Thread th = new Thread(doSomethingDo);
+            th.IsBackground = true;
+            th.Start();
+        }
+
+        public void doSomethingDo()
+        {
+            while (true)
+            {
+                try
+                {
+                    DateTime check = DateTime.Now.AddHours(1);
+                    WebCMSEntities db = new WebCMSEntities();
+                    var list = db.LiShuaFeeSetRecord.Where(m => m.CreateDate < check && !string.IsNullOrEmpty(m.TradeFeeAmt) && !string.IsNullOrEmpty(m.TradeFeeRate)).OrderBy(m => m.Id).ToList();
+                    foreach(var sub in list)
+                    {
+                        AddData(db, sub.PosSn, sub.TradeFeeRate, sub.TradeFeeAmt);
+                        LiShuaFeeSetRecord item = db.LiShuaFeeSetRecord.FirstOrDefault(m => m.Id == sub.Id);
+                        if(item != null)
+                        {
+                            db.LiShuaFeeSetRecord.Remove(item);
+                            db.SaveChanges();
+                        }
+                    }
+                    db.Dispose();
+                }
+                catch (Exception ex)
+                {
+                    function.WriteLog(DateTime.Now.ToString() + ":" + ex.ToString(), "立刷费率提交报警异常");
+                }
+                Thread.Sleep(600000);
+            }
+        }
+
+        public void AddData(WebCMSEntities db, string posSn, string feeRate, string feeAmt)
+        {
+            if(feeRate != "0.63" && feeRate != "0.6")
+            {
+                return;
+            }
+            PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == posSn);
+            if(pos != null)
+            {
+                bool op = false;
+                if(feeRate == "0.63" && feeAmt == "3" && pos.UpFeeFlag == 1 && pos.DownFeeFlag == 0) //稳定期
+                {
+                    op = true;
+                }
+                else if(feeRate == "0.63" && feeAmt == "0" && pos.DownFeeFlag == 1 && pos.DownFee == 0.63M) //稳定期A
+                {
+                    op = true;
+                }
+                else if(feeRate == "0.6" && feeAmt == "0" && pos.DownFeeFlag == 0 && pos.DownFee == 0M) //扶持期
+                {
+                    op = true;
+                }
+                else if(feeRate == "0.6" && feeAmt == "0" && pos.DownFeeFlag == 1 && pos.DownFee == 0.6M) //稳定期B
+                {
+                    op = true;
+                }
+                if(!op)
+                {
+                    DateTime check = DateTime.Now.AddHours(-1);
+                    if(!db.PosFeeWarningRecord.Any(m => m.PosSn == posSn && m.CreateDate >= check))
+                    {
+                        db.PosFeeWarningRecord.Add(new PosFeeWarningRecord()
+                        {
+                            CreateDate = DateTime.Now,
+                            UpdateDate = DateTime.Now,
+                            DownFee = pos.DownFee,
+                            DownFeeFlag = pos.DownFeeFlag,
+                            UpFeeFlag = pos.UpFeeFlag,
+                            TradeFeeAmt = feeAmt,
+                            TradeFeeRate = feeRate,
+                            PosSn = posSn,
+                            PosId = pos.Id,
+                            BrandId = pos.BrandId,
+                        });
+                        db.SaveChanges();
+                    }
+                }
+            }
+        }
+    }
+}

+ 18 - 6
AppStart/Helper/PublicImportDataService.cs

@@ -512,47 +512,59 @@ namespace MySystem
         }
 
         // 设置费率
-        public string SetLiSFee(string sn, decimal serviceFee = 0.6M)
+        public string SetLiSFee(string sn, string merchNo, string serviceRate = "0.6", string serviceFee = "0")
         {
             Dictionary<string, object> dic = new Dictionary<string, object>();
             dic.Add("agentId", LiSAgentId);
             dic.Add("deviceSn", sn);
+            dic.Add("merchNo", merchNo);
             List<Dictionary<string, object>> feeList = new List<Dictionary<string, object>>();
             Dictionary<string, object> item = new Dictionary<string, object>();
             item.Add("feeCalcType", "M5");
             item.Add("fixed", "0");
+            item.Add("rate", serviceRate);
+            feeList.Add(item);
+            item = new Dictionary<string, object>();
+            item.Add("feeCalcType", "T0");
+            item.Add("fixed", "1");
             item.Add("rate", serviceFee);
             feeList.Add(item);
             dic.Add("feeList", feeList);
             dic.Add("signMethod", "02");
-            string content = LiSAgentId + sn + "M50" + serviceFee + "02";
+            string content = LiSAgentId + merchNo + sn + "M50" + serviceFee + "02";
             string signstr = LiSSign(content);
             dic.Add("signData", signstr);
             string req = Newtonsoft.Json.JsonConvert.SerializeObject(dic);
             function.WriteLog("请求参数:" + req, "设置立刷云电签费率");
-            string result = PostWebRequest(LiSReqUrl + "FEE003", req, new Dictionary<string, string>());
+            string result = PostWebRequest(LiSReqUrl + "FEE002", req, new Dictionary<string, string>());
             function.WriteLog("返回报文:" + result + "\n\n\n", "设置立刷云电签费率");
             return result;
         }
-        public string SetLiSWeFee(string sn, decimal serviceFee = 0.6M)
+        public string SetLiSWeFee(string sn, string merchNo, string serviceRate = "0.6", string serviceFee = "0")
         {
             Dictionary<string, object> dic = new Dictionary<string, object>();
             dic.Add("agentId", LiSWeAgentId);
             dic.Add("deviceSn", sn);
+            dic.Add("merchNo", merchNo);
             List<Dictionary<string, object>> feeList = new List<Dictionary<string, object>>();
             Dictionary<string, object> item = new Dictionary<string, object>();
             item.Add("feeCalcType", "M5");
             item.Add("fixed", "0");
             item.Add("rate", serviceFee);
             feeList.Add(item);
+            item = new Dictionary<string, object>();
+            item.Add("feeCalcType", "T0");
+            item.Add("fixed", "1");
+            item.Add("rate", serviceFee);
+            feeList.Add(item);
             dic.Add("feeList", feeList);
             dic.Add("signMethod", "02");
-            string content = LiSWeAgentId + sn + "M50" + serviceFee + "02";
+            string content = LiSWeAgentId + merchNo + sn + "M50" + serviceFee + "02";
             string signstr = LiSWeSign(content);
             dic.Add("signData", signstr);
             string req = Newtonsoft.Json.JsonConvert.SerializeObject(dic);
             function.WriteLog("请求参数:" + req, "设置立刷微电签费率");
-            string result = PostWebRequest(LiSReqUrl + "FEE003", req, new Dictionary<string, string>());
+            string result = PostWebRequest(LiSReqUrl + "FEE002", req, new Dictionary<string, string>());
             function.WriteLog("返回报文:" + result + "\n\n\n", "设置立刷微电签费率");
             return result;
         }

+ 36 - 43
AppStart/Helper/SetDepositPostService.cs

@@ -204,54 +204,35 @@ namespace MySystem
                                             db.SaveChanges();
                                         }
                                     }
-                                    // else if(pos.BrandId == 6) //立刷
-                                    // {
-                                    //     string content = SetLiSFee(pos.PosSn, Fee);
-                                    //     JsonData obj = JsonMapper.ToObject(content);
-                                    //     if (obj["ret_code"].ToString() == "00")
-                                    //     {
-                                    //         if(Kind == 1)
-                                    //         {
-                                    //             pos.UpFeeFlag = 1;
-                                    //             pos.UpFeeMan = OpMan;
-                                    //             pos.UpFeeDate = DateTime.Now;
-                                    //         }
-                                    //         else if(Kind == 2)
-                                    //         {
-                                    //             pos.DownFeeFlag = 1;
-                                    //             pos.DownFeeMan = OpMan;
-                                    //             pos.DownFeeDate = DateTime.Now;
-                                    //             SetRecordResult(db, RecordId, 1);
-                                    //         }
-                                    //         db.SaveChanges();
-                                    //     }
-                                    //     else
-                                    //     {
-                                    //         string msg = obj["ret_msg"].ToString();
-                                    //         pos.SeoDescription = msg;
-                                    //         SetRecordResult(db, RecordId, -1, msg);
-                                    //         db.SaveChanges();
-                                    //     }
-                                    // }
+                                    else if(pos.BrandId == 6) //立刷
+                                    {
+                                        addRate = addRate * 100;
+                                        string content = PublicImportDataService.Instance.SetLiSFee(pos.PosSn, merchant.KqMerNo, Fee.ToString("f2"), addRate.ToString());
+                                        JsonData obj = JsonMapper.ToObject(content);
+                                        if (obj["ret_code"].ToString() == "00")
+                                        {
+                                            SetRecordResult(db, RecordId, 1);
+                                            AddFeeRecord(db, merchant, pos);
+                                            db.SaveChanges();
+                                        }
+                                        else
+                                        {
+                                            string msg = obj["ret_msg"].ToString();
+                                            pos.SeoDescription = msg;
+                                            SetRecordResult(db, RecordId, -1, msg);
+                                            db.SaveChanges();
+                                        }
+                                    }
                                     else if(pos.BrandId == 22) //立刷微电签
                                     {
-                                        string content = PublicImportDataService.Instance.SetLiSWeFee(pos.PosSn, Fee);
+                                        addRate = addRate * 100;
+                                        string content = PublicImportDataService.Instance.SetLiSWeFee(pos.PosSn, merchant.KqMerNo, Fee.ToString("f2"), addRate.ToString());
                                         JsonData obj = JsonMapper.ToObject(content);
                                         if (obj["ret_code"].ToString() == "00")
                                         {
-                                            if(Kind == 1)
-                                            {
-                                                pos.UpFeeFlag = 1;
-                                                pos.UpFeeMan = OpMan;
-                                                pos.UpFeeDate = DateTime.Now;
-                                            }
-                                            else if(Kind == 2)
-                                            {
-                                                pos.DownFeeFlag = 1;
-                                                pos.DownFeeMan = OpMan;
-                                                pos.DownFeeDate = DateTime.Now;
-                                                SetRecordResult(db, RecordId, 1);
-                                            }
+                                            pos.SeoDescription = "设置成功";
+                                            SetRecordResult(db, RecordId, 1);
+                                            AddFeeRecord(db, merchant, pos);
                                             db.SaveChanges();
                                         }
                                         else
@@ -451,6 +432,18 @@ namespace MySystem
             }
         }
 
+        private void AddFeeRecord(WebCMSEntities db, PosMerchantInfo mer, PosMachinesTwo pos)
+        {
+            db.LiShuaFeeSetRecord.Add(new LiShuaFeeSetRecord()
+            {
+                CreateDate = DateTime.Now,
+                MerNo = mer.KqMerNo,
+                MerId = mer.Id,
+                PosSn = pos.PosSn,
+                PosId = pos.Id,
+            });
+        }
+
 
         public void StartKdb()
         {

+ 5 - 2
Controllers/HomeController.cs

@@ -65,8 +65,11 @@ namespace MySystem.Controllers
             // }
             // db.Dispose();
             // return "ok";
-            // return PublicImportDataService.Instance.QueryLiSDeposit("N00000D0022G499", "N6220Y02008203");
-            return PublicImportDataService.Instance.SetLiSFee("N6220Y02172808", 0.63M);
+
+            // return PublicImportDataService.Instance.QueryLiSDeposit("N00000D0022G499", "");
+            // {"existsFlag":"1","feeList":[{"feeCalcType":"M1","fixed":"0","rate":"0.24"},{"feeCalcType":"M2","fixed":"0","rate":"0.24"},{"feeCalcType":"M3","fixed":"0","rate":"0.38"},{"feeCalcType":"M4","fixed":"0","rate":"2.63"},{"feeCalcType":"M5","fixed":"0","rate":"0.63"},{"feeCalcType":"M7","fixed":"0"},{"feeCalcType":"M8","fixed":"0"},{"feeCalcType":"M9","fixed":"0"},{"feeCalcType":"T0","fixed":"1","rate":"300"}],"merchNo":"N00000D0022G499","ret_code":"00","ret_msg":"请求成功"}
+            
+            return PublicImportDataService.Instance.SetLiSFee("N6220Y02172808", "N000M000519V817", "0.63");
         }
         
     

+ 12 - 0
PxcModels/AdminMoveInfo.cs

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

+ 20 - 0
PxcModels/ApiUrlRewrite.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class ApiUrlRewrite
+    {
+        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 string UrlPath { get; set; }
+        public int QueryCount { get; set; }
+        public string SeoTitle { get; set; }
+        public string SeoKeyword { get; set; }
+        public string SeoDescription { get; set; }
+    }
+}

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

+ 17 - 0
PxcModels/ChangeTypeKind.cs

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

+ 1 - 0
PxcModels/ChangeTypes.cs

@@ -16,5 +16,6 @@ namespace MySystem.PxcModels
         public string SeoDescription { get; set; }
         public string Name { get; set; }
         public int Kind { get; set; }
+        public int TypeId { get; set; }
     }
 }

+ 2 - 0
PxcModels/CustomQuery.cs

@@ -20,5 +20,7 @@ namespace MySystem.PxcModels
         public string AdminNames { get; set; }
         public string Title { get; set; }
         public string SqlContent { get; set; }
+        public int ExcuteFlag { get; set; }
+        public string DatabaseConnect { get; set; }
     }
 }

+ 30 - 0
PxcModels/CustomQuerySub.cs

@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class CustomQuerySub
+    {
+        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 Alias { get; set; }
+        public int Kind { get; set; }
+        public int ParentId { get; set; }
+        public string SqlContent { get; set; }
+        public string AdminNames { get; set; }
+        public string Title { get; set; }
+        public string DatabaseConnect { get; set; }
+        public string DataKey { get; set; }
+        public string DataText { get; set; }
+    }
+}

+ 3 - 0
PxcModels/LeaderReserveRecord.cs

@@ -24,5 +24,8 @@ namespace MySystem.PxcModels
         public string TradeDate { get; set; }
         public string TradeMonth { get; set; }
         public int UserId { get; set; }
+        public int AccountRecordId { get; set; }
+        public decimal UsedReserve { get; set; }
+        public int SmallLeaderUserId { get; set; }
     }
 }

+ 18 - 0
PxcModels/LiShuaFeeSetRecord.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class LiShuaFeeSetRecord
+    {
+        public int Id { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public string TradeFeeAmt { get; set; }
+        public string TradeFeeRate { get; set; }
+        public string MerNo { get; set; }
+        public int MerId { get; set; }
+        public string PosSn { get; set; }
+        public int PosId { 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; }
+    }
+}

+ 20 - 0
PxcModels/PosChannelSet.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class PosChannelSet
+    {
+        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 SnCount { get; set; }
+        public int BrandId { get; set; }
+        public string ChannelNo { get; set; }
+        public int UserId { get; set; }
+        public int Kind { get; set; }
+    }
+}

+ 20 - 0
PxcModels/PosChannelSetRecord.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class PosChannelSetRecord
+    {
+        public int Id { get; set; }
+        public int Status { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public int MerId { get; set; }
+        public int PosId { get; set; }
+        public string ChannelNo { get; set; }
+        public string MerNo { get; set; }
+        public string PosSn { get; set; }
+        public int BrandId { get; set; }
+        public int RecordId { get; set; }
+    }
+}

+ 28 - 0
PxcModels/PosFeeWarningRecord.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class PosFeeWarningRecord
+    {
+        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 string SeoTitle { get; set; }
+        public string SeoKeyword { get; set; }
+        public string SeoDescription { get; set; }
+        public decimal DownFee { get; set; }
+        public ulong DownFeeFlag { get; set; }
+        public ulong UpFeeFlag { get; set; }
+        public string TradeFeeAmt { get; set; }
+        public string TradeFeeRate { get; set; }
+        public string PosSn { get; set; }
+        public int BrandId { get; set; }
+        public int PosId { get; set; }
+        public int QueryCount { get; set; }
+        public DateTime? DoDate { 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; }
     }
 }

+ 22 - 0
PxcModels/PrizeFlowRecord.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class PrizeFlowRecord
+    {
+        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 string Detail { get; set; }
+        public string CodeNumber { get; set; }
+        public int Kind { get; set; }
+        public int QueryCount { get; set; }
+        public string SeoTitle { get; set; }
+        public string SeoKeyword { get; set; }
+        public string SeoDescription { 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; }
     }
 }

+ 30 - 0
PxcModels/RadioCardInfo.cs

@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class RadioCardInfo
+    {
+        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 UserId { get; set; }
+        public string BrhUserId { get; set; }
+        public string BrhName { get; set; }
+        public string OpenTime { get; set; }
+        public string OprInviteCode { get; set; }
+        public string ProvincialCompany { get; set; }
+        public string ChannelName { get; set; }
+        public string ChannelCode { get; set; }
+        public string Role { get; set; }
+        public string Gender { get; set; }
+        public string IdNo { get; set; }
+        public string Mobile { get; set; }
+        public string OprName { get; set; }
+        public string JobStatus { get; set; }
+        public string JobId { 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; }
+    }
+}

+ 2 - 0
PxcModels/ToChargeBackRecord.cs

@@ -22,5 +22,7 @@ namespace MySystem.PxcModels
         public decimal TotalAmount { get; set; }
         public int TimeNumber { get; set; }
         public DateTime? StartDate { get; set; }
+        public int Kind { get; set; }
+        public ulong LockFlag { 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; }
+    }
+}

+ 12 - 0
PxcModels/UpUserRelation.cs

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

+ 13 - 0
PxcModels/UserMoveInfo.cs

@@ -0,0 +1,13 @@
+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; }
+        public DateTime? UpdateTime { 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; }
+    }
+}

+ 24 - 0
PxcModels/UserRankWhiteSetRecord.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class UserRankWhiteSetRecord
+    {
+        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 BeforeLevel { get; set; }
+        public DateTime? ExpireDate { get; set; }
+        public DateTime? PresetDate { get; set; }
+        public string OperateMan { get; set; }
+        public int Level { get; set; }
+        public int SetType { get; set; }
+        public int UserId { get; set; }
+        public int UserType { get; set; }
+        public string Remark { get; set; }
+    }
+}

+ 20 - 0
PxcModels/UserSetUnAuthRecord.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class UserSetUnAuthRecord
+    {
+        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 string Remark { get; set; }
+        public string Operator { get; set; }
+        public string MakerCode { get; set; }
+        public string RealName { get; set; }
+        public int UserId { get; set; }
+    }
+}

+ 18 - 0
PxcModels/UserSimActSummary.cs

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

+ 1 - 0
PxcModels/Users.cs

@@ -97,5 +97,6 @@ namespace MySystem.PxcModels
         public string BusinessLogo { get; set; }
         public string BusinessName { get; set; }
         public DateTime? LogOutDate { get; set; }
+        public int LimitPosCount { get; set; }
     }
 }

文件差异内容过多而无法显示
+ 519 - 22
PxcModels/WebCMSEntities.cs


+ 6 - 6
Startup.cs

@@ -147,12 +147,12 @@ namespace MySystem
             }
             if(Library.ConfigurationManager.EnvironmentFlag == 2)
             {
-                // SetFeeFlagService.Instance.Start(); //85天提前通知创客费率调升消息
-                // SetDepositService.Instance.Start(); //调整费率(通知、标记)
-                // SetDepositPostService.Instance.Start(); //提交支付公司设置费率接口
-                // SetDepositPostService.Instance.StartKdb(); //监控开店宝费率设置结果
-                // ChangePosFeeQueue.Instance.StartEverTime(); //设置服务费
-                // SetSftFeeService.Instance.Start(); //盛付通420天费率加万2
+                SetFeeFlagService.Instance.Start(); //85天提前通知创客费率调升消息
+                SetDepositService.Instance.Start(); //调整费率(通知、标记)
+                SetDepositPostService.Instance.Start(); //提交支付公司设置费率接口
+                SetDepositPostService.Instance.StartKdb(); //监控开店宝费率设置结果
+                ChangePosFeeQueue.Instance.StartEverTime(); //设置服务费
+                SetSftFeeService.Instance.Start(); //盛付通420天费率加万2
             }
         }
 

+ 7 - 7
appsettings.Development.json

@@ -17,15 +17,15 @@
     "Host": "http://localhost:5047/",
     "SourceHost": "http://bs.kexiaoshuang.com/",
     "Database": "KxsMainServer",
-    "SqlConnStr": "server=47.109.31.237;port=3306;user=KxsMainServer;password=FrW8ZfxlcaVdm1r0;database=KxsMainServer;charset=utf8;",
-    "Pxc1SqlConnStr": "server=47.109.31.237;port=3306;user=KxsMainServer;password=FrW8ZfxlcaVdm1r0;database=KxsMainServer;charset=utf8;",
-    "ReadSqlConnStr": "server=47.109.31.237;port=3306;user=KxsMainServer;password=FrW8ZfxlcaVdm1r0;database=KxsMainServer;charset=utf8;",
-    "MainSqlConnStr": "server=47.109.31.237;port=3306;user=KxsMainServer;password=FrW8ZfxlcaVdm1r0;database=KxsStatServer;charset=utf8;",
-    "SpSqlConnStr": "server=47.109.31.237;port=3306;user=KxsSpServer;password=jJ9qKsvwWgQA9xWG;database=KxsSpServer;charset=utf8;",
-    "OpSqlConnStr": "server=47.109.31.237;port=3306;user=KxsOpServer;password=r7jwZ8ydLoeswDR4;database=KxsOpServer;charset=utf8;",
+    "SqlConnStr": "server=47.108.62.166;port=3306;user=root;password=HDlNs1ZpG5iR9D9I;database=KxsMainServer;charset=utf8;",
+    "Pxc1SqlConnStr": "server=47.108.62.166;port=3306;user=root;password=HDlNs1ZpG5iR9D9I;database=KxsMainServer;charset=utf8;",
+    "ReadSqlConnStr": "server=47.108.62.166;port=3306;user=root;password=HDlNs1ZpG5iR9D9I;database=KxsMainServer;charset=utf8;",
+    "MainSqlConnStr": "server=47.108.62.166;port=3306;user=root;password=HDlNs1ZpG5iR9D9I;database=KxsStatServer;charset=utf8;",
+    "SpSqlConnStr": "server=47.108.62.166;port=3306;user=root;password=HDlNs1ZpG5iR9D9I;database=KxsSpServer;charset=utf8;",
+    "OpSqlConnStr": "server=47.108.62.166;port=3306;user=root;password=HDlNs1ZpG5iR9D9I;database=KxsOpServer;charset=utf8;",
     "MpSqlConnStr": "server=47.109.31.237;port=3306;user=QrCodePlateMainServer;password=ll4DFaALMu9YIooM;database=QrCodePlateMainServer;charset=utf8;",
     "MpSqlConnStr2": "server=47.109.31.237;port=3306;user=QrCodePlateMainServer;password=ll4DFaALMu9YIooM;database=QrCodePlateMainServer2;charset=utf8;",
-    "RedisConnStr": "47.109.31.237:6379,password=klm@redis,DefaultDatabase=1,poolsize=500,preheat=50,asyncPipeline=true",
+    "RedisConnStr": "47.108.62.166:6379,password=klm@redis,DefaultDatabase=1,poolsize=500,preheat=50,asyncPipeline=true",
     "IOSAppVersion": "1.0.0",
     "AndroidAppVersion": "1.0.0",
     "OSSKey": "iL9dWgBunZRwGbHQ",

部分文件因为文件数量过多而无法显示