通道修改功能

Areas/Api/Controllers/v1/Main2/MerchantAddInfoController.cs

@@ -43,6 +43,7 @@ namespace MySystem.Areas.Api.Controllers.v1.Main2
             string HDStatus = data["HDStatus"].ToString(); //好哒状态(-1 审核失败 0 待审核 3 已通过)
             string WeChatStatus = data["WeChatStatus"].ToString(); //微信状态(-1 审核失败 0 待审核 1 待签约 2 已通过)
             string AliPayStatus = data["AliPayStatus"].ToString(); //支付宝状态(-1 审核失败 0 待审核 1 待签约 2 已通过)
+            string AgentName = data["Channel"].ToString(); //所属创客编号
             int BrandId = 0; //品牌(0 银联 1 好哒)
             int pageSize = int.Parse(function.CheckInt(data["page_size"].ToString()));
             int pageNum = int.Parse(function.CheckInt(data["page_num"].ToString()));
@@ -94,6 +95,10 @@ namespace MySystem.Areas.Api.Controllers.v1.Main2
                 BrandId = int.Parse(function.CheckInt(data["BrandId"].ToString())); //品牌(0 银联 1 好哒)
                 condition += " and BrandId=" + BrandId + "";
             }
+            if (!string.IsNullOrEmpty(data["Channel"].ToString()))
+            {
+                condition += " and AgentName='" + AgentName + "'";
+            }
             List<RelationData> relationData = new List<RelationData>();
             List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
             Other = new Dictionary<string, object>();
@@ -135,6 +140,7 @@ namespace MySystem.Areas.Api.Controllers.v1.Main2
                 curData.Add("AliPayStatus", queryCount); //支付宝状态(-1 审核失败 0 待审核 1 待签约 2 已通过)
                 curData.Add("ParentName", MerchantInfoService.Query(ParentId).Name);
                 curData.Add("UpdateDate", subdata["UpdateDate"].ToString() == "" ? "" : DateTime.Parse(subdata["UpdateDate"].ToString()).ToString("yyyy-MM-dd HH:mm:ss"));
+                curData.Add("Channel", subdata["AgentName"].ToString()); //进件通道
                 dataList.Add(curData);
             }
             Other.Add("Count", count); //总数
@@ -799,5 +805,54 @@ namespace MySystem.Areas.Api.Controllers.v1.Main2
         #endregion
 
 
+        #region 商户管理-修改商户进件通道
+        [Authorize]
+        public JsonResult SetMerchantChannel(string value)
+        {
+            value = PublicFunction.DesDecrypt(value);
+            JsonData data = JsonMapper.ToObject(value);
+            int id = int.Parse(function.CheckInt(data["id"].ToString()));
+            string channel = data["channel"].ToString();
+            Dictionary<string, object> Obj = new Dictionary<string, object>();
+            MerchantAddInfo add = main2db.MerchantAddInfo.FirstOrDefault(m => m.Id == id);
+            if(add != null)
+            {
+                add.AgentName = channel;
+                main2db.SaveChanges();
+            }
+            return Json(new AppResultJson() { Status = "1", Info = "已修改", Data = Obj });
+        }
+        #endregion
+
+        #region 商户管理-商户进件通道列表
+        [Authorize]
+        public JsonResult MerchantChannelList(string value)
+        {
+            List<Dictionary<string, object>> list = new List<Dictionary<string, object>>();
+            Dictionary<string, object> item = new Dictionary<string, object>();
+            item.Add("Id", "1");
+            item.Add("Name", "蒲晓敏，T1715836（盒伙人）");
+            list.Add(item);
+            item = new Dictionary<string, object>();
+            item.Add("Id", "2");
+            item.Add("Name", "蒲晓敏，T1805778（盒伙人）");
+            list.Add(item);
+            item = new Dictionary<string, object>();
+            item.Add("Id", "3");
+            item.Add("Name", "蒲晓敏，Y5710589（迅易通）");
+            list.Add(item);
+            item = new Dictionary<string, object>();
+            item.Add("Id", "4");
+            item.Add("Name", "蒲晓敏，Y7009274（迅易通）");
+            list.Add(item);
+            item = new Dictionary<string, object>();
+            item.Add("Id", "5");
+            item.Add("Name", "蒲晓敏，Y5718505（迅易通）");
+            list.Add(item);
+            return Json(new AppResultJson() { Status = "1", Info = "", Data = list });
+        }
+        #endregion
+
+
     }
 }

