Merge branch 'feature-dgy-修改活动参数添加记录' into DuGuYang

Areas/Api/Controllers/v1/MainServer/ConsumerOrdersController.cs

@@ -340,6 +340,7 @@ namespace MySystem.Areas.Api.Controllers.v1
                     IsAct = ActFlag ? 1u : 0u,
                     MerchantActualAmount = ActFlag ? PayMoney * merchantset.GetPercent / 100 : PayMoney,
                     SeoDescription = Newtonsoft.Json.JsonConvert.SerializeObject(merchantset),
+                    SetRecordId = merchantset.Version, //活动参记录数Id
                 }).Entity;
                 maindb.SaveChanges();
                 maindb.ConsumerOrderForNo.Add(new ConsumerOrderForNo()

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

@@ -101,8 +101,8 @@ namespace MySystem.Areas.Api.Controllers.v1
             }
             Dictionary<string, object> Obj = new Dictionary<string, object>();
             MerchantAddInfo query = maindb.MerchantAddInfo.FirstOrDefault(m => m.CertMerchantName == CertMerchantName);
-            if(query == null)
-            {                
+            if (query == null)
+            {
                 query = maindb.MerchantAddInfo.Add(new MerchantAddInfo()
                 {
                     CreateDate = DateTime.Now,
@@ -150,7 +150,7 @@ namespace MySystem.Areas.Api.Controllers.v1
             query.CreateMan = AlipayAccount;
             query.UpdateMan = AlipayMccCode;
             MerchantInfo merchant = maindb.MerchantInfo.FirstOrDefault(m => m.Id == query.Id);
-            if(merchant == null)
+            if (merchant == null)
             {
                 merchant = maindb.MerchantInfo.Add(new MerchantInfo()
                 {
@@ -207,7 +207,7 @@ namespace MySystem.Areas.Api.Controllers.v1
                 Obj.Add("SubjectTypeName", Subjects[function.CheckNull(query.SubjectType)]);
             }
             else
-            { 
+            {
                 Obj.Add("SubjectTypeName", "");
             }
             Obj.Add("LicenseCopy", query.LicenseCopy); //营业执照照片
@@ -267,7 +267,7 @@ namespace MySystem.Areas.Api.Controllers.v1
                 Obj.Add("QualificationTypeName", item.ptext + "," + item.text);
             }
             else
-            { 
+            {
                 Obj.Add("QualificationTypeName", "");
             }
             Obj.Add("Qualifications", query.Qualifications); //特殊资质图片
@@ -279,7 +279,7 @@ namespace MySystem.Areas.Api.Controllers.v1
                 Obj.Add("BankAccountTypeName", AccountTypes[function.CheckNull(query.BankAccountType)]);
             }
             else
-            { 
+            {
                 Obj.Add("BankAccountTypeName", "");
             }
             Obj.Add("AccountName", query.AccountName); //开户名称
@@ -326,12 +326,12 @@ namespace MySystem.Areas.Api.Controllers.v1
             int PageNum = int.Parse(function.CheckInt(data["PageNum"].ToString()));
             List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
             if (Kind == "2")
-            { 
+            {
                 dataList = GetPersonSettles();
             }
             else if (Kind == "21")
-            { 
-                dataList = GetBusinessSettles();                
+            {
+                dataList = GetBusinessSettles();
             }
             else
             {
@@ -377,7 +377,7 @@ namespace MySystem.Areas.Api.Controllers.v1
         }
 
         public List<SettleData> GetPersonSettleItems()
-        { 
+        {
             List<SettleData> dic = new List<SettleData>();
             dic.Add(new SettleData() { ptext = "食品生鲜", text = "肉、禽、蛋及水产品等", value = "719", code = "A0002_B0202" });
             dic.Add(new SettleData() { ptext = "健身运动服务", text = "健身房", value = "719", code = "A0004_B0064" });
@@ -445,7 +445,7 @@ namespace MySystem.Areas.Api.Controllers.v1
                 bigDic.Add("value", i.ToString());
                 bigDic.Add("text", sub);
                 List<Dictionary<string, object>> children = new List<Dictionary<string, object>>();
-                foreach (SettleData ssub in dic.Where(m=>m.ptext == sub).ToList())
+                foreach (SettleData ssub in dic.Where(m => m.ptext == sub).ToList())
                 {
                     Dictionary<string, object> smallDic = new Dictionary<string, object>();
                     smallDic.Add("value", ssub.value + "_" + ssub.code);
@@ -462,25 +462,25 @@ namespace MySystem.Areas.Api.Controllers.v1
         public List<SettleData> GetBusinessSettleItems()
         {
             List<SettleData> dic = new List<SettleData>();
-            dic.Add(new SettleData() { ptext = "餐饮", text = "餐饮", value="716", code="A0001_B0001"});
-            dic.Add(new SettleData() { ptext = "食品生鲜", text = "肉、禽、蛋及水产品等", value="716", code="A0002_B0202"});
-            dic.Add(new SettleData() { ptext = "健身运动服务", text = "健身房", value="716", code="A0004_B0064"});
-            dic.Add(new SettleData() { ptext = "健身运动服务", text = "体育场馆", value="716", code="A0004_B0068"});
-            dic.Add(new SettleData() { ptext = "城市公共交通", text = "公共交通", value="716", code="A0006_B0088"});
-            dic.Add(new SettleData() { ptext = "景区/酒店", text = "旅行住宿", value="716", code="A0010_B0157"});
-            dic.Add(new SettleData() { ptext = "居民生活服务", text = "生活服务", value="716", code="A0003_B0116"});
-            dic.Add(new SettleData() { ptext = "零售", text = "百货商城", value="716", code="A0002_B0017"});
-            dic.Add(new SettleData() { ptext = "服饰鞋包", text = "服饰鞋包", value="716", code="A0002_B0026"});
-            dic.Add(new SettleData() { ptext = "零售", text = "家居家纺建材", value="716", code="A0002_B0216"});
-            dic.Add(new SettleData() { ptext = "零售", text = "母婴玩具", value="716", code="A0002_B0032"});
-            dic.Add(new SettleData() { ptext = "零售", text = "数码家电", value="716", code="A0003_B0051"});
-            dic.Add(new SettleData() { ptext = "零售", text = "图书音像", value="716", code="A0002_B0031"});
-            dic.Add(new SettleData() { ptext = "居民生活服务", text = "文化玩乐宠物", value="716", code="A0004_B0070"});
-            dic.Add(new SettleData() { ptext = "咨询/娱乐票务", text = "娱乐票务", value="716", code="A0004_B0065"});
-            dic.Add(new SettleData() { ptext = "零售", text = "办公用品", value="716", code="A0002_B0203"});
-            dic.Add(new SettleData() { ptext = "零售", text = "工业产品", value="716", code="A0002_B0042"});
-            dic.Add(new SettleData() { ptext = "婚介平台/就业信息平台/其他信息服务平台", text = "婚介服务", value="720", code="A0003_B0053"});
-            dic.Add(new SettleData() { ptext = "零售", text = "其它类别", value="716", code="A0002_B0043"});
+            dic.Add(new SettleData() { ptext = "餐饮", text = "餐饮", value = "716", code = "A0001_B0001" });
+            dic.Add(new SettleData() { ptext = "食品生鲜", text = "肉、禽、蛋及水产品等", value = "716", code = "A0002_B0202" });
+            dic.Add(new SettleData() { ptext = "健身运动服务", text = "健身房", value = "716", code = "A0004_B0064" });
+            dic.Add(new SettleData() { ptext = "健身运动服务", text = "体育场馆", value = "716", code = "A0004_B0068" });
+            dic.Add(new SettleData() { ptext = "城市公共交通", text = "公共交通", value = "716", code = "A0006_B0088" });
+            dic.Add(new SettleData() { ptext = "景区/酒店", text = "旅行住宿", value = "716", code = "A0010_B0157" });
+            dic.Add(new SettleData() { ptext = "居民生活服务", text = "生活服务", value = "716", code = "A0003_B0116" });
+            dic.Add(new SettleData() { ptext = "零售", text = "百货商城", value = "716", code = "A0002_B0017" });
+            dic.Add(new SettleData() { ptext = "服饰鞋包", text = "服饰鞋包", value = "716", code = "A0002_B0026" });
+            dic.Add(new SettleData() { ptext = "零售", text = "家居家纺建材", value = "716", code = "A0002_B0216" });
+            dic.Add(new SettleData() { ptext = "零售", text = "母婴玩具", value = "716", code = "A0002_B0032" });
+            dic.Add(new SettleData() { ptext = "零售", text = "数码家电", value = "716", code = "A0003_B0051" });
+            dic.Add(new SettleData() { ptext = "零售", text = "图书音像", value = "716", code = "A0002_B0031" });
+            dic.Add(new SettleData() { ptext = "居民生活服务", text = "文化玩乐宠物", value = "716", code = "A0004_B0070" });
+            dic.Add(new SettleData() { ptext = "咨询/娱乐票务", text = "娱乐票务", value = "716", code = "A0004_B0065" });
+            dic.Add(new SettleData() { ptext = "零售", text = "办公用品", value = "716", code = "A0002_B0203" });
+            dic.Add(new SettleData() { ptext = "零售", text = "工业产品", value = "716", code = "A0002_B0042" });
+            dic.Add(new SettleData() { ptext = "婚介平台/就业信息平台/其他信息服务平台", text = "婚介服务", value = "720", code = "A0003_B0053" });
+            dic.Add(new SettleData() { ptext = "零售", text = "其它类别", value = "716", code = "A0002_B0043" });
 
 
             // dic.Add(new SettleData() { ptext = "餐饮", text = "餐饮", code = "C_C05_5814", value = "716", special = 0});
@@ -532,7 +532,7 @@ namespace MySystem.Areas.Api.Controllers.v1
         }
         public List<Dictionary<string, object>> GetBusinessSettles()
         {
-            List<SettleData> dic = GetBusinessSettleItems();            
+            List<SettleData> dic = GetBusinessSettleItems();
 
             int i = 0;
             List<Dictionary<string, object>> list = new List<Dictionary<string, object>>();
@@ -543,7 +543,7 @@ namespace MySystem.Areas.Api.Controllers.v1
                 bigDic.Add("value", i.ToString());
                 bigDic.Add("text", sub);
                 List<Dictionary<string, object>> children = new List<Dictionary<string, object>>();
-                foreach (SettleData ssub in dic.Where(m=>m.ptext == sub).ToList())
+                foreach (SettleData ssub in dic.Where(m => m.ptext == sub).ToList())
                 {
                     Dictionary<string, object> smallDic = new Dictionary<string, object>();
                     smallDic.Add("value", ssub.value + "_" + ssub.code);

Areas/Api/Controllers/v1/MainServer/MerchantParamSetController.cs

@@ -131,6 +131,25 @@ namespace MySystem.Areas.Api.Controllers.v1
                 }).Entity;
                 maindb.SaveChanges();
             }
+            var merchantParamSetRecord = maindb.MerchantParamSetRecord.Add(new MerchantParamSetRecord()
+            {
+                // Status = status, //活动状态(1 使用中 -1 已失效 0 已关闭)
+                CreateDate = DateTime.Now,
+                MerchantId = Id,
+                BeforeDiviPersons = query.DiviPersons,
+                BeforeDiviPercent = query.DiviPercent,
+                BeforeProfitDays = query.ProfitDays,
+                BeforeGetPercent = query.GetPercent,
+                BeforeMinPayMoney = query.MinPayMoney,
+                BeforeIsAll = query.IsAll,
+                AfterDiviPersons = DiviPersons,
+                AfterDiviPercent = DiviPercent,
+                AfterProfitDays = ProfitDays,
+                AfterGetPercent = GetPercent,
+                AfterMinPayMoney = MinPayMoney,
+                AfterIsAll = IsAll,
+            }).Entity;
+            maindb.SaveChanges();
             query.UpdateDate = DateTime.Now; //修改时间
             query.IsAll = IsAll; //是否收全额
             query.MinPayMoney = MinPayMoney; //订单参与门槛
@@ -138,6 +157,7 @@ namespace MySystem.Areas.Api.Controllers.v1
             query.ProfitDays = ProfitDays; //分红期限（天）
             query.DiviPercent = DiviPercent; //最大分红比例
             query.DiviPersons = DiviPersons; //单笔订单分红人数
+            query.Version = merchantParamSetRecord.Id;
             maindb.SaveChanges();
             Obj.Add("UpdateDate", query.UpdateDate.Value.ToString("yyyy-MM-dd HH:mm:ss")); //更新时间
             return new AppResultJson() { Status = "1", Info = "", Data = Obj };
@@ -145,7 +165,6 @@ namespace MySystem.Areas.Api.Controllers.v1
         #endregion
 
 
-
         #region 检查签名是否合法，合法返回1，不合法返回提示信息
 
         /// <summary>

Areas/Api/Controllers/v1/MainServer/UserSwapWhiteController.cs

@@ -0,0 +1,55 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+using Microsoft.AspNetCore.Authorization;
+using System.Web;
+using MySystem.MainModels;
+using MySystem.Service;
+using LitJson;
+using Library;
+
+namespace MySystem.Areas.Api.Controllers.v1
+{
+    [Area("Api")]
+    [Route("/v1/QrCodePlateMain/[controller]/[action]")]
+    public class UserSwapWhiteController : BaseController
+    {
+        public UserSwapWhiteController(IHttpContextAccessor accessor, ILogger<BaseController> logger, IOptions<Setting> setting) : base(accessor, logger, setting)
+        {
+        }
+
+
+        #region 风险管理-风险创客列表
+        [Authorize]
+        public JsonResult QueryUserRiskFlag(string value)
+        {
+            value = DesDecrypt(value);
+            JsonData data = JsonMapper.ToObject(value);
+            Dictionary<string, object> Obj = QueryUserRiskFlagDo(value);
+            return Json(new AppResultJson() { Status = "1", Info = "", Data = Obj });
+        }
+        private Dictionary<string, object> QueryUserRiskFlagDo(string value)
+        {
+            JsonData data = JsonMapper.ToObject(value);
+            int UserId = int.Parse(function.CheckInt(data["UserId"].ToString())); //风控创客Id
+            var RiskFlag = 0;
+            var Remark = "";
+            var info = UserSwapWhiteService.QueryByUserId(UserId);
+            if (info.Id > 0)
+            {
+                RiskFlag = 1;
+                Remark = info.Remark;
+            }
+            Dictionary<string, object> Obj = new Dictionary<string, object>();
+            Obj.Add("RiskFlag", RiskFlag);
+            Obj.Add("Remark", Remark);
+            return Obj;
+        }
+        #endregion
+
+    }
+}

MainModels/ConsumerOrders.cs

@@ -29,5 +29,10 @@ namespace MySystem.MainModels
         public ulong IsAct { get; set; }
         public int UserId { get; set; }
         public decimal MerchantActualAmount { get; set; }
+        public string DivideLog { get; set; }
+        public int DivideFlag { get; set; }
+        public DateTime? DivideDate { get; set; }
+        public string TradePayNo { get; set; }
+        public int SetRecordId { get; set; }
     }
 }

MainModels/CustomQuery.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MainModels
+{
+    public partial class CustomQuery
+    {
+        public int Id { get; set; }
+        public int Sort { get; set; }
+        public int QueryCount { get; set; }
+        public int Status { get; set; }
+        public int Version { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public string CreateMan { get; set; }
+        public string UpdateMan { get; set; }
+        public string SeoTitle { get; set; }
+        public string SeoKeyword { get; set; }
+        public string SeoDescription { get; set; }
+        public string AdminNames { get; set; }
+        public string Title { get; set; }
+        public string SqlContent { get; set; }
+    }
+}

MainModels/ExportExcels.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MainModels
+{
+    public partial class ExportExcels
+    {
+        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 string FileName { get; set; }
+        public int SysId { get; set; }
+        public string FileUrl { get; set; }
+    }
+}

MainModels/MerchantAddInfo.cs

@@ -144,5 +144,6 @@ namespace MySystem.MainModels
         public string OutMchtNo { get; set; }
         public string AliMerchantId { get; set; }
         public string WeChatMerchantId { get; set; }
+        public string MerchantType { get; set; }
     }
 }

MainModels/MerchantParamSetRecord.cs

@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MainModels
+{
+    public partial class MerchantParamSetRecord
+    {
+        public int Id { get; set; }
+        public int Sort { get; set; }
+        public int QueryCount { get; set; }
+        public int Status { get; set; }
+        public int Version { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public string CreateMan { get; set; }
+        public string UpdateMan { get; set; }
+        public string SeoTitle { get; set; }
+        public string SeoKeyword { get; set; }
+        public string SeoDescription { get; set; }
+        public int AfterDiviPersons { get; set; }
+        public decimal AfterDiviPercent { get; set; }
+        public int AfterProfitDays { get; set; }
+        public decimal AfterGetPercent { get; set; }
+        public decimal AfterMinPayMoney { get; set; }
+        public int AfterIsAll { get; set; }
+        public int MerchantId { get; set; }
+        public int BeforeDiviPersons { get; set; }
+        public decimal BeforeDiviPercent { get; set; }
+        public int BeforeProfitDays { get; set; }
+        public decimal BeforeGetPercent { get; set; }
+        public decimal BeforeMinPayMoney { get; set; }
+        public int BeforeIsAll { get; set; }
+    }
+}

MainModels/WebCMSEntities.cs

@@ -48,8 +48,10 @@ namespace MySystem.MainModels
         public virtual DbSet<CouponAssignRecords> CouponAssignRecords { get; set; }
         public virtual DbSet<Coupons> Coupons { get; set; }
         public virtual DbSet<CouponsForUser> CouponsForUser { get; set; }
+        public virtual DbSet<CustomQuery> CustomQuery { get; set; }
         public virtual DbSet<CustomTagSet> CustomTagSet { get; set; }
         public virtual DbSet<ErpCompanys> ErpCompanys { get; set; }
+        public virtual DbSet<ExportExcels> ExportExcels { get; set; }
         public virtual DbSet<FileUpdateInfo> FileUpdateInfo { get; set; }
         public virtual DbSet<FluxProfitDetail> FluxProfitDetail { get; set; }
         public virtual DbSet<FluxProfitSummary> FluxProfitSummary { get; set; }
@@ -103,6 +105,7 @@ namespace MySystem.MainModels
         public virtual DbSet<MerchantInfo> MerchantInfo { get; set; }
         public virtual DbSet<MerchantLoginInfo> MerchantLoginInfo { get; set; }
         public virtual DbSet<MerchantParamSet> MerchantParamSet { get; set; }
+        public virtual DbSet<MerchantParamSetRecord> MerchantParamSetRecord { get; set; }
         public virtual DbSet<MerchantQrCode> MerchantQrCode { get; set; }
         public virtual DbSet<MerchantRebateDetail> MerchantRebateDetail { get; set; }
         public virtual DbSet<MerchantTradeSummary> MerchantTradeSummary { get; set; }
@@ -2257,6 +2260,20 @@ namespace MySystem.MainModels
 
                 entity.Property(e => e.CurDivi).HasColumnType("decimal(18,2)");
 
+                entity.Property(e => e.DivideDate)
+                    .HasColumnType("datetime")
+                    .HasComment("提交分账时间");
+
+                entity.Property(e => e.DivideFlag)
+                    .HasColumnType("int(11)")
+                    .HasComment("分账标记");
+
+                entity.Property(e => e.DivideLog)
+                    .HasColumnType("mediumtext")
+                    .HasComment("分账结果日志")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
                 entity.Property(e => e.IsAct)
                     .HasColumnType("bit(1)")
                     .HasDefaultValueSql("b'0'");
@@ -2297,6 +2314,10 @@ namespace MySystem.MainModels
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.SetRecordId)
+                    .HasColumnType("int(11)")
+                    .HasComment("活动记录Id");
+
                 entity.Property(e => e.SnNo)
                     .HasColumnType("varchar(50)")
                     .HasCharSet("utf8")
@@ -2306,6 +2327,12 @@ namespace MySystem.MainModels
 
                 entity.Property(e => e.Status).HasColumnType("int(11)");
 
+                entity.Property(e => e.TradePayNo)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("支付交易号")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
                 entity.Property(e => e.UpdateDate).HasColumnType("datetime");
 
                 entity.Property(e => e.UpdateMan)
@@ -2727,6 +2754,82 @@ namespace MySystem.MainModels
                 entity.Property(e => e.Version).HasColumnType("int(11)");
             });
 
+            modelBuilder.Entity<CustomQuery>(entity =>
+            {
+                entity.HasComment("自定义查询");
+
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.AdminNames)
+                    .HasColumnType("varchar(500)")
+                    .HasComment("后台账号")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.CreateDate)
+                    .HasColumnType("datetime")
+                    .HasComment("创建时间");
+
+                entity.Property(e => e.CreateMan)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("创建人")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.QueryCount)
+                    .HasColumnType("int(11)")
+                    .HasComment("点击量");
+
+                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)")
+                    .HasComment("排序序号");
+
+                entity.Property(e => e.SqlContent)
+                    .HasColumnType("mediumtext")
+                    .HasComment("sql语句")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Status)
+                    .HasColumnType("int(11)")
+                    .HasComment("状态");
+
+                entity.Property(e => e.Title)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("标题")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.UpdateDate)
+                    .HasColumnType("datetime")
+                    .HasComment("更新时间");
+
+                entity.Property(e => e.UpdateMan)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("更新人")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Version)
+                    .HasColumnType("int(11)")
+                    .HasComment("版本号");
+            });
+
             modelBuilder.Entity<CustomTagSet>(entity =>
             {
                 entity.Property(e => e.Id).HasColumnType("int(11)");
@@ -2841,6 +2944,48 @@ namespace MySystem.MainModels
                 entity.Property(e => e.Version).HasColumnType("int(11)");
             });
 
