Merge branch 'test-mainserver' into release-mainserver

AppStart/Helper/PosCouponPrize/PosCouponPrizeService.cs

@@ -1131,14 +1131,12 @@ namespace MySystem
                 UserIds.Add(int.Parse(function.CheckInt(IdString)));
             } 
             JavaModels.WebCMSEntities db = new JavaModels.WebCMSEntities();
-            int CampId = int.Parse(function.CheckInt(RedisDbconn.Instance.Get<string>("KxsCampUserCampId")));
-            var users = db.KxsCampUser.Where(m => UserIds.Contains(m.UserId) && m.CampId == CampId).ToList();
-            foreach(var user in users)
+            JavaModels.KxsCamp camp = db.KxsCamp.FirstOrDefault(m => m.Status == 1);
+            if(camp != null)
             {
-                DateTime now = DateTime.Now;
-                // JavaModels.KxsCamp camp = db.KxsCamp.FirstOrDefault(m => m.Id == user.CampId && m.StartTime <= now && m.EndTime >= now);
-                JavaModels.KxsCamp camp = db.KxsCamp.FirstOrDefault(m => m.Id == user.CampId && m.Status == 1);
-                if(camp != null)
+                int CampId = camp.Id;
+                var users = db.KxsCampUser.Where(m => UserIds.Contains(m.UserId) && m.CampId == CampId).ToList();
+                foreach(var user in users)
                 {
                     function.WriteLog("活动Id:" + camp.Id, "训练营判断参与活动");
                     op = false;

AppStart/Helper/PosPushDataHelper.cs

@@ -0,0 +1,145 @@
+using System;
+using System.Collections.Generic;
+using Library;
+using MySystem.PxcModels;
+
+namespace MySystem
+{
+    public class PosPushDataHelper
+    {
+        public readonly static PosPushDataHelper Instance = new PosPushDataHelper();
+        private PosPushDataHelper()
+        { }
+
+        //绑定数据
+        public static void Bind(PosMerchantInfo mer)
+        {
+            try
+            {
+                Dictionary<string, object> dataContent = new Dictionary<string, object>();
+                dataContent.Add("pos_sn", mer.KqSnNo); //机具sn
+                dataContent.Add("mer_no", mer.KqMerNo); //商户号
+                dataContent.Add("id_card", mer.MerIdcardNo); //商户身份证
+                dataContent.Add("mer_name", mer.MerchantName); //商户姓名
+                dataContent.Add("mer_mobile", mer.MerchantMobile); //商户手机号
+                dataContent.Add("request_id", mer.CreateDate.Value.ToString("yyyyMMddHHmmssfff") + function.get_Random(8)); //流水号
+                dataContent.Add("bind_time", mer.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss")); //绑定时间
+                dataContent.Add("brand", mer.BrandId); //品牌
+                Push("bind", dataContent);
+            }
+            catch (Exception ex)
+            {
+                function.WriteLog(DateTime.Now.ToString() + "\n" + ex.ToString() + "\n\n", "推送绑定数据异常");
+            }
+        }
+
+        //解绑数据
+        public static void UnBind(PosMerchantInfo mer)
+        {
+            try
+            {
+                Dictionary<string, object> dataContent = new Dictionary<string, object>();
+                dataContent.Add("pos_sn", mer.KqSnNo); //机具sn
+                dataContent.Add("mer_no", mer.KqMerNo); //商户号
+                dataContent.Add("request_id", DateTime.Now.ToString("yyyyMMddHHmmssfff") + function.get_Random(8)); //流水号
+                dataContent.Add("un_bind_time", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")); //绑定时间
+                dataContent.Add("brand", mer.BrandId); //品牌
+                Push("un_bind", dataContent);
+            }
+            catch (Exception ex)
+            {
+                function.WriteLog(DateTime.Now.ToString() + "\n" + ex.ToString() + "\n\n", "推送解绑数据异常");
+            }
+        }
+
+        //换绑数据
+        public static void ChangeBind(PosMerchantInfo mer, PosMachinesTwo source, PosMachinesTwo pos)
+        {
+            try
+            {
+                Dictionary<string, object> dataContent = new Dictionary<string, object>();
+                dataContent.Add("request_id", DateTime.Now.ToString("yyyyMMddHHmmssfff") + function.get_Random(8)); //流水号
+                dataContent.Add("mer_no", mer.KqMerNo); //商户号
+                dataContent.Add("source_pos_sn", source.PosSn); //来源机具sn
+                dataContent.Add("source_brand", source.BrandId); //来源品牌
+                dataContent.Add("to_pos_sn", pos.PosSn); //兑换机具sn
+                dataContent.Add("to_brand", pos.BrandId); //兑换品牌
+                dataContent.Add("change_bind_time", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")); //换绑时间
+                Push("change_bind", dataContent);
+            }
+            catch (Exception ex)
+            {
+                function.WriteLog(DateTime.Now.ToString() + "\n" + ex.ToString() + "\n\n", "推送换绑数据异常");
+            }
+        }
+
+        //押金数据
+        public static void Deposit(PosMerchantInfo mer, decimal amt)
+        {
+            try
+            {
+                Dictionary<string, object> dataContent = new Dictionary<string, object>();
+                dataContent.Add("pos_sn", mer.KqSnNo); //机具sn
+                dataContent.Add("mer_no", mer.KqMerNo); //商户号
+                dataContent.Add("request_id", DateTime.Now.ToString("yyyyMMddHHmmssfff") + function.get_Random(8)); //流水号
+                dataContent.Add("deposit_amount", amt); //押金金额
+                dataContent.Add("trade_time", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")); //交易时间
+                dataContent.Add("brand", mer.BrandId); //品牌
+                Push("deposit", dataContent);
+            }
+            catch (Exception ex)
+            {
+                function.WriteLog(DateTime.Now.ToString() + "\n" + ex.ToString() + "\n\n", "推送押金数据异常");
+            }
+        }
+
+        //激活数据
+        public static void Active(PosMerchantInfo mer)
+        {
+            try
+            {
+                Dictionary<string, object> dataContent = new Dictionary<string, object>();
+                dataContent.Add("pos_sn", mer.KqSnNo); //机具sn
+                dataContent.Add("mobile", mer.KqMerNo); //商户号
+                dataContent.Add("request_id", DateTime.Now.ToString("yyyyMMddHHmmssfff") + function.get_Random(8)); //流水号
+                dataContent.Add("activation_time", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")); //激活时间
+                dataContent.Add("brand", mer.BrandId); //品牌
+                Push("active", dataContent);
+            }
+            catch (Exception ex)
+            {
+                function.WriteLog(DateTime.Now.ToString() + "\n" + ex.ToString() + "\n\n", "推送激活数据异常");
+            }
+        }
+
+        //交易数据
+        public static void Trade(TradeRecord trade)
+        {
+            try
+            {
+                Dictionary<string, object> dataContent = new Dictionary<string, object>();
+                dataContent.Add("pos_sn", trade.SnNo); //机具sn
+                dataContent.Add("mer_no", trade.MerNo); //商户号
+                dataContent.Add("request_id", trade.TradeSerialNo); //流水号
+                dataContent.Add("trade_amount", trade.TradeAmount); //交易金额
+                dataContent.Add("trade_time", trade.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss")); //交易时间
+                dataContent.Add("brand", trade.BrandId); //品牌
+                dataContent.Add("card_type", trade.BankCardType); //卡类型
+                dataContent.Add("qr_pay_flag", trade.QrPayFlag); //云闪付标记
+                Push("trade", dataContent);
+            }
+            catch (Exception ex)
+            {
+                function.WriteLog(DateTime.Now.ToString() + "\n" + ex.ToString() + "\n\n", "推送交易数据异常");
+            }
+        }
+
+        public static void Push(string dataType, Dictionary<string, object> dataContent)
+        {
+            Dictionary<string, object> data = new Dictionary<string, object>();
+            data.Add("data_type", dataType);
+            data.Add("data_content", dataContent);
+            RedisDbconn.Instance.AddList("KxsPosDataQueue", Newtonsoft.Json.JsonConvert.SerializeObject(data));
+        }
+    }
+}

AppStart/Helper/SycnSpServer/SycnSpActiveService.cs

@@ -68,6 +68,9 @@ namespace MySystem
                                 {
                                     StatService.Instance.PreActPrize(db, pos, merchant, act.SeoTitle);
                                 }
+
+                                //推送数据给java
+                                PosPushDataHelper.Deposit(merchant, Deposit);
                             }
 
                             if(pos.BrandId == 7 || pos.BrandId == 12 || pos.BrandId == 13 || pos.BrandId == 15 || pos.BrandId == 16 || pos.BrandId == 22)

AppStart/Helper/SycnSpServer/SycnSpChangeBindService.cs

@@ -134,6 +134,9 @@ namespace MySystem
                             add.ChangeSnExpand = ChangeSnExpand; //机具SN
                             db.SaveChanges();
 
+                            //推送数据给java
+                            PosPushDataHelper.ChangeBind(merchant, oldpos, newpos);
+
                             ChangeBindRecord edit = spdb.ChangeBindRecord.FirstOrDefault(m => m.Id == Bind.Id);
                             if (edit != null)
                             {

AppStart/Helper/SycnSpServer/SycnSpMerchantRecordService.cs

@@ -48,6 +48,9 @@ namespace MySystem
                                 merinfo.MgrNo = Mer.AgentNo; //代理商号
                                 merinfo.MgrName = Mer.Field2; //终端类型
                                 db.SaveChanges();
+
+                                //推送数据给java
+                                PosPushDataHelper.Bind(merinfo);
                             }
                             int IsFirst = 1;
                             if(!string.IsNullOrEmpty(Mer.LegalIdCard))

AppStart/Helper/SycnSpServer/SycnSpMerchantService.cs

@@ -242,6 +242,18 @@ namespace MySystem
                                         //发放奖励MQ
                                         PrizeSetHelper.Do("6", pos.PosSn);
                                     }
+
+                                    //推送激活数据
+                                    PosPushDataHelper.Active(add);
+
+                                    //推送激活数据给MQ
+                                    Utils.Instance.SendActData(pos);
+                                }
+
+                                //推送数据给java
+                                if(pos.BrandId != 12 && pos.BrandId != 13)
+                                {
+                                    PosPushDataHelper.Bind(add);
                                 }
 
                                 Merchants edit = spdb.Merchants.FirstOrDefault(m => m.Id == Mer.Id);

AppStart/Helper/SycnSpServer/SycnSpTradeService.cs

@@ -585,6 +585,9 @@ namespace MySystem
                                             //统计商户交易额
                                             string TradeDate = trade.CreateDate == null ? DateTime.Now.ToString("yyyyMMdd") : trade.CreateDate.Value.ToString("yyyyMMdd");
                                             RedisDbconn.Instance.AddList("StatMerTradeAmountQueue", "{\"TradeDate\":\"" + TradeDate + "\",\"TradeAmount\":\"" + TradeAmount + "\",\"MerchantId\":\"" + pos.BindMerchantId + "\",\"BrandId\":\"" + BrandId + "\"}");
+
+                                            //推送数据给java
+                                            PosPushDataHelper.Trade(add);
                                         }
                                         db.SpOrderNos.Add(new PxcModels.SpOrderNos()
                                         {
@@ -636,6 +639,11 @@ namespace MySystem
                             PxcModels.PosMerchantInfo merchant = db.PosMerchantInfo.FirstOrDefault(m => m.Id == pos.BindMerchantId) ?? new PxcModels.PosMerchantInfo();
                             function.WriteLog("PosMerchantInfo:" + merchant.KqMerNo, "服务费奖励发放日志");
                             StatService.Instance.PreActPrize(db, pos, merchant, pos.SeoKeyword);
+
+                            //推送数据给java
+                            decimal Deposit = decimal.Parse(function.CheckNum(pos.SeoKeyword));
+                            if(Deposit > 1000) Deposit = Deposit / 100;
+                            PosPushDataHelper.Deposit(merchant, Deposit);
                         }
                     }
                     spdb.Dispose();
@@ -748,6 +756,9 @@ namespace MySystem
                                             //统计商户交易额
                                             string TradeDate = trade.CreateDate == null ? DateTime.Now.ToString("yyyyMMdd") : trade.CreateDate.Value.ToString("yyyyMMdd");
                                             RedisDbconn.Instance.AddList("StatMerTradeAmountQueue", "{\"TradeDate\":\"" + TradeDate + "\",\"TradeAmount\":\"" + TradeAmount + "\",\"MerchantId\":\"" + pos.BindMerchantId + "\",\"BrandId\":\"" + BrandId + "\"}");
+
+                                            //推送数据给java
+                                            PosPushDataHelper.Trade(add);
                                         }
                                         db.SpOrderNos.Add(new PxcModels.SpOrderNos()
                                         {
@@ -976,6 +987,10 @@ namespace MySystem
 
                 //推送激活数据
                 if(Deposit == 0) Utils.Instance.SendActData(pos);
+                if(pos.BrandId == 14 && merchant != null)
+                {
+                    PosPushDataHelper.Active(merchant);
+                }
             }
             else if (pos.ActivationState == 1 && pos.BrandId == 14)
             {

AppStart/Helper/SycnSpServer/SycnSpTradeWifiService.cs

@@ -131,6 +131,14 @@ namespace MySystem
                                 {
                                     StartMonth = StartMonth.AddMonths(1);
                                     StatTrade(db, pos.BuyUserId, pos.BrandId, StartMonth.ToString("yyyyMM"), TradeAmt);
+                                    if (pos.BindingTime < DateTime.Now.AddMonths(-9))
+                                    {
+                                        StatTradeBefore(db, pos.BuyUserId, pos.BrandId, StartMonth.ToString("yyyyMM"), TradeAmt);
+                                    }
+                                    else
+                                    {
+                                        StatTradeAfter(db, pos.BuyUserId, pos.BrandId, StartMonth.ToString("yyyyMM"), TradeAmt);
+                                    }
                                 }
                             }
 
@@ -222,5 +230,97 @@ namespace MySystem
                 }
             }
         }
+
+        public void StatTradeBefore(PxcModels.WebCMSEntities db, int UserId, int BrandId, string TradeMonth, decimal TradeAmount)
+        {
+            PxcModels.Users user = db.Users.FirstOrDefault(m => m.Id == UserId) ?? new PxcModels.Users();
+            string ParentNav = user.ParentNav;
+            string TradeDate = TradeMonth + "01";
+            ParentNav += "," + UserId + ",";
+
+            PxcModels.TradeDaySummaryBefore selfStat = db.TradeDaySummaryBefore.FirstOrDefault(m => m.UserId == UserId && m.TradeMonth == TradeMonth && m.TradeDate == TradeDate && m.BrandId == BrandId && m.SeoTitle == "self");
+            if (selfStat == null)
+            {
+                selfStat = db.TradeDaySummaryBefore.Add(new PxcModels.TradeDaySummaryBefore()
+                {
+                    UserId = UserId,
+                    TradeMonth = TradeMonth,
+                    TradeDate = TradeDate,
+                    BrandId = BrandId,
+                    SeoTitle = "self",
+                }).Entity;
+                db.SaveChanges();
+            }
+            selfStat.HelpDirectTradeAmt += TradeAmount;
+            if (!string.IsNullOrEmpty(ParentNav))
+            {
+                string[] ParentNavList = ParentNav.Trim(',').Replace(",,", ",").Split(',');
+                foreach (string NavUserIdString in ParentNavList)
+                {
+                    int NavUserId = int.Parse(NavUserIdString);
+                    PxcModels.TradeDaySummaryBefore teamStat = db.TradeDaySummaryBefore.FirstOrDefault(m => m.UserId == NavUserId && m.TradeMonth == TradeMonth && m.TradeDate == TradeDate && m.BrandId == BrandId && m.SeoTitle == "team");
+                    if (teamStat == null)
+                    {
+                        teamStat = db.TradeDaySummaryBefore.Add(new PxcModels.TradeDaySummaryBefore()
+                        {
+                            UserId = NavUserId,
+                            TradeMonth = TradeMonth,
+                            TradeDate = TradeDate,
+                            BrandId = BrandId,
+                            SeoTitle = "team",
+                        }).Entity;
+                        db.SaveChanges();
+                    }
+                    teamStat.HelpNonDirectTradeAmt += TradeAmount;
+                    db.SaveChanges();
+                }
+            }
+        }
+
+        public void StatTradeAfter(PxcModels.WebCMSEntities db, int UserId, int BrandId, string TradeMonth, decimal TradeAmount)
+        {
+            PxcModels.Users user = db.Users.FirstOrDefault(m => m.Id == UserId) ?? new PxcModels.Users();
+            string ParentNav = user.ParentNav;
+            string TradeDate = TradeMonth + "01";
+            ParentNav += "," + UserId + ",";
+
+            PxcModels.TradeDaySummaryAfter selfStat = db.TradeDaySummaryAfter.FirstOrDefault(m => m.UserId == UserId && m.TradeMonth == TradeMonth && m.TradeDate == TradeDate && m.BrandId == BrandId && m.SeoTitle == "self");
+            if (selfStat == null)
+            {
+                selfStat = db.TradeDaySummaryAfter.Add(new PxcModels.TradeDaySummaryAfter()
+                {
+                    UserId = UserId,
+                    TradeMonth = TradeMonth,
+                    TradeDate = TradeDate,
+                    BrandId = BrandId,
+                    SeoTitle = "self",
+                }).Entity;
+                db.SaveChanges();
+            }
+            selfStat.HelpDirectTradeAmt += TradeAmount;
+            if (!string.IsNullOrEmpty(ParentNav))
+            {
+                string[] ParentNavList = ParentNav.Trim(',').Replace(",,", ",").Split(',');
+                foreach (string NavUserIdString in ParentNavList)
+                {
+                    int NavUserId = int.Parse(NavUserIdString);
+                    PxcModels.TradeDaySummaryAfter teamStat = db.TradeDaySummaryAfter.FirstOrDefault(m => m.UserId == NavUserId && m.TradeMonth == TradeMonth && m.TradeDate == TradeDate && m.BrandId == BrandId && m.SeoTitle == "team");
+                    if (teamStat == null)
+                    {
+                        teamStat = db.TradeDaySummaryAfter.Add(new PxcModels.TradeDaySummaryAfter()
+                        {
+                            UserId = NavUserId,
+                            TradeMonth = TradeMonth,
+                            TradeDate = TradeDate,
+                            BrandId = BrandId,
+                            SeoTitle = "team",
+                        }).Entity;
+                        db.SaveChanges();
+                    }
+                    teamStat.HelpNonDirectTradeAmt += TradeAmount;
+                    db.SaveChanges();
+                }
+            }
+        }
     }
 }