Models/Main2/ChangeSettlementCardAuditRecord.cs

@@ -11,10 +11,10 @@ namespace MySystem.Models.Main2
         public int Version { get; set; }
         public DateTime? CreateDate { get; set; }
         public DateTime? UpdateDate { get; set; }
+        public string Remark { get; set; }
         public int AuditStatus { get; set; }
         public string MchtNo { get; set; }
         public int MerchantId { get; set; }
         public int TaskId { get; set; }
-        public string Remark { get; set; }
     }
 }

Models/Main2/HdDepositTmp.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models.Main2
+{
+    public partial class HdDepositTmp
+    {
+        public string SnNo { get; set; }
+        public string MerKind { get; set; }
+        public string PassDate { get; set; }
+        public string MerName { get; set; }
+        public string SendMan { get; set; }
+        public string PrizeDate { get; set; }
+        public decimal PrizeAmount { get; set; }
+        public decimal DepositAmount { get; set; }
+        public string ActDate { get; set; }
+        public string DeviceKind { get; set; }
+        public string MerNo { get; set; }
+        public int Status { get; set; }
+        public string DepositActCode { get; set; }
+    }
+}

Models/Main2/HdOrderTmp.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models.Main2
+{
+    public partial class HdOrderTmp
+    {
+        public string OrderNo { get; set; }
+        public string SettleDuration { get; set; }
+        public string TradeTime { get; set; }
+        public decimal TradeFee { get; set; }
+        public decimal TradeAmount { get; set; }
+        public string TradeType { get; set; }
+        public string PayMode { get; set; }
+        public string DeviceKind { get; set; }
+        public string SnNo { get; set; }
+        public string MerNo { get; set; }
+        public int Status { get; set; }
+    }
+}

Models/Main2/HdQrCodeTmp.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models.Main2
+{
+    public partial class HdQrCodeTmp
+    {
+        public string SnNo { get; set; }
+        public string MerNo { get; set; }
+        public int Status { get; set; }
+    }
+}

Models/Main2/HdRefundOrderNos.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models.Main2
+{
+    public partial class HdRefundOrderNos
+    {
+        public int Id { get; set; }
+        public string HdSourceOrderNo { get; set; }
+        public string HdOrderNo { get; set; }
+    }
+}

Models/Main2/HdRefundRecord.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models.Main2
+{
+    public partial class HdRefundRecord
+    {
+        public int Id { get; set; }
+        public string RefundOrderNo { get; set; }
+        public decimal RefundAmt { get; set; }
+        public string HdOrderNo { get; set; }
+        public string PayMode { get; set; }
+        public string RefundDate { get; set; }
+        public string HdStatus { get; set; }
+        public string HdOrderNo2 { get; set; }
+        public int OrderId { get; set; }
+    }
+}

Models/Main2/MerchantAddInfo.cs

@@ -150,5 +150,9 @@ namespace MySystem.Models.Main2
         public string MerchantType { get; set; }
         public int PlaceType { get; set; }
         public int BrandId { get; set; }
+        public string CybMakerCode { get; set; }
+        public string FeeRate { get; set; }
+        public int ParentId { get; set; }
+        public string AgentName { get; set; }
     }
 }

Models/Main2/MerchantChangeSettlementCardRecord.cs

@@ -11,6 +11,11 @@ namespace MySystem.Models.Main2
         public int Version { get; set; }
         public DateTime? CreateDate { get; set; }
         public DateTime? UpdateDate { get; set; }
+        public int MerchantId { get; set; }
+        public string MerchantName { get; set; }
+        public string Remark { get; set; }
+        public int AccountType { get; set; }
+        public string Operator { get; set; }
         public string HoldAgentProtocol { get; set; }
         public string AgentIdCardBack { get; set; }
         public string AgentIdCardFront { get; set; }
@@ -28,10 +33,5 @@ namespace MySystem.Models.Main2
         public string AccountNo { get; set; }
         public string AccountName { get; set; }
         public string MchtNo { get; set; }
-        public string Operator { get; set; }
-        public int AccountType { get; set; }
-        public string Remark { get; set; }
-        public string MerchantName { get; set; }
-        public int MerchantId { get; set; }
     }
 }