+            modelBuilder.Entity<ExportExcels>(entity =>
+            {
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.CreateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.FileName)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.FileUrl)
+                    .HasColumnType("varchar(500)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                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.SysId).HasColumnType("int(11)");
+
+                entity.Property(e => e.UpdateDate).HasColumnType("datetime");
+            });
+
             modelBuilder.Entity<FileUpdateInfo>(entity =>
             {
                 entity.Property(e => e.Id).HasColumnType("int(11)");
@@ -5504,6 +5649,12 @@ namespace MySystem.MainModels
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.MerchantType)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("商户类型")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
                 entity.Property(e => e.MiniProgramAppid)
                     .HasColumnType("varchar(50)")
                     .HasCharSet("utf8")
@@ -6942,6 +7093,116 @@ namespace MySystem.MainModels
                 entity.Property(e => e.Version).HasColumnType("int(11)");
             });
 
+            modelBuilder.Entity<MerchantParamSetRecord>(entity =>
+            {
+                entity.HasComment("商户活动配置历史记录");
+
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.AfterDiviPercent)
+                    .HasColumnType("decimal(18,2)")
+                    .HasComment("修改后最大分红比例");
+
+                entity.Property(e => e.AfterDiviPersons)
+                    .HasColumnType("int(11)")
+                    .HasComment("修改后单笔订单分红人数");
+
+                entity.Property(e => e.AfterGetPercent)
+                    .HasColumnType("decimal(18,2)")
+                    .HasComment("修改后商家实收比例");
+
+                entity.Property(e => e.AfterIsAll)
+                    .HasColumnType("int(11)")
+                    .HasComment("修改后是否收全额");
+
+                entity.Property(e => e.AfterMinPayMoney)
+                    .HasColumnType("decimal(18,2)")
+                    .HasComment("修改后订单参与门槛");
+
+                entity.Property(e => e.AfterProfitDays)
+                    .HasColumnType("int(11)")
+                    .HasComment("修改后分红期限（天）");
+
+                entity.Property(e => e.BeforeDiviPercent)
+                    .HasColumnType("decimal(18,2)")
+                    .HasComment("修改前最大分红比例");
+
+                entity.Property(e => e.BeforeDiviPersons)
+                    .HasColumnType("int(11)")
+                    .HasComment("修改前单笔订单分红人数");
+
+                entity.Property(e => e.BeforeGetPercent)
+                    .HasColumnType("decimal(18,2)")
+                    .HasComment("修改前商家实收比例");
+
+                entity.Property(e => e.BeforeIsAll)
+                    .HasColumnType("int(11)")
+                    .HasComment("修改前是否收全额");
+
+                entity.Property(e => e.BeforeMinPayMoney)
+                    .HasColumnType("decimal(18,2)")
+                    .HasComment("修改前订单参与门槛");
+
+                entity.Property(e => e.BeforeProfitDays)
+                    .HasColumnType("int(11)")
+                    .HasComment("修改前分红期限（天）");
+
+                entity.Property(e => e.CreateDate)
+                    .HasColumnType("datetime")
+                    .HasComment("创建时间");
+
+                entity.Property(e => e.CreateMan)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("创建人")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.MerchantId)
+                    .HasColumnType("int(11)")
+                    .HasComment("商户Id");
+
+                entity.Property(e => e.QueryCount)
+                    .HasColumnType("int(11)")
+                    .HasComment("点击量");
+
+                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)")
+                    .HasComment("排序序号");
+
+                entity.Property(e => e.Status)
+                    .HasColumnType("int(11)")
+                    .HasComment("状态");
+
+                entity.Property(e => e.UpdateDate)
+                    .HasColumnType("datetime")
+                    .HasComment("更新时间");
+
+                entity.Property(e => e.UpdateMan)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("更新人")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Version)
+                    .HasColumnType("int(11)")
+                    .HasComment("版本号");
+            });
+
             modelBuilder.Entity<MerchantQrCode>(entity =>
             {
                 entity.Property(e => e.Id).HasColumnType("int(11)");
@@ -16244,6 +16505,9 @@ namespace MySystem.MainModels
 
             modelBuilder.Entity<UserAmountSummary>(entity =>
             {
+                entity.HasIndex(e => new { e.UserId, e.IsAct, e.TradeMonth, e.TradeDate, e.SeoTitle })
+                    .HasName("UserAmountSummaryIndex");
+
                 entity.Property(e => e.Id).HasColumnType("int(11)");
 
                 entity.Property(e => e.CreateDate).HasColumnType("datetime");

MainModels2/ConsumerOrders.cs

@@ -29,5 +29,10 @@ namespace MySystem.MainModels2
         public ulong IsAct { get; set; }
         public int UserId { get; set; }
         public decimal MerchantActualAmount { get; set; }
+        public int DivideFlag { get; set; }
+        public DateTime? DivideDate { get; set; }
+        public string DivideLog { get; set; }
+        public string TradePayNo { get; set; }
+        public int SetRecordId { get; set; }
     }
 }

MainModels2/MerchantAddInfo.cs

@@ -145,5 +145,8 @@ namespace MySystem.MainModels2
         public string AliMerchantId { get; set; }
         public string WeChatMerchantId { get; set; }
         public int HdStatus { get; set; }
+        public DateTime? HdPassDate { get; set; }
+        public ulong HdBindWeChat { get; set; }
+        public string MerchantType { get; set; }
     }
 }