AppStart/Helper/SycnSpServer/SycnSpTradeZkbService.cs

@@ -92,6 +92,9 @@ namespace MySystem
                                             TradeDate = pos.BindingTime,
                                         }).Entity;
                                         db.SaveChanges();
+
+                                        //推送数据给java
+                                        PosPushDataHelper.Trade(add);
                                     }
                                     db.SpOrderNos.Add(new PxcModels.SpOrderNos()
                                     {

AppStart/Helper/SycnSpServer/SycnSpUnBindService.cs

@@ -57,6 +57,9 @@ namespace MySystem
                                     PxcModels.PosMerchantInfo merchant = db.PosMerchantInfo.FirstOrDefault(m => m.Id == EditPos.BindMerchantId);
                                     if(merchant != null)
                                     {
+                                        //推送数据给java
+                                        PosPushDataHelper.UnBind(merchant);
+
                                         pos.BindMerchantId = 0;
                                         pos.BindingState = 0;
                                         pos.BindingTime = null;

AppStart/Helper/TradeFilterService.cs

@@ -40,6 +40,7 @@ namespace MySystem
                         WebCMSEntities db = new WebCMSEntities();
                         Orders order = db.Orders.FirstOrDefault(m => m.Id == OrderId) ?? new Orders();
                         Users user = db.Users.FirstOrDefault(m => m.Id == order.UserId) ?? new Users();
+                        Users prizeuser = db.Users.FirstOrDefault(m => m.Id == PrizeUserId) ?? new Users();
                         db.TradeFilterRecord.Add(new TradeFilterRecord()
                         {
                             CreateDate = DateTime.Now,
@@ -54,6 +55,16 @@ namespace MySystem
                         db.SaveChanges();
                         db.Dispose();
                         function.WriteLog("入库成功", "训练营60拦截队列日志");
+
+                        JavaModels.WebCMSEntities javadb = new JavaModels.WebCMSEntities();
+                        JavaModels.KxsCampBonusLog log = javadb.KxsCampBonusLog.FirstOrDefault(m => m.Remark.Contains(order.OrderNo));
+                        if(log != null)
+                        {
+                            log.FilterUser = prizeuser.RealName;
+                            log.FilterCode = prizeuser.MakerCode;
+                            javadb.SaveChanges();
+                        }
+                        javadb.Dispose();
                     }
                     catch (Exception ex)
                     {                        

JavaModels/KxsBanner.cs

@@ -6,9 +6,11 @@ namespace MySystem.JavaModels
     public partial class KxsBanner
     {
         public int Id { get; set; }
+        public int Sort { get; set; }
+        public string Contents { get; set; }
         public int Status { get; set; }
         public string Remark { get; set; }
-        public string BanType { get; set; }
+        public string ColId { get; set; }
         public string Url { get; set; }
         public string PicUrl { get; set; }
         public string Title { get; set; }

JavaModels/KxsCampBonusLog.cs

@@ -6,19 +6,22 @@ namespace MySystem.JavaModels
     public partial class KxsCampBonusLog
     {
         public int Id { get; set; }
+        public int GroupId { get; set; }
+        public int CampUserId { get; set; }
+        public int SourceType { get; set; }
+        public string UserCode { get; set; }
+        public string Username { get; set; }
+        public int SourceId { get; set; }
         public string CreateBy { get; set; }
-        public int StageId { get; set; }
         public int CampId { get; set; }
-        public int OrderId { get; set; }
-        public string PosSn { get; set; }
         public string Remark { get; set; }
         public string Kind { get; set; }
-        public decimal AfterAmount { get; set; }
-        public decimal BeforeAmount { get; set; }
-        public decimal Amount { get; set; }
+        public int SourceNum { get; set; }
         public int Version { get; set; }
         public int DelFlag { get; set; }
         public DateTime? UpdateTime { get; set; }
         public DateTime? CreateTime { get; set; }
+        public string FilterUser { get; set; }
+        public string FilterCode { get; set; }
     }
 }

JavaModels/KxsCampGroup.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.JavaModels
+{
+    public partial class KxsCampGroup
+    {
+        public int GroupId { get; set; }
+        public string GroupUserCode { get; set; }
+        public string GroupUsername { get; set; }
+        public int GroupLeaderId { get; set; }
+        public int CampId { get; set; }
+        public string GroupName { get; set; }
+        public int Version { get; set; }
+        public string DelFlag { get; set; }
+        public DateTime? UpdateTime { get; set; }
+        public DateTime? CreateTime { get; set; }
+        public int GroupOpenNum { get; set; }
+        public int GroupOrderNum { get; set; }
+    }
+}

JavaModels/KxsCampReport.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.JavaModels
+{
+    public partial class KxsCampReport
+    {
+        public int Id { get; set; }
+        public string CreateBy { get; set; }
+        public string Remark { get; set; }
+        public string UserCode { get; set; }
+        public string Username { get; set; }
+        public int UserId { get; set; }
+        public int Status { get; set; }
+        public string Imgs { get; set; }
+        public string Title { get; set; }
+        public int ReportType { get; set; }
+        public int Version { get; set; }
+        public string DelFlag { get; set; }
+        public DateTime? UpdateTime { get; set; }
+        public DateTime? CreateTime { get; set; }
+        public int CampId { get; set; }
+    }
+}

JavaModels/KxsCampRole.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.JavaModels
+{
+    public partial class KxsCampRole
+    {
+        public int Id { get; set; }
+        public string Remark { get; set; }
+        public int Status { get; set; }
+        public string UpdateBy { get; set; }
+        public string CreateBy { get; set; }
+        public string RoleName { get; set; }
+        public int Version { get; set; }
+        public string DelFlag { get; set; }
+        public DateTime? UpdateTime { get; set; }
+        public DateTime? CreateTime { get; set; }
+    }
+}

JavaModels/KxsCampUser.cs

@@ -16,8 +16,15 @@ namespace MySystem.JavaModels
         public int DelFlag { get; set; }
         public DateTime? UpdateTime { get; set; }
         public DateTime? CreateTime { get; set; }
+        public decimal TeamBonusPool { get; set; }
         public decimal TeamOrderPool { get; set; }
         public decimal TeamLeaderPool { get; set; }
         public int TeamLeaderNum { get; set; }
+        public int TeamPosNum { get; set; }
+        public int TeamGdNum { get; set; }
+        public int TeamLkbNum { get; set; }
+        public int GroupId { get; set; }
+        public int RoleId { get; set; }
+        public int TeamWifiNum { get; set; }
     }
 }

JavaModels/KxsCol.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.JavaModels
+{
+    public partial class KxsCol
+    {
+        public int Id { get; set; }
+        public string Url { get; set; }
+        public string ColDetail { get; set; }
+        public string ColPic { get; set; }
+        public string ColName { get; set; }
+        public string ColId { get; set; }
+        public int Version { get; set; }
+        public string DelFlag { get; set; }
+        public DateTime? UpdateTime { get; set; }
+        public DateTime? CreateTime { get; set; }
+        public int Sort { get; set; }
+    }
+}

JavaModels/KxsInterfaceConfig.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.JavaModels
+{
+    public partial class KxsInterfaceConfig
+    {
+        public int Id { get; set; }
+        public int ParamType { get; set; }
+        public int Status { get; set; }
+        public string Params { get; set; }
+        public string Remark { get; set; }
+        public string UpdateBy { get; set; }
+        public string CreateBy { get; set; }
+        public int Version { get; set; }
+        public string DelFlag { get; set; }
+        public DateTime? UpdateTime { get; set; }
+        public DateTime? CreateTime { get; set; }
+        public string Name { get; set; }
+        public string IfCode { get; set; }
+    }
+}

JavaModels/KxsMorning.cs

@@ -21,5 +21,6 @@ namespace MySystem.JavaModels
         public int DelFlag { get; set; }
         public DateTime? UpdateTime { get; set; }
         public DateTime? CreateTime { get; set; }
+        public string PageId { get; set; }
     }
 }

JavaModels/SysFile.cs

@@ -16,5 +16,6 @@ namespace MySystem.JavaModels
         public DateTime? CreateTime { get; set; }
         public DateTime? UpdateTime { get; set; }
         public string DelFlag { get; set; }
+        public string Title { get; set; }
     }
 }

