暂存

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

@@ -125,32 +125,20 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
 
 
 
-        #region 交易查询-直连订单查询分账
+        #region 交易查询-直连订单发起分账
         [Authorize]
         public JsonResult DirectQueryDivideAccounts(string value)
         {
             value = PublicFunction.DesDecrypt(value);
             JsonData data = JsonMapper.ToObject(value);
-            List<Dictionary<string, object>> dataList = DirectQueryDivideAccountsDo(value);
-            return Json(new AppResultJson() { Status = "1", Info = "", Data = dataList });
+            AppResultJson result = DirectQueryDivideAccountsDo(value);
+            return Json(new AppResultJson() { Status = result.Status, Info = result.Info, Data = result.Data });
         }
-        private List<Dictionary<string, object>> DirectQueryDivideAccountsDo(string value)
+        private AppResultJson DirectQueryDivideAccountsDo(string value)
         {
             JsonData data = JsonMapper.ToObject(value);
             string Id = data["Id"].ToString(); //订单Id
-            int pageSize = int.Parse(function.CheckInt(data["page_size"].ToString()));
-            int pageNum = int.Parse(function.CheckInt(data["page_num"].ToString()));
-            string condition = "";
-            List<RelationData> relationData = new List<RelationData>();
-            List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
-            List<Dictionary<string, object>> source = ConsumerOrdersService.List(relationData, condition, pageNum, pageSize);
-            foreach (Dictionary<string, object> subdata in source)
-            {
-                Dictionary<string, object> curData = new Dictionary<string, object>();
-
-                dataList.Add(curData);
-            }
-            return dataList;
+            return new AppResultJson() { Status = "1", Info = "成功" };
         }
         #endregion
 

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

@@ -67,13 +67,10 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
             }
             if (!string.IsNullOrEmpty(data["Status"].ToString()))
             {
-                if (Status == "0") condition += " and Status=0"; //审核中
-                if (Status == "1") condition += " and Status=2 and QueryCount=2"; //已通过
-                if (Status == "-1") condition += " and Status=-1 and QueryCount=0"; //审核失败
-                if (Status == "20") condition += " and Status=1"; //微信待签约
-                if (Status == "21") condition += " and Status=2"; //微信已签约
-                if (Status == "10") condition += " and QueryCount=1"; //支付宝待签约
-                if (Status == "11") condition += " and QueryCount=2"; //支付宝已签约
+                if (Status == "0") condition += " and Status=0 and QueryCount=0"; //待审核
+                if (Status == "-1") condition += " and (Status=-1 or QueryCount=-1)"; //审核失败
+                if (Status == "1") condition += " and (Status=1 or QueryCount=1)"; //待签约
+                if (Status == "2") condition += " and Status=2 and QueryCount=2"; //已通过
             }
             List<RelationData> relationData = new List<RelationData>();
             List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
@@ -104,24 +101,17 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
                 curData.Add("RealName", userInfo.RealName); //所属创客姓名
                 //商户状态
                 var MerStatus = 0;
-                // if (status == 0) MerStatus = 0; //审核中
-                if (status == -1 && queryCount == 0) MerStatus = -1; //审核失败
-                if (queryCount == 1) MerStatus = 10; //支付宝待签约
-                if (queryCount == 2) MerStatus = 11; //支付宝已签约
-                if (status == 1) MerStatus = 20; //微信待签约
-                if (status == 2) MerStatus = 21; //微信已签约
+                if (status == 0 && queryCount == 0) MerStatus = 0; //待审核
+                if (status == -1 || queryCount == -1) MerStatus = -1; //审核失败
+                if (status == 1 || queryCount == 1) MerStatus = 1; //待签约
                 if (status == 2 && queryCount == 2) MerStatus = 1; //已通过
                 curData.Add("Status", MerStatus); //商户状态
                 //审核平台
-                var AuditInfo = 0;
-                if (status < 0 && queryCount >= 1) AuditInfo = 1;
-                if (status >= 1 && queryCount < 0) AuditInfo = 2;
+                var AuditInfo = 1;
+                if (status == -1 && queryCount >= 1) AuditInfo = 2;
+                if (status >= 1 && queryCount == -1) AuditInfo = 1;
                 curData.Add("AuditInfo", AuditInfo); //审核平台(1 支付宝 2 微信)
 