MainModels2/MerchantParamSetRecord.cs

@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MainModels2
+{
+    public partial class MerchantParamSetRecord
+    {
+        public int Id { get; set; }
+        public int Sort { get; set; }
+        public int QueryCount { get; set; }
+        public int Status { get; set; }
+        public int Version { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public string CreateMan { get; set; }
+        public string UpdateMan { get; set; }
+        public string SeoTitle { get; set; }
+        public string SeoKeyword { get; set; }
+        public string SeoDescription { get; set; }
+        public int AfterDiviPersons { get; set; }
+        public decimal AfterDiviPercent { get; set; }
+        public int AfterProfitDays { get; set; }
+        public decimal AfterGetPercent { get; set; }
+        public decimal AfterMinPayMoney { get; set; }
+        public int AfterIsAll { get; set; }
+        public int MerchantId { get; set; }
+        public int BeforeDiviPersons { get; set; }
+        public decimal BeforeDiviPercent { get; set; }
+        public int BeforeProfitDays { get; set; }
+        public decimal BeforeGetPercent { get; set; }
+        public decimal BeforeMinPayMoney { get; set; }
+        public int BeforeIsAll { get; set; }
+    }
+}

MainModels2/WebCMSEntities.cs

@@ -103,6 +103,7 @@ namespace MySystem.MainModels2
         public virtual DbSet<MerchantInfo> MerchantInfo { get; set; }
         public virtual DbSet<MerchantLoginInfo> MerchantLoginInfo { get; set; }
         public virtual DbSet<MerchantParamSet> MerchantParamSet { get; set; }
+        public virtual DbSet<MerchantParamSetRecord> MerchantParamSetRecord { get; set; }
         public virtual DbSet<MerchantQrCode> MerchantQrCode { get; set; }
         public virtual DbSet<MerchantRebateDetail> MerchantRebateDetail { get; set; }
         public virtual DbSet<MerchantTradeSummary> MerchantTradeSummary { get; set; }
@@ -2257,6 +2258,20 @@ namespace MySystem.MainModels2
 
                 entity.Property(e => e.CurDivi).HasColumnType("decimal(18,2)");
 
+                entity.Property(e => e.DivideDate)
+                    .HasColumnType("datetime")
+                    .HasComment("提交分账时间");
+
+                entity.Property(e => e.DivideFlag)
+                    .HasColumnType("int(11)")
+                    .HasComment("分账标记");
+
+                entity.Property(e => e.DivideLog)
+                    .HasColumnType("mediumtext")
+                    .HasComment("分账结果日志")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
                 entity.Property(e => e.IsAct)
                     .HasColumnType("bit(1)")
                     .HasDefaultValueSql("b'0'");
@@ -2297,6 +2312,10 @@ namespace MySystem.MainModels2
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.SetRecordId)
+                    .HasColumnType("int(11)")
+                    .HasComment("活动记录Id");
+
                 entity.Property(e => e.SnNo)
                     .HasColumnType("varchar(50)")
                     .HasCharSet("utf8")