JavaModels/WebCMSEntities.cs

@@ -23,12 +23,17 @@ namespace MySystem.JavaModels
         public virtual DbSet<KxsBcqtTeamDetail> KxsBcqtTeamDetail { get; set; }
         public virtual DbSet<KxsCamp> KxsCamp { get; set; }
         public virtual DbSet<KxsCampBonusLog> KxsCampBonusLog { get; set; }
+        public virtual DbSet<KxsCampGroup> KxsCampGroup { get; set; }
+        public virtual DbSet<KxsCampReport> KxsCampReport { get; set; }
+        public virtual DbSet<KxsCampRole> KxsCampRole { get; set; }
         public virtual DbSet<KxsCampUser> KxsCampUser { get; set; }
         public virtual DbSet<KxsCheckpoint> KxsCheckpoint { get; set; }
+        public virtual DbSet<KxsCol> KxsCol { get; set; }
         public virtual DbSet<KxsDtsErrorLog> KxsDtsErrorLog { get; set; }
         public virtual DbSet<KxsDtsLog> KxsDtsLog { get; set; }
         public virtual DbSet<KxsFeedback> KxsFeedback { get; set; }
         public virtual DbSet<KxsFeedbackType> KxsFeedbackType { get; set; }
+        public virtual DbSet<KxsInterfaceConfig> KxsInterfaceConfig { get; set; }
         public virtual DbSet<KxsMorning> KxsMorning { get; set; }
         public virtual DbSet<KxsMorningLog> KxsMorningLog { get; set; }
         public virtual DbSet<KxsOpenBank> KxsOpenBank { get; set; }