Models/Main2/MerchantFeeRecord.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models.Main2
+{
+    public partial class MerchantFeeRecord
+    {
+        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 SettleFee { get; set; }
+        public int MerchantId { get; set; }
+        public int UserId { get; set; }
+        public string Remark { get; set; }
+    }
+}

Models/Main2/MerchantInfo.cs

@@ -56,5 +56,7 @@ namespace MySystem.Models.Main2
         public decimal Latitude { get; set; }
         public decimal Longitude { get; set; }
         public int BrandId { get; set; }
+        public string CybMakerCode { get; set; }
+        public int ParentId { get; set; }
     }
 }

Models/Main2/OrderAdd.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models.Main2
+{
+    public partial class OrderAdd
+    {
+        public int Id { get; set; }
+        public string Merchantno { get; set; }
+        public string Fd61 { get; set; }
+        public string Merchantname { get; set; }
+        public string Orderno { get; set; }
+        public string Tradedate { get; set; }
+        public string Tradetime { get; set; }
+        public decimal Money { get; set; }
+        public string Status { get; set; }
+        public string Reason { get; set; }
+    }
+}

Models/Main2/UserAmountSummaryAfter.cs

@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models.Main2
+{
+    public partial class UserAmountSummaryAfter
+    {
+        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 PayMode { get; set; }
+        public decimal TotalAmount { get; set; }
+        public string TradeMonth { get; set; }
+        public string TradeDate { get; set; }
+        public int UserId { get; set; }
+        public int TradeCount { get; set; }
+        public int IsAct { get; set; }
+    }
+}

Models/Main2/UserAmountSummaryBefore.cs

@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models.Main2
+{
+    public partial class UserAmountSummaryBefore
+    {
+        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 PayMode { get; set; }
+        public decimal TotalAmount { get; set; }
+        public string TradeMonth { get; set; }
+        public string TradeDate { get; set; }
+        public int UserId { get; set; }
+        public int TradeCount { get; set; }
+        public int IsAct { get; set; }
+    }
+}

Models/Main2/WebCMSEntities.cs

@@ -58,6 +58,11 @@ namespace MySystem.Models.Main2
         public virtual DbSet<FluxProfitDetail> FluxProfitDetail { get; set; }
         public virtual DbSet<FluxProfitSummary> FluxProfitSummary { get; set; }
         public virtual DbSet<HaoDaAreaCode> HaoDaAreaCode { get; set; }
+        public virtual DbSet<HdDepositTmp> HdDepositTmp { get; set; }
+        public virtual DbSet<HdOrderTmp> HdOrderTmp { get; set; }
+        public virtual DbSet<HdQrCodeTmp> HdQrCodeTmp { get; set; }
+        public virtual DbSet<HdRefundOrderNos> HdRefundOrderNos { get; set; }
+        public virtual DbSet<HdRefundRecord> HdRefundRecord { get; set; }
         public virtual DbSet<HelpProfitAccountRecord> HelpProfitAccountRecord { get; set; }
         public virtual DbSet<HelpProfitAmountSummary> HelpProfitAmountSummary { get; set; }
         public virtual DbSet<HelpProfitExchange> HelpProfitExchange { get; set; }
@@ -102,6 +107,7 @@ namespace MySystem.Models.Main2
         public virtual DbSet<MerchantDepositReturns> MerchantDepositReturns { get; set; }
         public virtual DbSet<MerchantDepositSet> MerchantDepositSet { get; set; }
         public virtual DbSet<MerchantDiviSummay> MerchantDiviSummay { get; set; }
+        public virtual DbSet<MerchantFeeRecord> MerchantFeeRecord { get; set; }
         public virtual DbSet<MerchantForCode> MerchantForCode { get; set; }
         public virtual DbSet<MerchantForMobile> MerchantForMobile { get; set; }
         public virtual DbSet<MerchantForName> MerchantForName { get; set; }
@@ -131,6 +137,7 @@ namespace MySystem.Models.Main2
         public virtual DbSet<OpenSnSnapshot> OpenSnSnapshot { get; set; }
         public virtual DbSet<OperateLog> OperateLog { get; set; }
         public virtual DbSet<OperateRightList> OperateRightList { get; set; }
+        public virtual DbSet<OrderAdd> OrderAdd { get; set; }
         public virtual DbSet<OrderForNo> OrderForNo { get; set; }
         public virtual DbSet<OrderProduct> OrderProduct { get; set; }
         public virtual DbSet<OrderRefund> OrderRefund { get; set; }