-                // curData.Add("Status", GetMainStatusName(merchantAddInfo.QueryCount, merchantAddInfo.Status));
-                // curData.Add("AlipayStatus", merchantAddInfo.QueryCount);
-                // curData.Add("WeChatStatus", merchantAddInfo.Status);
-
                 dataList.Add(curData);
             }
             Other.Add("Count", count); //总数
@@ -198,16 +188,15 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
         {
             JsonData data = JsonMapper.ToObject(value);
             string MerchantId = data["MerchantId"].ToString(); //商户Id
-            // var info = MerchantAddInfoUtil.DirectSubmitDo(int.Parse(MerchantId));
-            // if (info == "success")
-            // {
-            //     return new AppResultJson() { Status = "1", Info = "成功", Data = info };
-            // }
-            // else
-            // {
-            //     return new AppResultJson() { Status = "-1", Info = "失败", Data = info };
-            // }
-            return new AppResultJson() { Status = "1", Info = "成功" };
+            var info = MerchantAddInfoUtil.DirectSubmitDo(int.Parse(MerchantId));
+            if (info == "success")
+            {
+                return new AppResultJson() { Status = "1", Info = "成功", Data = info };
+            }
+            else
+            {
+                return new AppResultJson() { Status = "-1", Info = "失败", Data = info };
+            }
         }
         #endregion
 

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

@@ -90,6 +90,7 @@ namespace MySystem.Areas.Api.Controllers.v1.Main2
             {
                 if (data["SubjectType"].ToString() == "1") SubjectType = "SUBJECT_TYPE_ENTERPRISE"; //企业公司
                 if (data["SubjectType"].ToString() == "2") SubjectType = "SUBJECT_TYPE_INDIVIDUAL"; //个体工商户
+                if (data["SubjectType"].ToString() == "3") SubjectType = "SUBJECT_TYPE_SMALL"; //小微
                 var Ids = MerchantInfoUtil.QueryMerchantIdBySubjectType(SubjectType);
                 condition += " and MerchantId in (" + Ids + ")";
             }
@@ -125,33 +126,20 @@ namespace MySystem.Areas.Api.Controllers.v1.Main2
         #endregion
 
 
-
-        #region 交易查询-银联订单查询分账
+         #region 交易查询-银联订单发起分账
         [Authorize]
         public JsonResult UnionPayQueryDivideAccounts(string value)
         {
             value = PublicFunction.DesDecrypt(value);
             JsonData data = JsonMapper.ToObject(value);
-            List<Dictionary<string, object>> dataList = UnionPayQueryDivideAccountsDo(value);
-            return Json(new AppResultJson() { Status = "1", Info = "", Data = dataList });
+            AppResultJson result = UnionPayQueryDivideAccountsDo(value);
+            return Json(new AppResultJson() { Status = result.Status, Info = result.Info, Data = result.Data });
         }
-        private List<Dictionary<string, object>> UnionPayQueryDivideAccountsDo(string value)
+        private AppResultJson UnionPayQueryDivideAccountsDo(string value)
         {
             JsonData data = JsonMapper.ToObject(value);
             string Id = data["Id"].ToString(); //订单Id
-            int pageSize = int.Parse(function.CheckInt(data["page_size"].ToString()));
-            int pageNum = int.Parse(function.CheckInt(data["page_num"].ToString()));
-            string condition = "";
-            List<RelationData> relationData = new List<RelationData>();
-            List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
-            List<Dictionary<string, object>> source = ConsumerOrdersService.List(relationData, condition, pageNum, pageSize);
-            foreach (Dictionary<string, object> subdata in source)
-            {
-                Dictionary<string, object> curData = new Dictionary<string, object>();
-
-                dataList.Add(curData);
-            }
-            return dataList;
+            return new AppResultJson() { Status = "1", Info = "成功" };
         }
         #endregion
 

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

@@ -68,13 +68,10 @@ namespace MySystem.Areas.Api.Controllers.v1.Main2
             }
             if (!string.IsNullOrEmpty(data["Status"].ToString()))
             {
-                if (Status == "0") condition += " and Status=0"; //审核中
-                if (Status == "1") condition += " and Status=2 and QueryCount=2"; //已通过
-                if (Status == "-1") condition += " and Status=-1 and QueryCount=0"; //审核失败
-                if (Status == "20") condition += " and Status=1"; //微信待签约
-                if (Status == "21") condition += " and Status=2"; //微信已签约
-                if (Status == "10") condition += " and QueryCount=1"; //支付宝待签约
-                if (Status == "11") condition += " and QueryCount=2"; //支付宝已签约
+                if (Status == "0") condition += " and Status=0 and QueryCount=0"; //待审核
+                if (Status == "-1") condition += " and (Status=-1 or QueryCount=-1)"; //审核失败
+                if (Status == "1") condition += " and (Status=1 or QueryCount=1)"; //待签约
+                if (Status == "2") condition += " and Status=2 and QueryCount=2"; //已通过
             }
             List<RelationData> relationData = new List<RelationData>();
             List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