@@ -2306,6 +2325,12 @@ namespace MySystem.MainModels2
 
                 entity.Property(e => e.Status).HasColumnType("int(11)");
 
+                entity.Property(e => e.TradePayNo)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("支付交易号")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
                 entity.Property(e => e.UpdateDate).HasColumnType("datetime");
 
                 entity.Property(e => e.UpdateMan)
@@ -5423,6 +5448,15 @@ namespace MySystem.MainModels2
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.HdBindWeChat)
+                    .HasColumnType("bit(1)")
+                    .HasDefaultValueSql("b'0'")
+                    .HasComment("好哒绑定微信状态");
+
+                entity.Property(e => e.HdPassDate)
+                    .HasColumnType("datetime")
+                    .HasComment("好哒审核通过时间");
+
                 entity.Property(e => e.HdStatus)
                     .HasColumnType("int(11)")
                     .HasComment("好哒进件状态");
@@ -5508,6 +5542,12 @@ namespace MySystem.MainModels2
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.MerchantType)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("商户类型")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
                 entity.Property(e => e.MiniProgramAppid)
                     .HasColumnType("varchar(50)")
                     .HasCharSet("utf8")
@@ -6946,6 +6986,116 @@ namespace MySystem.MainModels2
                 entity.Property(e => e.Version).HasColumnType("int(11)");
             });
 