@@ -298,10 +303,17 @@ namespace MySystem.JavaModels
                     .HasColumnName("id")
                     .HasComment("主键ID");
 
-                entity.Property(e => e.BanType)
-                    .HasColumnName("ban_type")
-                    .HasColumnType("varchar(128)")
-                    .HasComment("分类名称")
+                entity.Property(e => e.ColId)
+                    .HasColumnName("col_id")
+                    .HasColumnType("varchar(16)")
+                    .HasComment("分类ID")
+                    .HasCharSet("utf8mb3")
+                    .HasCollation("utf8mb3_general_ci");
+
+                entity.Property(e => e.Contents)
+                    .HasColumnName("contents")
+                    .HasColumnType("longtext")
+                    .HasComment("内容")
                     .HasCharSet("utf8mb3")
                     .HasCollation("utf8mb3_general_ci");
 
@@ -328,6 +340,10 @@ namespace MySystem.JavaModels
                     .HasCharSet("utf8mb3")
                     .HasCollation("utf8mb3_general_ci");
 
+                entity.Property(e => e.Sort)
+                    .HasColumnName("sort")
+                    .HasComment("排序");
+
                 entity.Property(e => e.Status)
                     .HasColumnName("status")
                     .HasDefaultValueSql("'1'")
@@ -652,25 +668,14 @@ namespace MySystem.JavaModels
                     .HasColumnName("id")
                     .HasComment("主键ID");
 