@@ -241,6 +248,8 @@ namespace MySystem.Models.Main2
         public virtual DbSet<UserAccountRecord> UserAccountRecord { get; set; }
         public virtual DbSet<UserAddress> UserAddress { get; set; }
         public virtual DbSet<UserAmountSummary> UserAmountSummary { get; set; }
+        public virtual DbSet<UserAmountSummaryAfter> UserAmountSummaryAfter { get; set; }
+        public virtual DbSet<UserAmountSummaryBefore> UserAmountSummaryBefore { get; set; }
         public virtual DbSet<UserAuthRecord> UserAuthRecord { get; set; }
         public virtual DbSet<UserBack> UserBack { get; set; }
         public virtual DbSet<UserBackKind> UserBackKind { get; set; }
@@ -3384,6 +3393,232 @@ namespace MySystem.Models.Main2
                     .HasCollation("utf8_general_ci");
             });
 
+            modelBuilder.Entity<HdDepositTmp>(entity =>
+            {
+                entity.HasKey(e => e.SnNo)
+                    .HasName("PRIMARY");
+
+                entity.HasComment("好哒押金临时表");
+
+                entity.Property(e => e.SnNo)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("设备SN")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.ActDate)
+                    .HasColumnType("varchar(20)")
+                    .HasComment("激活时间")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.DepositActCode)
+                    .HasColumnType("varchar(20)")
+                    .HasComment("押金活动编号")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.DepositAmount)
+                    .HasColumnType("decimal(18,2)")
+                    .HasComment("押金金额");
+
+                entity.Property(e => e.DeviceKind)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("设备型号")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.MerKind)
+                    .HasColumnType("varchar(20)")
+                    .HasComment("商户类型")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.MerName)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("商户名称")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.MerNo)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("商户编号")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.PassDate)
+                    .HasColumnType("varchar(20)")
+                    .HasComment("审核通过日期")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.PrizeAmount)
+                    .HasColumnType("decimal(18,2)")
+                    .HasComment("奖励金额");
+
+                entity.Property(e => e.PrizeDate)
+                    .HasColumnType("varchar(20)")
+                    .HasComment("奖励发放时间")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SendMan)
+                    .HasColumnType("varchar(20)")
+                    .HasComment("发放人姓名")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Status)
+                    .HasColumnType("int(11)")
+                    .HasComment("状态");
+            });
+
+            modelBuilder.Entity<HdOrderTmp>(entity =>
+            {
+                entity.HasKey(e => e.OrderNo)
+                    .HasName("PRIMARY");
+
+                entity.HasComment("好哒订单临时表");
+
+                entity.Property(e => e.OrderNo)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("订单号")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.DeviceKind)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("终端类型")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.MerNo)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("商户号")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.PayMode)
+                    .HasColumnType("varchar(20)")
+                    .HasComment("支付方式")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SettleDuration)
+                    .HasColumnType("varchar(10)")
+                    .HasComment("结算周期")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SnNo)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("设备号")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Status)
+                    .HasColumnType("int(11)")
+                    .HasComment("状态");
+
+                entity.Property(e => e.TradeAmount)
+                    .HasColumnType("decimal(18,2)")
+                    .HasComment("交易金额");
+
+                entity.Property(e => e.TradeFee)
+                    .HasColumnType("decimal(18,2)")
+                    .HasComment("交易手续费");
+
+                entity.Property(e => e.TradeTime)
+                    .HasColumnType("varchar(20)")
+                    .HasComment("交易时间")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.TradeType)
+                    .HasColumnType("varchar(20)")
+                    .HasComment("交易类型")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+            });
+
+            modelBuilder.Entity<HdQrCodeTmp>(entity =>
+            {
+                entity.HasKey(e => new { e.SnNo, e.MerNo })
+                    .HasName("PRIMARY");
+
+                entity.HasComment("好哒订单临时表");
+
+                entity.Property(e => e.SnNo)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("设备号")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.MerNo)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("商户号")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Status)
+                    .HasColumnType("int(11)")
+                    .HasComment("状态");
+            });
+
+            modelBuilder.Entity<HdRefundOrderNos>(entity =>
+            {
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.HdOrderNo)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.HdSourceOrderNo)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+            });
+
+            modelBuilder.Entity<HdRefundRecord>(entity =>
+            {
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.HdOrderNo)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.HdOrderNo2)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.HdStatus)
+                    .HasColumnType("varchar(20)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.OrderId).HasColumnType("int(11)");
+
+                entity.Property(e => e.PayMode)
+                    .HasColumnType("varchar(20)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.RefundAmt).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.RefundDate)
+                    .HasColumnType("varchar(200)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.RefundOrderNo)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+            });
+
             modelBuilder.Entity<HelpProfitAccountRecord>(entity =>
             {
                 entity.Property(e => e.Id).HasColumnType("int(11)");
@@ -5480,6 +5715,12 @@ namespace MySystem.Models.Main2
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.AgentName)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("好哒机构")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
                 entity.Property(e => e.AgentProtocol)
                     .HasColumnName("agentProtocol")
                     .HasColumnType("varchar(200)")
@@ -5562,7 +5803,7 @@ namespace MySystem.Models.Main2
                     .HasCollation("utf8_general_ci");
 
                 entity.Property(e => e.BankAddressCode)
-                    .HasColumnType("varchar(20)")
+                    .HasColumnType("varchar(200)")
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
@@ -5691,6 +5932,12 @@ namespace MySystem.Models.Main2
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.CybMakerCode)
+                    .HasColumnType("varchar(20)")
+                    .HasComment("创业帮创客编号")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
                 entity.Property(e => e.Extra1)
                     .HasColumnName("extra1")
                     .HasColumnType("varchar(2000)")
@@ -5705,6 +5952,12 @@ namespace MySystem.Models.Main2
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.FeeRate)
+                    .HasColumnType("varchar(20)")
+                    .HasComment("费率")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
                 entity.Property(e => e.HdBindWeChat)
                     .HasColumnType("bit(1)")
                     .HasDefaultValueSql("b'0'")
@@ -5727,8 +5980,8 @@ namespace MySystem.Models.Main2
 
                 entity.Property(e => e.IdCardAddress)
                     .HasColumnType("varchar(50)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
+                    .HasCharSet("utf8mb4")
+                    .HasCollation("utf8mb4_unicode_ci");
 
                 entity.Property(e => e.IdCardCopy)
                     .HasColumnType("varchar(200)")
@@ -5917,6 +6170,10 @@ namespace MySystem.Models.Main2
                     .HasColumnType("bit(1)")
                     .HasDefaultValueSql("b'0'");
 
+                entity.Property(e => e.ParentId)
+                    .HasColumnType("int(11)")
+                    .HasComment("父级ID");
+
                 entity.Property(e => e.PeriodBegin).HasColumnType("datetime");
 
                 entity.Property(e => e.PeriodEnd).HasColumnType("datetime");
@@ -7090,6 +7347,53 @@ namespace MySystem.Models.Main2
                     .HasComment("版本号");
             });
 
+            modelBuilder.Entity<MerchantFeeRecord>(entity =>
+            {
+                entity.HasComment("费率设置记录");
+
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.CreateDate)
+                    .HasColumnType("datetime")
+                    .HasComment("创建时间");
+
+                entity.Property(e => e.MerchantId)
+                    .HasColumnType("int(11)")
+                    .HasComment("商户ID");
+
+                entity.Property(e => e.Remark)
+                    .HasColumnType("mediumtext")
+                    .HasComment("备注")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SettleFee)
+                    .HasColumnType("varchar(20)")
+                    .HasComment("费率值")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Sort)
+                    .HasColumnType("int(11)")
+                    .HasComment("排序序号");
+
+                entity.Property(e => e.Status)
+                    .HasColumnType("int(11)")
+                    .HasComment("状态");
+
+                entity.Property(e => e.UpdateDate)
+                    .HasColumnType("datetime")
+                    .HasComment("修改时间");
+
+                entity.Property(e => e.UserId)
+                    .HasColumnType("int(11)")
+                    .HasComment("创客ID");
+
+                entity.Property(e => e.Version)
+                    .HasColumnType("int(11)")
+                    .HasComment("版本号");
+            });
+
             modelBuilder.Entity<MerchantForCode>(entity =>
             {
                 entity.HasKey(e => e.Code)
@@ -7190,6 +7494,12 @@ namespace MySystem.Models.Main2
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.CybMakerCode)
+                    .HasColumnType("varchar(20)")
+                    .HasComment("创业帮创客编号")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
                 entity.Property(e => e.EndTime)
                     .HasColumnType("datetime")
                     .HasComment("营业结束时间");
@@ -7242,6 +7552,10 @@ namespace MySystem.Models.Main2
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.ParentId)
+                    .HasColumnType("int(11)")
+                    .HasComment("父级ID");
+
                 entity.Property(e => e.ParentUserNav)
                     .HasColumnType("varchar(500)")
                     .HasCharSet("utf8")