@@ -106,19 +103,17 @@ namespace MySystem.Areas.Api.Controllers.v1.Main2
                 curData.Add("RealName", userInfo.RealName); //所属创客姓名
                 //商户状态
                 var MerStatus = 0;
-                // if (status == 0) MerStatus = 0; //审核中
-                if (status == -1 && queryCount == 0) MerStatus = -1; //审核失败
-                if (queryCount == 1) MerStatus = 10; //支付宝待签约
-                if (queryCount == 2) MerStatus = 11; //支付宝已签约
-                if (status == 1) MerStatus = 20; //微信待签约
-                if (status == 2) MerStatus = 21; //微信已签约
+                if (status == 0 && queryCount == 0) MerStatus = 0; //待审核
+                if (status == -1 || queryCount == -1) MerStatus = -1; //审核失败
+                if (status == 1 || queryCount == 1) MerStatus = 1; //待签约
                 if (status == 2 && queryCount == 2) MerStatus = 1; //已通过
                 curData.Add("Status", MerStatus); //商户状态
                 //审核平台
-                var AuditInfo = 0;
-                if (status < 0 && queryCount >= 1) AuditInfo = 1;
-                if (status >= 1 && queryCount < 0) AuditInfo = 2;
-                if (status < 0 && queryCount == 0) AuditInfo = 3;
+                var AuditInfo = 3;
+                if (status == 0 && queryCount == 0) AuditInfo = 3;
+                if (status >= 1 && queryCount == -1) AuditInfo = 1;
+                if (status == -1 && queryCount >= 1) AuditInfo = 2;
+                if (status == 2 && queryCount == 2) AuditInfo = 3;
                 curData.Add("AuditInfo", AuditInfo); //审核平台(1 支付宝 2 微信 3 好哒)
 
                 dataList.Add(curData);
@@ -201,16 +196,15 @@ namespace MySystem.Areas.Api.Controllers.v1.Main2
         {
             JsonData data = JsonMapper.ToObject(value);
             string MerchantId = data["MerchantId"].ToString(); //商户Id
-            // var info = MerchantAddInfoUtil.DirectSubmitDo(int.Parse(MerchantId));
-            // if (info == "success")
-            // {
-            //     return new AppResultJson() { Status = "1", Info = "成功", Data = info };
-            // }
-            // else
-            // {
-            //     return new AppResultJson() { Status = "-1", Info = "失败", Data = info };
-            // }
-            return new AppResultJson() { Status = "1", Info = "成功" };
+            var info = MerchantAddInfoUtil.UnionPaySubmitDo(int.Parse(MerchantId));
+            if (info == "success")
+            {
+                return new AppResultJson() { Status = "1", Info = "成功", Data = info };
+            }
+            else
+            {
+                return new AppResultJson() { Status = "-1", Info = "失败", Data = info };
+            }
         }
         #endregion
 

Service/Main1/ConsumerProfitService.cs