-                entity.Property(e => e.AfterAmount)
-                    .HasColumnName("after_amount")
-                    .HasColumnType("decimal(18,2)")
-                    .HasComment("变动后金额");
-
-                entity.Property(e => e.Amount)
-                    .HasColumnName("amount")
-                    .HasColumnType("decimal(18,2)")
-                    .HasComment("操作金额");
-
-                entity.Property(e => e.BeforeAmount)
-                    .HasColumnName("before_amount")
-                    .HasColumnType("decimal(18,2)")
-                    .HasComment("变动前金额");
-
                 entity.Property(e => e.CampId)
                     .HasColumnName("camp_id")
                     .HasComment("训练营ID");
 
+                entity.Property(e => e.CampUserId)
+                    .HasColumnName("camp_user_id")
+                    .HasComment("参与训练营用户ID");
+
                 entity.Property(e => e.CreateBy)
                     .HasColumnName("create_by")
                     .HasColumnType("varchar(64)")
@@ -687,6 +692,24 @@ namespace MySystem.JavaModels
                     .HasColumnName("del_flag")
                     .HasComment("删除标记，0未删除，1已删除");
 
+                entity.Property(e => e.FilterCode)
+                    .HasColumnName("filter_code")
+                    .HasColumnType("varchar(16)")
+                    .HasComment("过滤奖励的用户编号")
+                    .HasCharSet("utf8mb3")
+                    .HasCollation("utf8mb3_general_ci");
+
+                entity.Property(e => e.FilterUser)
+                    .HasColumnName("filter_user")
+                    .HasColumnType("varchar(50)")
+                    .HasComment("过滤奖励的用户姓名")
+                    .HasCharSet("utf8mb3")
+                    .HasCollation("utf8mb3_general_ci");
+
+                entity.Property(e => e.GroupId)
+                    .HasColumnName("group_id")
+                    .HasComment("分组编号");
+
                 entity.Property(e => e.Kind)
                     .HasColumnName("kind")
                     .HasColumnType("varchar(6)")
@@ -694,27 +717,267 @@ namespace MySystem.JavaModels
                     .HasCharSet("utf8mb3")
                     .HasCollation("utf8mb3_general_ci");
 
-                entity.Property(e => e.OrderId)
-                    .HasColumnName("order_id")
-                    .HasComment("进入奖金池的订单ID");
+                entity.Property(e => e.Remark)
+                    .HasColumnName("remark")
+                    .HasColumnType("varchar(128)")
+                    .HasComment("备注")
+                    .HasCharSet("utf8mb3")
+                    .HasCollation("utf8mb3_general_ci");
+
+                entity.Property(e => e.SourceId)
+                    .HasColumnName("source_id")
+                    .HasComment("来源创客ID");
 