@@ -9246,6 +9560,65 @@ namespace MySystem.Models.Main2
                 entity.Property(e => e.Version).HasColumnType("int(11)");
             });
 
+            modelBuilder.Entity<OrderAdd>(entity =>
+            {
+                entity.Property(e => e.Id)
+                    .HasColumnName("id")
+                    .HasColumnType("int(11)");
+
+                entity.Property(e => e.Fd61)
+                    .HasColumnName("fd61")
+                    .HasColumnType("varchar(255)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Merchantname)
+                    .HasColumnName("merchantname")
+                    .HasColumnType("varchar(255)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Merchantno)
+                    .HasColumnName("merchantno")
+                    .HasColumnType("varchar(255)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Money)
+                    .HasColumnName("money")
+                    .HasColumnType("decimal(10,2)");
+
+                entity.Property(e => e.Orderno)
+                    .HasColumnName("orderno")
+                    .HasColumnType("varchar(255)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Reason)
+                    .HasColumnName("reason")
+                    .HasColumnType("varchar(255)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Status)
+                    .HasColumnName("status")
+                    .HasColumnType("varchar(255)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Tradedate)
+                    .HasColumnName("tradedate")
+                    .HasColumnType("varchar(255)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Tradetime)
+                    .HasColumnName("tradetime")
+                    .HasColumnType("varchar(255)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+            });
+
             modelBuilder.Entity<OrderForNo>(entity =>
             {
                 entity.HasKey(e => e.OrderNo)
@@ -16951,6 +17324,114 @@ namespace MySystem.Models.Main2
                 entity.Property(e => e.UserId).HasColumnType("int(11)");
             });
 
+            modelBuilder.Entity<UserAmountSummaryAfter>(entity =>
+            {
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.CreateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.IsAct)
+                    .HasColumnType("int(11)")
+                    .HasComment("是否活动");
+
+                entity.Property(e => e.PayMode).HasColumnType("int(11)");
+
+                entity.Property(e => e.QueryCount).HasColumnType("int(11)");
+
+                entity.Property(e => e.SeoDescription)
+                    .HasColumnType("varchar(500)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoKeyword)
+                    .HasColumnType("varchar(200)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoTitle)
+                    .HasColumnType("varchar(100)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Sort).HasColumnType("int(11)");
+
+                entity.Property(e => e.Status).HasColumnType("int(11)");
+
+                entity.Property(e => e.TotalAmount).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.TradeCount)
+                    .HasColumnType("int(11)")
+                    .HasComment("交易笔数");
+
+                entity.Property(e => e.TradeDate)
+                    .HasColumnType("varchar(8)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.TradeMonth)
+                    .HasColumnType("varchar(6)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.UpdateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.UserId).HasColumnType("int(11)");
+            });
+
+            modelBuilder.Entity<UserAmountSummaryBefore>(entity =>
+            {
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.CreateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.IsAct)
+                    .HasColumnType("int(11)")
+                    .HasComment("是否活动");
+
+                entity.Property(e => e.PayMode).HasColumnType("int(11)");
+
+                entity.Property(e => e.QueryCount).HasColumnType("int(11)");
+
+                entity.Property(e => e.SeoDescription)
+                    .HasColumnType("varchar(500)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoKeyword)
+                    .HasColumnType("varchar(200)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoTitle)
+                    .HasColumnType("varchar(100)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Sort).HasColumnType("int(11)");
+
+                entity.Property(e => e.Status).HasColumnType("int(11)");
+
+                entity.Property(e => e.TotalAmount).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.TradeCount)
+                    .HasColumnType("int(11)")
+                    .HasComment("交易笔数");
+
+                entity.Property(e => e.TradeDate)
+                    .HasColumnType("varchar(8)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.TradeMonth)
+                    .HasColumnType("varchar(6)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.UpdateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.UserId).HasColumnType("int(11)");
+            });
+
             modelBuilder.Entity<UserAuthRecord>(entity =>
             {
                 entity.Property(e => e.Id).HasColumnType("int(11)");