@@ -0,0 +1,222 @@
+/*
+ * 消费者分红记录
+ */
+
+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 ConsumerProfitService
+    {
+        static string _conn = ConfigurationManager.AppSettings["SqlConnStr"].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>(); //要显示的列
+            fields.Add("Id");
+            fields.Add("CreateDate"); //添加时间
+            fields.Add("Status"); //状态
+            fields.Add("MerchantId"); //商户
+            fields.Add("ConsumerId"); //消费者
+            fields.Add("GetMoney"); //分红金额
+
+            Dictionary<string, object> obj = new DbService(AppConfig.Base.main1Tables, _conn).IndexData("ConsumerProfit", 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>(); //要显示的列
+            fields.Add("Id");
+            fields.Add("CreateDate"); //添加时间
+            fields.Add("Status"); //状态
+            fields.Add("MerchantId"); //商户
+            fields.Add("ConsumerId"); //消费者
+            fields.Add("GetMoney"); //分红金额
+
+            Dictionary<string, object> obj = new DbService(AppConfig.Base.main1Tables, _conn).IndexData("ConsumerProfit", 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 ConsumerProfit Query(int Id)
+        {
+            WebCMSEntities db = new WebCMSEntities();
+            ConsumerProfit editData = db.ConsumerProfit.FirstOrDefault(m => m.Id == Id) ?? new ConsumerProfit();
+            db.Dispose();
+            return editData;
+        }
+        public static ConsumerProfit Query(string condition, string fields = "*")
+        {
+            var consumerProfit = new DbService(AppConfig.Base.main1Tables, _conn).Query(fields, "ConsumerProfit", condition);
+            if (consumerProfit.Count > 0)
+            {
+                return Newtonsoft.Json.JsonConvert.DeserializeObject<ConsumerProfit>(Newtonsoft.Json.JsonConvert.SerializeObject(consumerProfit));
+            }
+            return new ConsumerProfit();
+        }
+
+        public static decimal Sum(string condition, string field)
+        {
+            var dt = new DbService(AppConfig.Base.main1Tables, _conn).Query("Sum(" + field + ") " + field, "ConsumerProfit", condition);
+            decimal amount = 0;
+            if (dt.Count > 0 && !string.IsNullOrEmpty(dt[field].ToString()))
+            {
+                amount = decimal.Parse(dt[field].ToString());
+            }
+            return amount;
+        }
+
+        /// <summary>
+        /// 查询记录数
+        /// </summary>
+        /// <param name="Id">主键Id</param>
+        /// <returns></returns>
+        public static int Count(string condition = "", string field = "Id")
+        {
+            var dt = new DbService(AppConfig.Base.main1Tables, _conn).Query("Count(" + field + ") " + field, "ConsumerProfit", condition);
+            int result = 0;
+            if (dt.Count > 0)
+            {
+                result = int.Parse(dt[field].ToString());
+            }
+            return result;
+        }
+
+        /// <summary>
+        /// 查询是否存在
+        /// </summary>
+        /// <param name="Id">主键Id</param>
+        /// <returns></returns>
+        public static bool Exist(int Id)
+        {
+            WebCMSEntities db = new WebCMSEntities();
+            bool check = db.ConsumerProfit.Any(m => m.Id == Id);
+            db.Dispose();
+            return check;
+        }
+
+        /// <summary>
+        /// 添加数据
+        /// </summary>
+        /// <param name="Fields">要设置的字段</param>
+        /// <returns></returns>
+        public static AppResultJson Add(Dictionary<string, object> fields, bool check = true)
+        {
+            if (check)
+            {
+                if (string.IsNullOrEmpty(fields["IsAct"].ToString()))
+                {
+                    return new AppResultJson() { Status = "-1", Info = "请填写是否活动" };
+                }
+
+            }
+            int Id = new DbService(AppConfig.Base.main1Tables, _conn).Add("ConsumerProfit", 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)
+            {
+                if (string.IsNullOrEmpty(fields["IsAct"].ToString()))
+                {
+                    return new AppResultJson() { Status = "-1", Info = "请填写是否活动" };
+                }
+
+            }
+            new DbService(AppConfig.Base.main1Tables, _conn).Edit("ConsumerProfit", 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("ConsumerProfit", fields, Id);
+        }
+
+        /// <summary>
+        /// 删除数据
+        /// </summary>
+        /// <param name="Id">主键Id</param>
+        public static void Delete(int Id)
+        {
+            new DbService(AppConfig.Base.main1Tables, _conn).Delete("ConsumerProfit", 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("ConsumerProfit", 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.ConsumerProfit.Add(new ConsumerProfit()
+                {
+                    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)
+        // {
+
+        // }
+    }
+}

Service/Main2/ConsumerProfitService.cs

@@ -0,0 +1,222 @@
+/*
+ * 消费者分红记录
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Data;
+using MySystem.Models.Main2;
+using Library;
+using LitJson;
+
+namespace MySystem.Service.Main2
+{
+    public class ConsumerProfitService
+    {
+        static string _conn = ConfigurationManager.AppSettings["SqlConnStr"].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>(); //要显示的列
+            fields.Add("Id");
+            fields.Add("CreateDate"); //添加时间
+            fields.Add("Status"); //状态
+            fields.Add("MerchantId"); //商户
+            fields.Add("ConsumerId"); //消费者
+            fields.Add("GetMoney"); //分红金额
+
+            Dictionary<string, object> obj = new DbService(AppConfig.Base.main2Tables, _conn).IndexData("ConsumerProfit", 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>(); //要显示的列
+            fields.Add("Id");
+            fields.Add("CreateDate"); //添加时间
+            fields.Add("Status"); //状态
+            fields.Add("MerchantId"); //商户
+            fields.Add("ConsumerId"); //消费者
+            fields.Add("GetMoney"); //分红金额
+
+            Dictionary<string, object> obj = new DbService(AppConfig.Base.main2Tables, _conn).IndexData("ConsumerProfit", 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 ConsumerProfit Query(int Id)
+        {
+            WebCMSEntities db = new WebCMSEntities();
+            ConsumerProfit editData = db.ConsumerProfit.FirstOrDefault(m => m.Id == Id) ?? new ConsumerProfit();
+            db.Dispose();
+            return editData;
+        }
+        public static ConsumerProfit Query(string condition, string fields = "*")
+        {
+            var consumerProfit = new DbService(AppConfig.Base.main2Tables, _conn).Query(fields, "ConsumerProfit", condition);
+            if (consumerProfit.Count > 0)
+            {
+                return Newtonsoft.Json.JsonConvert.DeserializeObject<ConsumerProfit>(Newtonsoft.Json.JsonConvert.SerializeObject(consumerProfit));
+            }
+            return new ConsumerProfit();
+        }
+
+        public static decimal Sum(string condition, string field)
+        {
+            var dt = new DbService(AppConfig.Base.main2Tables, _conn).Query("Sum(" + field + ") " + field, "ConsumerProfit", condition);
+            decimal amount = 0;
+            if (dt.Count > 0 && !string.IsNullOrEmpty(dt[field].ToString()))
+            {
+                amount = decimal.Parse(dt[field].ToString());
+            }
+            return amount;
+        }
+
+        /// <summary>
+        /// 查询记录数
+        /// </summary>
+        /// <param name="Id">主键Id</param>
+        /// <returns></returns>
+        public static int Count(string condition = "", string field = "Id")
+        {
+            var dt = new DbService(AppConfig.Base.main2Tables, _conn).Query("Count(" + field + ") " + field, "ConsumerProfit", condition);
+            int result = 0;
+            if (dt.Count > 0)
+            {
+                result = int.Parse(dt[field].ToString());
+            }
+            return result;
+        }
+
+        /// <summary>
+        /// 查询是否存在
+        /// </summary>
+        /// <param name="Id">主键Id</param>
+        /// <returns></returns>
+        public static bool Exist(int Id)
+        {
+            WebCMSEntities db = new WebCMSEntities();
+            bool check = db.ConsumerProfit.Any(m => m.Id == Id);
+            db.Dispose();
+            return check;
+        }
+
+        /// <summary>
+        /// 添加数据
+        /// </summary>
+        /// <param name="Fields">要设置的字段</param>
+        /// <returns></returns>
+        public static AppResultJson Add(Dictionary<string, object> fields, bool check = true)
+        {
+            if (check)
+            {
+                if (string.IsNullOrEmpty(fields["IsAct"].ToString()))
+                {
+                    return new AppResultJson() { Status = "-1", Info = "请填写是否活动" };
+                }
+
+            }
+            int Id = new DbService(AppConfig.Base.main2Tables, _conn).Add("ConsumerProfit", 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)
+            {
+                if (string.IsNullOrEmpty(fields["IsAct"].ToString()))
+                {
+                    return new AppResultJson() { Status = "-1", Info = "请填写是否活动" };
+                }
+
+            }
+            new DbService(AppConfig.Base.main2Tables, _conn).Edit("ConsumerProfit", 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.main2Tables, _conn).Edit("ConsumerProfit", fields, Id);
+        }
+
+        /// <summary>
+        /// 删除数据
+        /// </summary>
+        /// <param name="Id">主键Id</param>
+        public static void Delete(int Id)
+        {
+            new DbService(AppConfig.Base.main2Tables, _conn).Delete("ConsumerProfit", Id);
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="Id">主键Id</param>
+        /// <param name="Sort">排序序号</param>
+        public static void Sort(int Id, int Sort)
+        {
+            new DbService(AppConfig.Base.main2Tables, _conn).Sort("ConsumerProfit", 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.ConsumerProfit.Add(new ConsumerProfit()
+                {
+                    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)
+        // {
+
+        // }
+    }
+}

Util/Base/BaseClass.cs

@@ -14,24 +14,33 @@ namespace MySystem
         /// <param name="AlipayStatus">支付宝状态</param>
         /// <param name="WeChatStatus">微信状态</param>
         /// <returns></returns>
-        public string GetMainStatusName(int AlipayStatus, int WeChatStatus)
+        public static string GetMainStatusName(int AlipayStatus, int WeChatStatus)
         {
-            if (AlipayStatus == 0 && WeChatStatus == 0) return "待审核";
-            if (AlipayStatus == 0 && WeChatStatus == -1) return "部分未通过";
-            if (AlipayStatus == -1 && WeChatStatus == 0) return "部分未通过";
-            if (AlipayStatus == 0 && WeChatStatus == 1) return "部分待签约";
-            if (AlipayStatus == 1 && WeChatStatus == 0) return "部分待签约";
-            if (AlipayStatus == 0 && WeChatStatus == 2) return "部分已通过";
-            if (AlipayStatus == 2 && WeChatStatus == 0) return "部分已通过";
-            if (AlipayStatus == -1 && WeChatStatus == -1) return "审核未通过";
-            if (AlipayStatus == -1 && WeChatStatus == 1) return "部分未通过";
-            if (AlipayStatus == 1 && WeChatStatus == -1) return "部分未通过";
-            if (AlipayStatus == -1 && WeChatStatus == 2) return "部分未通过";
-            if (AlipayStatus == 2 && WeChatStatus == -1) return "部分未通过";
-            if (AlipayStatus == 1 && WeChatStatus == 1) return "待签约";
-            if (AlipayStatus == 1 && WeChatStatus == 2) return "部分待签约";
-            if (AlipayStatus == 2 && WeChatStatus == 1) return "部分待签约";
-            if (AlipayStatus == 2 && WeChatStatus == 2) return "已通过";
+            if (AlipayStatus == -1)
+            {
+                if (WeChatStatus == -1) return "审核未通过";
+                if (WeChatStatus == 0 || WeChatStatus == 1 || WeChatStatus == 2) return "部分未通过";
+            }
+            if (AlipayStatus == 0)
+            {
+                if (WeChatStatus == -1) return "部分未通过";
+                if (WeChatStatus == 0) return "待审核";
+                if (WeChatStatus == 1) return "部分待签约";
+                if (WeChatStatus == 2) return "部分已通过";
+            }
+            if (AlipayStatus == 1)
+            {
+                if (WeChatStatus == -1) return "部分未通过";
+                if (WeChatStatus == 0 || WeChatStatus == 2) return "部分待签约";
+                if (WeChatStatus == 1) return "待签约";
+            }
+            if (AlipayStatus == 2)
+            {
+                if (WeChatStatus == -1) return "部分未通过";
+                if (WeChatStatus == 0) return "部分已通过";
+                if (WeChatStatus == 1) return "部分待签约";
+                if (WeChatStatus == 2) return "已通过";
+            }
             return "";
         }
         #endregion

Util/Main1/MerchantInfoUtil.cs

@@ -50,7 +50,7 @@ namespace MySystem.Service.Main1
         {
             var info = "";
             List<RelationData> relationData = new List<RelationData>();
-            var merAddInfo = MerchantAddInfoService.List(relationData," and SubjectType='" + SubjectType + "'",1,9999);
+            var merAddInfo = MerchantAddInfoService.List(relationData," and SubjectType='" + SubjectType + "'",1,999999);
             if (merAddInfo.Count > 0)
             {
                 var merIds = "";

Util/Main2/MerchantAddInfoUtil.cs

@@ -136,7 +136,7 @@ namespace MySystem.Service.Main2
         /// </summary>
         /// <param name="MerchantId">商户Id</param>
         /// <returns></returns>
-        public static string DirectSubmitDo(int MerchantId)
+        public static string UnionPaySubmitDo(int MerchantId)
         {
             var merInfo = MerchantInfoService.Query(MerchantId);
             if (merInfo.Sort != 0 || merInfo.QueryCount != 2 || merInfo.Status != 2)

Util/Main2/MerchantInfoUtil.cs

@@ -49,7 +49,7 @@ namespace MySystem.Service.Main2
         {
             var info = "";
             List<RelationData> relationData = new List<RelationData>();
-            var merAddInfo = MerchantAddInfoService.List(relationData," and SubjectType='" + SubjectType + "'",1,9999);
+            var merAddInfo = MerchantAddInfoService.List(relationData," and SubjectType='" + SubjectType + "'",1,999999);
             if (merAddInfo.Count > 0)
             {
                 var merIds = "";