调整

Areas/Api/Controllers/Main/MerchantAddInfoController.cs

@@ -179,6 +179,11 @@ namespace MySystem.Areas.Api.Controllers.v1
             int Finish = int.Parse(function.CheckInt(data.getItem("Finish").ToString()));
             int UserId = int.Parse(function.CheckInt(data.getItem("UserId").ToString()));
             int MerchantAddInfoId = int.Parse(function.CheckInt(data.getItem("Id").ToString()));
+            var checks = main1db.UserSwapWhite.FirstOrDefault(m => m.UserId == UserId) ?? new Models.Main1.UserSwapWhite();
+            if (checks.Id > 0)
+            {
+                return new AppResultJson() { Status = "-1", Info = "参数错误" };
+            }
             string BankBranchId = "";
             if (Finish == 1)
             {

Areas/Api/Controllers/Main/MerchantParamSetController.cs

@@ -132,26 +132,6 @@ namespace MySystem.Areas.Api.Controllers.v1
                 }).Entity;
                 maindb.SaveChanges();
             }
-            query.UpdateDate = DateTime.Now; //修改时间
-            query.IsAll = IsAll; //是否收全额
-            query.MinPayMoney = MinPayMoney; //订单参与门槛
-            query.GetPercent = GetPercent; //商家实收比例
-            query.ProfitDays = ProfitDays; //分红期限（天）
-            query.DiviPercent = DiviPercent; //最大分红比例
-            query.DiviPersons = DiviPersons; //单笔订单分红人数
-            // var status = 0;
-            // if (query.IsAll == IsAll && IsAll == 0 && (query.MinPayMoney != MinPayMoney || query.GetPercent != GetPercent || query.ProfitDays != ProfitDays || query.DiviPersons != DiviPersons || query.DiviPercent != DiviPercent))
-            // {
-            //     status = 1;
-            // }
-            // if (query.IsAll != IsAll && IsAll == 1 && query.MinPayMoney == MinPayMoney && query.GetPercent == GetPercent && query.ProfitDays == ProfitDays && query.DiviPersons == DiviPersons && query.DiviPercent == DiviPercent)
-            // {
-            //     status = 0;
-            // }
-            // if (query.IsAll != IsAll && IsAll == 0 && query.MinPayMoney == MinPayMoney && query.GetPercent == GetPercent && query.ProfitDays == ProfitDays && query.DiviPersons == DiviPersons && query.DiviPercent == DiviPercent)
-            // {
-            //     status = 0;
-            // }
             var merchantParamSetRecord = maindb.MerchantParamSetRecord.Add(new MerchantParamSetRecord()
             {
                 // Status = status, //活动状态(1 使用中 -1 已失效 0 已关闭)
@@ -170,6 +150,13 @@ namespace MySystem.Areas.Api.Controllers.v1
                 AfterMinPayMoney = MinPayMoney,
                 AfterIsAll = IsAll,
             }).Entity;
+            query.UpdateDate = DateTime.Now; //修改时间
+            query.IsAll = IsAll; //是否收全额
+            query.MinPayMoney = MinPayMoney; //订单参与门槛
+            query.GetPercent = GetPercent; //商家实收比例
+            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")); //更新时间

Service/Main1/UserSwapWhiteService.cs