-                entity.Property(e => e.PosSn)
-                    .HasColumnName("pos_sn")
-                    .HasColumnType("varchar(64)")
-                    .HasComment("进入开机累计的sn号")
+                entity.Property(e => e.SourceNum)
+                    .HasColumnName("source_num")
+                    .HasComment("统计的数量");
+
+                entity.Property(e => e.SourceType)
+                    .HasColumnName("source_type")
+                    .HasComment("来源类型 电签券=0 大机券=1 组合包=2 小盟主=3 大盟主=4 pos开机=5 广电卡激活=6");
+
+                entity.Property(e => e.UpdateTime)
+                    .HasColumnName("update_time")
+                    .HasColumnType("datetime")
+                    .HasComment("更新时间");
+
+                entity.Property(e => e.UserCode)
+                    .HasColumnName("user_code")
+                    .HasColumnType("varchar(16)")
+                    .HasComment("来源创客编号")
+                    .HasCharSet("utf8mb3")
+                    .HasCollation("utf8mb3_general_ci");
+
+                entity.Property(e => e.Username)
+                    .HasColumnName("username")
+                    .HasColumnType("varchar(32)")
+                    .HasComment("来源创客姓名")
+                    .HasCharSet("utf8mb3")
+                    .HasCollation("utf8mb3_general_ci");
+
+                entity.Property(e => e.Version)
+                    .HasColumnName("version")
+                    .HasComment("版本");
+            });
+
+            modelBuilder.Entity<KxsCampGroup>(entity =>
+            {
+                entity.HasKey(e => e.GroupId)
+                    .HasName("PRIMARY");
+
+                entity.ToTable("kxs_camp_group");
+
+                entity.HasComment("训练营分组");
+
+                entity.Property(e => e.GroupId)
+                    .HasColumnName("group_id")
+                    .HasComment("主键ID");
+
+                entity.Property(e => e.CampId)
+                    .HasColumnName("camp_id")
+                    .HasComment("训练营ID");
+
+                entity.Property(e => e.CreateTime)
+                    .HasColumnName("create_time")
+                    .HasColumnType("datetime")
+                    .HasComment("新增时间");
+
+                entity.Property(e => e.DelFlag)
+                    .HasColumnName("del_flag")
+                    .HasColumnType("varchar(1)")
+                    .HasDefaultValueSql("'0'")
+                    .HasComment("删除标记，0未删除，1已删除")
+                    .HasCharSet("utf8mb3")
+                    .HasCollation("utf8mb3_general_ci");
+
+                entity.Property(e => e.GroupLeaderId)
+                    .HasColumnName("group_leader_id")
+                    .HasComment("组长ID");
+
+                entity.Property(e => e.GroupName)
+                    .HasColumnName("group_name")
+                    .HasColumnType("varchar(128)")
+                    .HasComment("小组名称")
+                    .HasCharSet("utf8mb3")
+                    .HasCollation("utf8mb3_general_ci");
+
+                entity.Property(e => e.GroupOpenNum)
+                    .HasColumnName("group_open_num")
+                    .HasComment("开机数");
+
+                entity.Property(e => e.GroupOrderNum)
+                    .HasColumnName("group_order_num")
+                    .HasComment("下单数");
+
+                entity.Property(e => e.GroupUserCode)
+                    .HasColumnName("group_user_code")
+                    .HasColumnType("varchar(16)")
+                    .HasComment("组长创客编号")
+                    .HasCharSet("utf8mb3")
+                    .HasCollation("utf8mb3_general_ci");
+
+                entity.Property(e => e.GroupUsername)
+                    .HasColumnName("group_username")
+                    .HasColumnType("varchar(32)")
+                    .HasComment("组长名称")
+                    .HasCharSet("utf8mb3")
+                    .HasCollation("utf8mb3_general_ci");
+
+                entity.Property(e => e.UpdateTime)
+                    .HasColumnName("update_time")
+                    .HasColumnType("datetime")
+                    .HasComment("更新时间");
+
+                entity.Property(e => e.Version)
+                    .HasColumnName("version")
+                    .HasComment("版本");
+            });
+
+            modelBuilder.Entity<KxsCampReport>(entity =>
+            {
+                entity.ToTable("kxs_camp_report");
+
+                entity.HasComment("训练营报备");
+
+                entity.Property(e => e.Id)
+                    .HasColumnName("id")
+                    .HasComment("主键ID");
+
+                entity.Property(e => e.CampId)
+                    .HasColumnName("camp_id")
+                    .HasComment("训练营ID");
+
+                entity.Property(e => e.CreateBy)
+                    .HasColumnName("create_by")
+                    .HasColumnType("varchar(32)")
+                    .HasComment("操作人")
+                    .HasCharSet("utf8mb3")
+                    .HasCollation("utf8mb3_general_ci");
+
+                entity.Property(e => e.CreateTime)
+                    .HasColumnName("create_time")
+                    .HasColumnType("datetime")
+                    .HasComment("新增时间");
+
+                entity.Property(e => e.DelFlag)
+                    .HasColumnName("del_flag")
+                    .HasColumnType("varchar(1)")
+                    .HasDefaultValueSql("'0'")
+                    .HasComment("删除标记，0未删除，1已删除")
+                    .HasCharSet("utf8mb3")
+                    .HasCollation("utf8mb3_general_ci");
+
+                entity.Property(e => e.Imgs)
+                    .HasColumnName("imgs")
+                    .HasColumnType("longtext")
+                    .HasComment("图片数组")
                     .HasCharSet("utf8mb3")
                     .HasCollation("utf8mb3_general_ci");
 
                 entity.Property(e => e.Remark)
                     .HasColumnName("remark")
-                    .HasColumnType("varchar(128)")
+                    .HasColumnType("varchar(255)")
                     .HasComment("备注")
                     .HasCharSet("utf8mb3")
                     .HasCollation("utf8mb3_general_ci");
 
-                entity.Property(e => e.StageId)
-                    .HasColumnName("stage_id")
-                    .HasComment("分期大盟主的分期ID");
+                entity.Property(e => e.ReportType)
+                    .HasColumnName("report_type")
+                    .HasComment("报备类型 广电开卡=0 来客吧=1 业绩报备=2 商城下单=3 其他=-1");
+
+                entity.Property(e => e.Status)
+                    .HasColumnName("status")
+                    .HasComment("状态 0审核中 1审核通过 -1审核失败");
+
+                entity.Property(e => e.Title)
+                    .HasColumnName("title")
+                    .HasColumnType("varchar(2000)")
+                    .HasComment("报备说明")
+                    .HasCharSet("utf8mb3")
+                    .HasCollation("utf8mb3_general_ci");
+
+                entity.Property(e => e.UpdateTime)
+                    .HasColumnName("update_time")
+                    .HasColumnType("datetime")
+                    .HasComment("更新时间");
+
+                entity.Property(e => e.UserCode)
+                    .HasColumnName("user_code")
+                    .HasColumnType("varchar(16)")
+                    .HasComment("创客编号")
+                    .HasCharSet("utf8mb3")
+                    .HasCollation("utf8mb3_general_ci");
+
+                entity.Property(e => e.UserId)
+                    .HasColumnName("user_id")
+                    .HasComment("报备创客ID");
+
+                entity.Property(e => e.Username)
+                    .HasColumnName("username")
+                    .HasColumnType("varchar(32)")
+                    .HasComment("创客姓名")
+                    .HasCharSet("utf8mb3")
+                    .HasCollation("utf8mb3_general_ci");
+
+                entity.Property(e => e.Version)
+                    .HasColumnName("version")
+                    .HasComment("版本");
+            });
+
+            modelBuilder.Entity<KxsCampRole>(entity =>
+            {
+                entity.ToTable("kxs_camp_role");
+
+                entity.HasComment("训练营角色表");
+
+                entity.Property(e => e.Id)
+                    .HasColumnName("id")
+                    .HasComment("主键ID");
+
+                entity.Property(e => e.CreateBy)
+                    .HasColumnName("create_by")
+                    .HasColumnType("varchar(32)")
+                    .HasComment("创建人")
+                    .HasCharSet("utf8mb3")
+                    .HasCollation("utf8mb3_general_ci");
+
+                entity.Property(e => e.CreateTime)
+                    .HasColumnName("create_time")
+                    .HasColumnType("datetime")
+                    .HasComment("新增时间");
+
+                entity.Property(e => e.DelFlag)
+                    .HasColumnName("del_flag")
+                    .HasColumnType("varchar(1)")
+                    .HasDefaultValueSql("'0'")
+                    .HasComment("删除标记，0未删除，1已删除")
+                    .HasCharSet("utf8mb3")
+                    .HasCollation("utf8mb3_general_ci");
+
+                entity.Property(e => e.Remark)
+                    .HasColumnName("remark")
+                    .HasColumnType("varchar(255)")
+                    .HasComment("备注")
+                    .HasCharSet("utf8mb3")
+                    .HasCollation("utf8mb3_general_ci");
+
+                entity.Property(e => e.RoleName)
+                    .HasColumnName("role_name")
+                    .HasColumnType("varchar(128)")
+                    .HasComment("角色名称")
+                    .HasCharSet("utf8mb3")
+                    .HasCollation("utf8mb3_general_ci");
+
+                entity.Property(e => e.Status)
+                    .HasColumnName("status")
+                    .HasComment("状态");
+
+                entity.Property(e => e.UpdateBy)
+                    .HasColumnName("update_by")
+                    .HasColumnType("varchar(32)")
+                    .HasComment("修改人")
+                    .HasCharSet("utf8mb3")
+                    .HasCollation("utf8mb3_general_ci");
 
                 entity.Property(e => e.UpdateTime)
                     .HasColumnName("update_time")
@@ -749,6 +1012,23 @@ namespace MySystem.JavaModels
                     .HasColumnName("del_flag")
                     .HasComment("删除标记，0未删除，1已删除");
 
+                entity.Property(e => e.GroupId)
+                    .HasColumnName("group_id")
+                    .HasComment("分组ID");
+
+                entity.Property(e => e.RoleId)
+                    .HasColumnName("role_id")
+                    .HasComment("角色ID");
+
+                entity.Property(e => e.TeamBonusPool)
+                    .HasColumnName("team_bonus_pool")
+                    .HasColumnType("decimal(18,2)")
+                    .HasComment("创客奖金池");
+
+                entity.Property(e => e.TeamGdNum)
+                    .HasColumnName("team_gd_num")
+                    .HasComment("广电开机数");
+
                 entity.Property(e => e.TeamLeaderNum)
                     .HasColumnName("team_leader_num")
                     .HasComment("团队下单大小盟主");
@@ -758,6 +1038,10 @@ namespace MySystem.JavaModels
                     .HasColumnType("decimal(18,2)")
                     .HasComment("创客盟主下单奖金池");
 
+                entity.Property(e => e.TeamLkbNum)
+                    .HasColumnName("team_lkb_num")
+                    .HasComment("来客吧开机数");
+
                 entity.Property(e => e.TeamOpenNum)
                     .HasColumnName("team_open_num")
                     .HasComment("团队开机总数");
@@ -771,6 +1055,14 @@ namespace MySystem.JavaModels
                     .HasColumnType("decimal(18,2)")
                     .HasComment("创客订单奖金池");
 
+                entity.Property(e => e.TeamPosNum)
+                    .HasColumnName("team_pos_num")
+                    .HasComment("pos开机数");
+
+                entity.Property(e => e.TeamWifiNum)
+                    .HasColumnName("team_wifi_num")
+                    .HasComment("团队wifi开机数");
+
                 entity.Property(e => e.UpdateTime)
                     .HasColumnName("update_time")
                     .HasColumnType("datetime")
@@ -833,6 +1125,78 @@ namespace MySystem.JavaModels
                     .HasColumnType("datetime");
             });
 