+            modelBuilder.Entity<MerchantParamSetRecord>(entity =>
+            {
+                entity.HasComment("商户活动配置历史记录");
+
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.AfterDiviPercent)
+                    .HasColumnType("decimal(18,2)")
+                    .HasComment("修改后最大分红比例");
+
+                entity.Property(e => e.AfterDiviPersons)
+                    .HasColumnType("int(11)")
+                    .HasComment("修改后单笔订单分红人数");
+
+                entity.Property(e => e.AfterGetPercent)
+                    .HasColumnType("decimal(18,2)")
+                    .HasComment("修改后商家实收比例");
+
+                entity.Property(e => e.AfterIsAll)
+                    .HasColumnType("int(11)")
+                    .HasComment("修改后是否收全额");
+
+                entity.Property(e => e.AfterMinPayMoney)
+                    .HasColumnType("decimal(18,2)")
+                    .HasComment("修改后订单参与门槛");
+
+                entity.Property(e => e.AfterProfitDays)
+                    .HasColumnType("int(11)")
+                    .HasComment("修改后分红期限（天）");
+
+                entity.Property(e => e.BeforeDiviPercent)
+                    .HasColumnType("decimal(18,2)")
+                    .HasComment("修改前最大分红比例");
+
+                entity.Property(e => e.BeforeDiviPersons)
+                    .HasColumnType("int(11)")
+                    .HasComment("修改前单笔订单分红人数");
+
+                entity.Property(e => e.BeforeGetPercent)
+                    .HasColumnType("decimal(18,2)")
+                    .HasComment("修改前商家实收比例");
+
+                entity.Property(e => e.BeforeIsAll)
+                    .HasColumnType("int(11)")
+                    .HasComment("修改前是否收全额");
+
+                entity.Property(e => e.BeforeMinPayMoney)
+                    .HasColumnType("decimal(18,2)")
+                    .HasComment("修改前订单参与门槛");
+
+                entity.Property(e => e.BeforeProfitDays)
+                    .HasColumnType("int(11)")
+                    .HasComment("修改前分红期限（天）");
+
+                entity.Property(e => e.CreateDate)
+                    .HasColumnType("datetime")
+                    .HasComment("创建时间");
+
+                entity.Property(e => e.CreateMan)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("创建人")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.MerchantId)
+                    .HasColumnType("int(11)")
+                    .HasComment("商户Id");
+
+                entity.Property(e => e.QueryCount)
+                    .HasColumnType("int(11)")
+                    .HasComment("点击量");
+
+                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)")
+                    .HasComment("排序序号");
+
+                entity.Property(e => e.Status)
+                    .HasColumnType("int(11)")
+                    .HasComment("状态");
+
+                entity.Property(e => e.UpdateDate)
+                    .HasColumnType("datetime")
+                    .HasComment("更新时间");
+
+                entity.Property(e => e.UpdateMan)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("更新人")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Version)
+                    .HasColumnType("int(11)")
+                    .HasComment("版本号");
+            });
+
             modelBuilder.Entity<MerchantQrCode>(entity =>
             {
                 entity.Property(e => e.Id).HasColumnType("int(11)");

Services/UserSwapWhiteService.cs

@@ -0,0 +1,117 @@
+/*
+ * 循环返风控白名单
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Data;
+using MySystem.MainModels;
+using Library;
+using LitJson;
+
+namespace MySystem.Service
+{
+    public class UserSwapWhiteService
+    {
+        static string _conn = ConfigurationManager.AppSettings["SqlConnStr"].ToString();
+
+        /// <summary>
+        /// 查询列表
+        /// </summary>
+        /// <param name="fields">查询条件(单个字段)</param>
+        /// <param name="condition">查询条件(sql语句)</param>
+        /// <param name="page">页码</param>
+        /// <param name="limit">每页条数</param>
+        /// <returns></returns>
+        public static List<Dictionary<string, object>> List(List<FieldItem> fields, string condition, int page = 1, int limit = 30, string orderby = "Id desc")
+        {
+            Dictionary<string, object> obj = new DbService(AppConfig.Base.mainTables, _conn).IndexData("UserSwapWhite", fields, orderby, "0", page, limit, condition);
+            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
+            return diclist;
+        }
+
+        /// <summary>
+        /// 查询一条记录
+        /// </summary>
+        /// <param name="Id">主键Id</param>
+        /// <returns></returns>
+        public static UserSwapWhite Query(int Id)
+        {
+            WebCMSEntities db = new WebCMSEntities();
+            UserSwapWhite editData = db.UserSwapWhite.FirstOrDefault(m => m.Id == Id) ?? new UserSwapWhite();
+            db.Dispose();
+            return editData;
+        }
+
+        public static UserSwapWhite QueryByUserId(int UserId)
+        {
+            WebCMSEntities db = new WebCMSEntities();
+            UserSwapWhite editData = db.UserSwapWhite.FirstOrDefault(m => m.UserId == UserId) ?? new UserSwapWhite();
+            db.Dispose();
+            return editData;
+        }
+
+        /// <summary>
+        /// 添加数据
+        /// </summary>
+        /// <param name="Fields">要设置的字段</param>
+        /// <returns></returns>
+        public static int Add(Dictionary<string, object> Fields)
+        {
+            return new DbService(AppConfig.Base.mainTables, _conn).Add("UserSwapWhite", Fields, 0);
+        }
+
+        /// <summary>
+        /// 修改数据
+        /// </summary>
+        /// <param name="Fields">要设置的字段</param>
+        /// <param name="Id">主键Id</param>
+        public static void Edit(Dictionary<string, object> Fields, int Id)
+        {
+            new DbService(AppConfig.Base.mainTables, _conn).Edit("UserSwapWhite", Fields, Id);
+        }
+
+        /// <summary>
+        /// 删除数据
+        /// </summary>
+        /// <param name="Id">主键Id</param>
+        public static void Delete(int Id)
+        {
+            new DbService(AppConfig.Base.mainTables, _conn).Delete("UserSwapWhite", Id);
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="Id">主键Id</param>
+        /// <param name="Sort">排序序号</param>
+        public static void Sort(int Id, int Sort)
+        {
+            new DbService(AppConfig.Base.mainTables, _conn).Sort("UserSwapWhite", Sort, Id);
+        }
+
+        /// <summary>
+        /// 导入数据
+        /// </summary>
+        /// <param name="ExcelData">json数据</param>
+        public static void Import(string ExcelData)
+        {
+            WebCMSEntities db = new WebCMSEntities();
+            JsonData list = JsonMapper.ToObject(ExcelData);
+            for (int i = 1; i < list.Count;i++ )
+            {
+                JsonData dr = list[i];
+                
+                db.UserSwapWhite.Add(new UserSwapWhite()
+                {
+                    CreateDate = DateTime.Now,
+                    UpdateDate = DateTime.Now,
+                    
+                });
+                db.SaveChanges();
+            }
+            db.Dispose();
+        }
+    }
+}

Startup.cs

@@ -57,7 +57,8 @@ namespace MySystem
             {
                 x.MultipartBodyLengthLimit = 50 * 1024 * 1024;//不到300M
             });
-            services.AddControllers(option => {
+            services.AddControllers(option =>
+            {
                 option.Filters.Add(new GlobalActionFilter());
             });
             //生成密钥
@@ -83,8 +84,8 @@ namespace MySystem
                     {
                         // if(n.Issuer.StartsWith("new_"))
                         // {
-                            string check = RedisDbconn.Instance.Get<string>("utoken:" + n.Issuer);
-                            return m != null && m.FirstOrDefault().Equals(check);
+                        string check = RedisDbconn.Instance.Get<string>("utoken:" + n.Issuer);
+                        return m != null && m.FirstOrDefault().Equals(check);
                         // }
                         // else
                         // {
@@ -117,7 +118,7 @@ namespace MySystem
                 Library.ConfigurationManager.EnvironmentFlag = 2;
             }
             Library.function.WritePage("/", "WebRootPath.txt", env.WebRootPath);
-            
+
             app.UseStaticFiles();
             // app.UseStaticFiles(new StaticFileOptions
             // {
@@ -150,7 +151,7 @@ namespace MySystem
                     pattern: "{controller=Home}/{action=Index}/{Id?}");
             });
 
-            
+
             InitMain();
             InitStat();
             InitBs();