@@ -0,0 +1,239 @@
+/*
+ * 循环返风控白名单
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Data;
+using MySystem.Models.Main1;
+using Library;
+using LitJson;
+
+namespace MySystem.Service.Main1
+{
+    public class UserSwapWhiteService
+    {
+        static string _conn = ConfigurationManager.AppSettings["ZsSqlConnStr"].ToString();
+
+        /// <summary>
+        /// 查询列表(适合多表关联查询)
+        /// </summary>
+        /// <param name="relationData">关联表</param>
+        /// <param name="condition">查询条件(sql语句)</param>
+        /// <param name="count">总数（输出）</param>
+        /// <param name="page">页码</param>
+        /// <param name="limit">每页条数</param>
+        /// <returns></returns>
+        public static List<Dictionary<string, object>> List(List<RelationData> relationData, string condition, out int count, int page = 1, int limit = 30, string orderBy = "sort desc,id desc")
+        {
+            List<string> fields = new List<string>(); //要显示的列，不设置则返回全部字段
+            Dictionary<string, object> obj = new DbService(AppConfig.Base.main1Tables, _conn).IndexData("UserSwapWhite", relationData, orderBy, page, limit, condition, fields);
+            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
+            count = int.Parse(obj["count"].ToString());
+            return diclist;
+        }
+        public static List<Dictionary<string, object>> List(List<RelationData> relationData, string condition, int page = 1, int limit = 30, string orderBy = "sort desc,id desc")
+        {
+            List<string> fields = new List<string>(); //要显示的列，不设置则返回全部字段
+            Dictionary<string, object> obj = new DbService(AppConfig.Base.main1Tables, _conn).IndexData("UserSwapWhite", relationData, orderBy, page, limit, condition, fields);
+            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
+            return diclist;
+        }
+
+        /// <summary>
+        /// 查询列表(单表)
+        /// </summary>
+        /// <param name="fieldList">返回的字段</param>
+        /// <param name="condition">查询条件</param>
+        /// <param name="page">页码</param>
+        /// <param name="limit">每页条数</param>
+        /// <param name="orderBy">排序</param>
+        /// <returns></returns>
+        public static List<Dictionary<string, object>> List(string fieldList, string condition, int page = 1, int limit = 30, string orderBy = "sort desc,id desc")
+        {
+            List<string> fields = fieldList.Split(',').ToList(); //要显示的列
+            Dictionary<string, object> obj = new DbService(AppConfig.Base.main1Tables, _conn).IndexData("UserSwapWhite", new List<RelationData>(), orderBy, page, limit, condition, fields);
+            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)
+        {
+            Dictionary<string, object> obj = new DbService(AppConfig.Base.main1Tables, _conn).Query("*", "UserSwapWhite", Id);
+            if(obj.Keys.Count > 0)
+            {
+                return Newtonsoft.Json.JsonConvert.DeserializeObject<UserSwapWhite>(Newtonsoft.Json.JsonConvert.SerializeObject(obj));
+            }
+            return new UserSwapWhite();
+        }
+
+        /// <summary>
+        /// 查询一条记录
+        /// </summary>
+        /// <param name="condition">查询条件(sql语句)</param>
+        /// <returns></returns>
+        public static UserSwapWhite Query(string condition)
+        {
+            Dictionary<string, object> obj = new DbService(AppConfig.Base.main1Tables, _conn).Query("*", "UserSwapWhite", condition);
+            if(obj.Keys.Count > 0)
+            {
+                return Newtonsoft.Json.JsonConvert.DeserializeObject<UserSwapWhite>(Newtonsoft.Json.JsonConvert.SerializeObject(obj));
+            }
+            return new UserSwapWhite();
+        }
+
+        /// <summary>
+        /// 查询一条记录
+        /// </summary>
+        /// <param name="condition">查询条件(sql语句)</param>
+        /// <param name="fields">返回的字段</param>
+        /// <returns></returns>
+        public static Dictionary<string, object> Query(string condition, string fields)
+        {
+            Dictionary<string, object> obj = new DbService(AppConfig.Base.main1Tables, _conn).Query(fields, "UserSwapWhite", condition);
+            return obj;
+        }
+        
+        public static decimal Sum(string condition, string field)
+        {
+            decimal amount = 0;
+            Dictionary<string, object> obj = new DbService(AppConfig.Base.main1Tables, _conn).Query("Sum(" + field + ") " + field + "", "UserSwapWhite", condition);
+            if(obj.Keys.Count > 0)
+            {
+                amount = decimal.Parse(obj[field].ToString());
+            }
+            return amount;
+        }
+
+        /// <summary>
+        /// 查询记录数
+        /// </summary>
+        /// <param name="Id">主键Id</param>
+        /// <returns></returns>
+        public static int Count(string condition = "", string field = "Id")
+        {
+            int result = 0;
+            Dictionary<string, object> obj = new DbService(AppConfig.Base.main1Tables, _conn).Query("count(" + field + ") " + field + "", "UserSwapWhite", condition);
+            if(obj.Keys.Count > 0)
+            {
+                result = int.Parse(function.CheckInt(obj[field].ToString()));
+            }
+            return result;
+        }
+
+        /// <summary>
+        /// 查询是否存在
+        /// </summary>
+        /// <param name="Id">主键Id</param>
+        /// <returns></returns>
+        public static bool Exist(string condition)
+        {
+            Dictionary<string, object> obj = new DbService(AppConfig.Base.main1Tables, _conn).Query("1", "UserSwapWhite", condition);
+            if(obj.Keys.Count > 0)
+            {
+                return true;
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// 添加数据
+        /// </summary>
+        /// <param name="Fields">要设置的字段</param>
+        /// <returns></returns>
+        public static AppResultJson Add(Dictionary<string, object> fields, bool check = true)
+        {
+            if(check)
+            {
+                
+            }
+            int Id = new DbService(AppConfig.Base.main1Tables, _conn).Add("UserSwapWhite", fields, 0);
+            return new AppResultJson(){ Status = "1", Data = Id };
+        }
+
+        /// <summary>
+        /// 修改数据
+        /// </summary>
+        /// <param name="Fields">要设置的字段</param>
+        /// <param name="Id">主键Id</param>
+        public static AppResultJson Edit(Dictionary<string, object> fields, int Id, bool check = true)
+        {
+            if(check)
+            {
+                
+            }
+            new DbService(AppConfig.Base.main1Tables, _conn).Edit("UserSwapWhite", fields, Id);
+            return new AppResultJson(){ Status = "1", Data = Id };
+        }
+
+        /// <summary>
+        /// 逻辑删除
+        /// </summary>
+        /// <param name="Id">主键Id</param>
+        public static void Remove(int Id)
+        {
+            Dictionary<string, object> fields = new Dictionary<string, object>();
+            fields.Add("Status", -1);
+            new DbService(AppConfig.Base.main1Tables, _conn).Edit("UserSwapWhite", fields, Id);
+        }
+
+        /// <summary>
+        /// 删除数据
+        /// </summary>
+        /// <param name="Id">主键Id</param>
+        public static void Delete(int Id)
+        {
+            new DbService(AppConfig.Base.main1Tables, _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.main1Tables, _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();
+        }
+
+        /// <summary>
+        /// 导出excel表格
+        /// </summary>
+        /// <param name="fields">查询条件(单个字段)</param>
+        /// <param name="condition">查询条件(sql语句)</param>
+        /// <returns></returns>
+        // public static void ExportExcel(List<RelationData> relationData, string condition)
+        // {
+            
+        // }
+    }
+}