+            modelBuilder.Entity<KxsCol>(entity =>
+            {
+                entity.ToTable("kxs_col");
+
+                entity.HasComment("广告位分类表");
+
+                entity.Property(e => e.Id)
+                    .HasColumnName("id")
+                    .HasComment("主键ID");
+
+                entity.Property(e => e.ColDetail)
+                    .HasColumnName("col_detail")
+                    .HasColumnType("varchar(255)")
+                    .HasComment("分类详情")
+                    .HasCharSet("utf8mb3")
+                    .HasCollation("utf8mb3_general_ci");
+
+                entity.Property(e => e.ColId)
+                    .HasColumnName("col_id")
+                    .HasColumnType("varchar(16)")
+                    .HasComment("分类ID标识")
+                    .HasCharSet("utf8mb3")
+                    .HasCollation("utf8mb3_general_ci");
+
+                entity.Property(e => e.ColName)
+                    .HasColumnName("col_name")
+                    .HasColumnType("varchar(128)")
+                    .HasComment("分类名称")
+                    .HasCharSet("utf8mb3")
+                    .HasCollation("utf8mb3_general_ci");
+
+                entity.Property(e => e.ColPic)
+                    .HasColumnName("col_pic")
+                    .HasColumnType("varchar(255)")
+                    .HasComment("分类背景图片")
+                    .HasCharSet("utf8mb3")
+                    .HasCollation("utf8mb3_general_ci");
+
+                entity.Property(e => e.CreateTime)
+                    .HasColumnName("create_time")
+                    .HasColumnType("datetime")
+                    .HasComment("新增时间");
+
+                entity.Property(e => e.DelFlag)
+                    .HasColumnName("del_flag")
+                    .HasColumnType("varchar(1)")
+                    .HasDefaultValueSql("'0'")
+                    .HasComment("删除标记，0未删除，1已删除")
+                    .HasCharSet("utf8mb3")
+                    .HasCollation("utf8mb3_general_ci");
+
+                entity.Property(e => e.Sort)
+                    .HasColumnName("sort")
+                    .HasComment("排序");
+
+                entity.Property(e => e.UpdateTime)
+                    .HasColumnName("update_time")
+                    .HasColumnType("datetime")
+                    .HasComment("更新时间");
+
+                entity.Property(e => e.Url)
+                    .HasColumnName("url")
+                    .HasColumnType("varchar(255)")
+                    .HasComment("外链")
+                    .HasCharSet("utf8mb3")
+                    .HasCollation("utf8mb3_general_ci");
+
+                entity.Property(e => e.Version)
+                    .HasColumnName("version")
+                    .HasComment("版本");
+            });
+
             modelBuilder.Entity<KxsDtsErrorLog>(entity =>
             {
                 entity.ToTable("kxs_dts_error_log");
@@ -946,15 +1310,15 @@ namespace MySystem.JavaModels
                     .HasColumnName("back_type")
                     .HasColumnType("varchar(64)")
                     .HasComment("反馈类型")
-                    .HasCharSet("utf8mb3")
-                    .HasCollation("utf8mb3_general_ci");
+                    .HasCharSet("utf8mb4")
+                    .HasCollation("utf8mb4_0900_ai_ci");
 
                 entity.Property(e => e.Content)
                     .HasColumnName("content")
                     .HasColumnType("varchar(1000)")
                     .HasComment("内容")
-                    .HasCharSet("utf8mb3")
-                    .HasCollation("utf8mb3_general_ci");
+                    .HasCharSet("utf8mb4")
+                    .HasCollation("utf8mb4_unicode_ci");
 
                 entity.Property(e => e.CreateTime)
                     .HasColumnName("create_time")
@@ -1025,6 +1389,90 @@ namespace MySystem.JavaModels
                     .HasComment("版本");
             });
 
+            modelBuilder.Entity<KxsInterfaceConfig>(entity =>
+            {
+                entity.ToTable("kxs_interface_config");
+
+                entity.HasComment("代付通道参数配置表");
+
+                entity.Property(e => e.Id)
+                    .HasColumnName("id")
+                    .HasComment("主键ID");
+
+                entity.Property(e => e.CreateBy)
+                    .HasColumnName("create_by")
+                    .HasColumnType("varchar(32)")
+                    .HasComment("添加人")
+                    .HasCharSet("utf8mb3")
+                    .HasCollation("utf8mb3_general_ci");
+
+                entity.Property(e => e.CreateTime)
+                    .HasColumnName("create_time")
+                    .HasColumnType("datetime")
+                    .HasComment("新增时间");
+
+                entity.Property(e => e.DelFlag)
+                    .HasColumnName("del_flag")
+                    .HasColumnType("varchar(1)")
+                    .HasDefaultValueSql("'0'")
+                    .HasComment("删除标记，0未删除，1已删除")
+                    .HasCharSet("utf8mb3")
+                    .HasCollation("utf8mb3_general_ci");
+
+                entity.Property(e => e.IfCode)
+                    .HasColumnName("if_code")
+                    .HasColumnType("varchar(32)")
+                    .HasComment("平台标识")
+                    .HasCharSet("utf8mb3")
+                    .HasCollation("utf8mb3_general_ci");
+
+                entity.Property(e => e.Name)
+                    .HasColumnName("name")
+                    .HasColumnType("varchar(128)")
+                    .HasComment("名称")
+                    .HasCharSet("utf8mb3")
+                    .HasCollation("utf8mb3_general_ci");
+
+                entity.Property(e => e.ParamType)
+                    .HasColumnName("param_type")
+                    .HasComment("类型 0-代付平台 1-支付平台");
+
+                entity.Property(e => e.Params)
+                    .HasColumnName("params")
+                    .HasColumnType("varchar(4096)")
+                    .HasComment("参数json格式")
+                    .HasCharSet("utf8mb3")
+                    .HasCollation("utf8mb3_general_ci");
+
+                entity.Property(e => e.Remark)
+                    .HasColumnName("remark")
+                    .HasColumnType("varchar(255)")
+                    .HasComment("备注")
+                    .HasCharSet("utf8mb3")
+                    .HasCollation("utf8mb3_general_ci");
+
+                entity.Property(e => e.Status)
+                    .HasColumnName("status")
+                    .HasDefaultValueSql("'1'")
+                    .HasComment("状态: 0-停用, 1-启用");
+
+                entity.Property(e => e.UpdateBy)
+                    .HasColumnName("update_by")
+                    .HasColumnType("varchar(32)")
+                    .HasComment("修改人")
+                    .HasCharSet("utf8mb3")
+                    .HasCollation("utf8mb3_general_ci");
+
+                entity.Property(e => e.UpdateTime)
+                    .HasColumnName("update_time")
+                    .HasColumnType("datetime")
+                    .HasComment("更新时间");
+
+                entity.Property(e => e.Version)
+                    .HasColumnName("version")
+                    .HasComment("版本");
+            });
+
             modelBuilder.Entity<KxsMorning>(entity =>
             {
                 entity.ToTable("kxs_morning");
@@ -1076,6 +1524,13 @@ namespace MySystem.JavaModels
                     .HasCharSet("utf8mb3")
                     .HasCollation("utf8mb3_general_ci");
 
+                entity.Property(e => e.PageId)
+                    .HasColumnName("page_id")
+                    .HasColumnType("varchar(128)")
+                    .HasComment("小程序ID")
+                    .HasCharSet("utf8mb3")
+                    .HasCollation("utf8mb3_general_ci");
+
                 entity.Property(e => e.PageLink)
                     .HasColumnName("page_link")
                     .HasColumnType("varchar(500)")
@@ -1825,6 +2280,7 @@ namespace MySystem.JavaModels
 
                 entity.Property(e => e.ParentId)
                     .HasColumnName("parent_id")
+                    .HasDefaultValueSql("'0'")
                     .HasComment("父级部门ID");
 
                 entity.Property(e => e.SortOrder)
@@ -2042,7 +2498,6 @@ namespace MySystem.JavaModels
                     .HasCollation("utf8mb4_general_ci");
 
                 entity.Property(e => e.CreateBy)
-                    .IsRequired()
                     .HasColumnName("create_by")
                     .HasColumnType("varchar(64)")
                     .HasDefaultValueSql("' '")
@@ -2081,6 +2536,13 @@ namespace MySystem.JavaModels
                     .HasCharSet("utf8mb4")
                     .HasCollation("utf8mb4_general_ci");
 
+                entity.Property(e => e.Title)
+                    .HasColumnName("title")
+                    .HasColumnType("varchar(255)")
+                    .HasComment("文件标题")
+                    .HasCharSet("utf8mb4")
+                    .HasCollation("utf8mb4_general_ci");
+
                 entity.Property(e => e.Type)
                     .HasColumnName("type")
                     .HasColumnType("varchar(50)")
@@ -2089,7 +2551,6 @@ namespace MySystem.JavaModels
                     .HasCollation("utf8mb4_general_ci");
 
                 entity.Property(e => e.UpdateBy)
-                    .IsRequired()
                     .HasColumnName("update_by")
                     .HasColumnType("varchar(64)")
                     .HasDefaultValueSql("' '")
@@ -2603,7 +3064,8 @@ namespace MySystem.JavaModels
                     .HasColumnName("public_type")
                     .HasColumnType("char(1)")
                     .HasDefaultValueSql("'0'")
-                    .HasComment("类型，0未知，1系统，2业务")
+                    .HasComment(@"配置类型：0-默认；1-检索；2-原文；3-报表；4-安全；5-文档；6-消息；9-其他
+")
                     .HasCharSet("utf8mb4")
                     .HasCollation("utf8mb4_general_ci");
 

Util/Utils.cs

@@ -407,6 +407,7 @@ namespace MySystem
             RedisDbconn.Instance.Set("KxsActQueueChk:" + pos.PosSn, DateTime.Now.ToString());
             RedisDbconn.Instance.SetExpire("KxsActQueueChk:" + pos.PosSn, 7200);
             int actType = pos.BrandId != 14 ? 1 : 2;
+            if(pos.BrandId >= 23 && pos.BrandId <= 26) actType = 5;
             string data = "{";
             data += "\"userId\":\"" + pos.BuyUserId + "\",";
             data += "\"brandId\":\"" + pos.BrandId + "\",";