暂存

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

@@ -1,113 +1,113 @@
-// 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 MySystem.MainModels;
-// using LitJson;
-// using Library;
+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 MySystem.MainModels;
+using LitJson;
+using Library;
 
-// namespace MySystem.Areas.Api.Controllers.v1
-// {
-//     [Area("Api")]
-//     [Route("Api/v1/[controller]/[action]")]
-//     public class MerchantAmountSummayController : BaseController
-//     {
-//         public MerchantAmountSummayController(IHttpContextAccessor accessor, ILogger<BaseController> logger, IOptions<Setting> setting) : base(accessor, logger, setting)
-//         {
-//         }
+namespace MySystem.Areas.Api.Controllers.v1
+{
+    [Area("Api")]
+    [Route("Api/v1/[controller]/[action]")]
+    public class MerchantAmountSummayController : BaseController
+    {
+        public MerchantAmountSummayController(IHttpContextAccessor accessor, ILogger<BaseController> logger, IOptions<Setting> setting) : base(accessor, logger, setting)
+        {
+        }
 
 
 
 
-//         #region 已激活商户-达标信息列表
-//         [Authorize]
-//         public JsonResult List(string value)
-//         {
-//             value = DesDecrypt(value);
-//             JsonData data = JsonMapper.ToObject(value);
-//             List<Dictionary<string, object>> dataList = ListDo(value);
-//             return Json(new AppResultJson() { Status = "1", Info = "", Data = dataList });
-//         }
-//         private List<Dictionary<string, object>> ListDo(string value)
-//         {
-//             JsonData data = JsonMapper.ToObject(value);
-//             int MerchantId = int.Parse(function.CheckInt(data["MerchantId"].ToString())); //商户
-//             int pageSize = int.Parse(function.CheckInt(data["page_size"].ToString()));
-//             int pageNum = int.Parse(function.CheckInt(data["page_num"].ToString()));
-//             List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
-//             // var query = MerchantDepositOrderService.Query(" and Status=1 and MerchantId=" + MerchantId + "");
-//             // var query = maindb.MerchantDepositOrder.FirstOrDefault(m => m.Status == 1 && m.MerchantId == MerchantId);
-//             var Status = 0;//活动交易状态
-//             var IsJoin = 0;//是否参加活动(0 否 1 是)
-//             if (query.Id == 0) IsJoin = 1;
-//             var month = DateTime.Parse(query.CreateDate.ToString());
-//             var TradeMonth = "";
-//             decimal TradeAmount = 0.00M;
-//             Dictionary<string, string> dic = new Dictionary<string, string>();
-//             for (int i = 0; i < 10; i++)
-//             {
-//                 month = month.AddMonths(i + 1);
-//                 TradeMonth = month.ToString("yyyy-MM");
-//                 var check = MerchantAmountSummayService.Query(" and IsAct=1 and TradeMonth='" + TradeMonth + "' and MerchantId=" + MerchantId + "");
-//                 if (check.Id > 0)
-//                 {
-//                     dic = MerchantAmountSummayService.Sum("TradeAmount", " and IsAct=1 and TradeMonth='" + TradeMonth + "'");
-//                     TradeAmount = decimal.Parse(dic["TradeAmount"].ToString());
-//                 }
-//                 if (IsJoin == 0)
-//                 {
-//                     //未参与
-//                     Status = 3;
-//                 }
-//                 else
-//                 {
-//                     //考核中
-//                     if (DateTime.Now.ToString("yyyy-MM") == TradeMonth) Status = 1;
-//                     //待考核
-//                     if (int.Parse(DateTime.Now.ToString("yyyyMM")) < int.Parse(month.ToString("yyyyMM"))) Status = 0;
-//                     //已通过
-//                     if (TradeAmount >= 10000 && IsJoin != 3 && check.Id > 0) Status = 2;
-//                     //未通过
-//                     if (TradeAmount < 10000 && IsJoin != 3 && check.Id > 0) Status = -1;
+        #region 已激活商户-达标信息列表
+        [Authorize]
+        public JsonResult List(string value)
+        {
+            value = DesDecrypt(value);
+            JsonData data = JsonMapper.ToObject(value);
+            List<Dictionary<string, object>> dataList = ListDo(value);
+            return Json(new AppResultJson() { Status = "1", Info = "", Data = dataList });
+        }
+        private List<Dictionary<string, object>> ListDo(string value)
+        {
+            JsonData data = JsonMapper.ToObject(value);
+            int MerchantId = int.Parse(function.CheckInt(data["MerchantId"].ToString())); //商户
+            int pageSize = int.Parse(function.CheckInt(data["page_size"].ToString()));
+            int pageNum = int.Parse(function.CheckInt(data["page_num"].ToString()));
+            List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
+            // var query = MerchantDepositOrderService.Query(" and Status=1 and MerchantId=" + MerchantId + "");
+            var query = maindb.MerchantDepositOrder.FirstOrDefault(m => m.Status == 1 && m.MerchantId == MerchantId);
+            var Status = 0;//活动交易状态
+            var IsJoin = 0;//是否参加活动(0 否 1 是)
+            if (query.Id == 0) IsJoin = 1;
+            var month = DateTime.Parse(query.CreateDate.ToString());
+            var TradeMonth = "";
+            decimal TradeAmount = 0.00M;
+            Dictionary<string, string> dic = new Dictionary<string, string>();
+            for (int i = 0; i < 10; i++)
+            {
+                month = month.AddMonths(i + 1);
+                TradeMonth = month.ToString("yyyy-MM");
+                var check = new MerchantAmountSummayService().Query(" and IsAct=1 and TradeMonth='" + TradeMonth + "' and MerchantId=" + MerchantId + "");
+                if (check.Id > 0)
+                {
+                    dic = new MerchantAmountSummayService().Sum("TradeAmount", " and IsAct=1 and TradeMonth='" + TradeMonth + "'");
+                    TradeAmount = decimal.Parse(dic["TradeAmount"].ToString());
+                }
+                if (IsJoin == 0)
+                {
+                    //未参与
+                    Status = 3;
+                }
+                else
+                {
+                    //考核中
+                    if (DateTime.Now.ToString("yyyy-MM") == TradeMonth) Status = 1;
+                    //待考核
+                    if (int.Parse(DateTime.Now.ToString("yyyyMM")) < int.Parse(month.ToString("yyyyMM"))) Status = 0;
+                    //已通过
+                    if (TradeAmount >= 10000 && IsJoin != 3 && check.Id > 0) Status = 2;
+                    //未通过
+                    if (TradeAmount < 10000 && IsJoin != 3 && check.Id > 0) Status = -1;
 
-//                     Dictionary<string, object> curData = new Dictionary<string, object>();
-//                     curData.Add("TradeMonth", TradeMonth); //月份
-//                     curData.Add("TradeAmount", TradeAmount); //订单金额
-//                     curData.Add("Status", Status); //状态(-1 未通过 0 待考核 1 考核中 2 已通过 3 未参与)
-//                     dataList.Add(curData);
-//                 }
-//             }
-//             return dataList;
-//         }
-//         #endregion
+                    Dictionary<string, object> curData = new Dictionary<string, object>();
+                    curData.Add("TradeMonth", TradeMonth); //月份
+                    curData.Add("TradeAmount", TradeAmount); //订单金额
+                    curData.Add("Status", Status); //状态(-1 未通过 0 待考核 1 考核中 2 已通过 3 未参与)
+                    dataList.Add(curData);
+                }
+            }
+            return dataList;
+        }
+        #endregion
 
 
 
-//         #region 检查签名是否合法，合法返回1，不合法返回提示信息
+        #region 检查签名是否合法，合法返回1，不合法返回提示信息
 
-//         /// <summary>
-//         /// 检查签名是否合法，合法返回1，不合法返回提示信息
-//         /// </summary>
-//         /// <param name="value">请求的参数(json字符串)</param>
-//         /// <param name="signField">要签名的字段</param>
-//         /// <returns></returns>
-//         private string CheckSign(string value, string[] signField)
-//         {
-//             JsonData json = JsonMapper.ToObject(value);
-//             Dictionary<string, string> dic = new Dictionary<string, string>();
-//             for (int i = 0; i < signField.Length; i++)
-//             {
-//                 dic.Add(signField[i], json[signField[i]].ToString());
-//             }
-//             string sign = json["sign"].ToString(); //客户端签名字符串
-//             return new Sign().sign(dic, sign);
-//         }
+        /// <summary>
+        /// 检查签名是否合法，合法返回1，不合法返回提示信息
+        /// </summary>
+        /// <param name="value">请求的参数(json字符串)</param>
+        /// <param name="signField">要签名的字段</param>
+        /// <returns></returns>
+        private string CheckSign(string value, string[] signField)
+        {
+            JsonData json = JsonMapper.ToObject(value);
+            Dictionary<string, string> dic = new Dictionary<string, string>();
+            for (int i = 0; i < signField.Length; i++)
+            {
+                dic.Add(signField[i], json[signField[i]].ToString());
+            }
+            string sign = json["sign"].ToString(); //客户端签名字符串
+            return new Sign().sign(dic, sign);
+        }
 
-//         #endregion
+        #endregion
 
-//     }
-// }
+    }
+}

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

@@ -24,7 +24,7 @@ namespace MySystem.Areas.Api.Controllers.v1
 
 
 
-        
+
         #region 首页-快联盟产品-我的业绩-团队业绩-商户列表
         [Authorize]
         public JsonResult TeamPerformanceMerchants(string value)
@@ -146,7 +146,7 @@ namespace MySystem.Areas.Api.Controllers.v1
             {
                 query = query.Where(m => m.Name.Contains(SearchKey));
             }
-            if(Kind > 0)
+            if (Kind > 0)
             {
                 query = query.Where(m => m.QueryCount == Kind);
             }
@@ -237,6 +237,23 @@ namespace MySystem.Areas.Api.Controllers.v1
             Obj.Add("ActivationDate", merchant.ActivationDate == null ? "" : merchant.ActivationDate.Value.ToString("yyyy-MM-dd HH:mm:ss")); //达标时间
             Obj.Add("TotalAmount", merchant.TotalAmount.ToString("f2")); //总交易额
             Obj.Add("ActivationStatus", merchant.ActivationStatus); //达标状态
+            Obj.Add("IsAct", merchant.IsAct); //是否激活(0 否 1 是)
+            if (merchant.IsAct == 1)
+            {
+                var orderInfo = maindb.MerchantDepositOrder.FirstOrDefault(m => m.Status == 1 && m.MerchantId == Id) ?? new MerchantDepositOrder();
+                var IsPay = 0;
+                if (orderInfo.Id > 0)
+                {
+                    IsPay = 1;
+                    Obj.Add("IsPay", IsPay); //是否缴纳服务费(0 否 1 是)
+                    Obj.Add("ActDate", orderInfo.CreateDate); //激活时间
+                }
+                else
+                {
+                    Obj.Add("IsPay", IsPay); //是否缴纳服务费(0 否 1 是)
+                    Obj.Add("ActDate", ""); //激活时间
+                }
+            }
             return Obj;
         }
         #endregion
@@ -280,14 +297,14 @@ namespace MySystem.Areas.Api.Controllers.v1
                 dataList.Add(curData);
             }
             other = new Dictionary<string, object>();
-            if(PageNum == 1)
+            if (PageNum == 1)
             {
                 DataTable total = CustomerSqlConn.dtable("select sum(TradeAmount),sum(TradeCount),sum(if(IsAct=1, TradeAmount, 0)),sum(if(IsAct=0, TradeAmount, 0)) from MerchantAmountSummay where MerchantId=" + MerchantId + " and TradeMonth='" + TradeMonth + "'", AppConfig.Base.SqlConnStr);
                 decimal TradeAmt = 0;
                 decimal ActTradeAmt = 0;
                 decimal UnActTradeAmt = 0;
                 int TradeCount = 0;
-                if(total.Rows.Count > 0)
+                if (total.Rows.Count > 0)
                 {
                     TradeAmt = decimal.Parse(function.CheckNum(total.Rows[0][0].ToString())); //交易金额
                     ActTradeAmt = decimal.Parse(function.CheckNum(total.Rows[0][2].ToString())); //活动交易金额
@@ -379,7 +396,7 @@ namespace MySystem.Areas.Api.Controllers.v1
             {
                 Dictionary<string, object> curData = new Dictionary<string, object>();
                 curData.Add("SnNo", item.SnNo); //sn
-                curData.Add("TradeAmount", QrCodeTradeStat.Instance.Amount(item.SnNo).ToString("f2"));  
+                curData.Add("TradeAmount", QrCodeTradeStat.Instance.Amount(item.SnNo).ToString("f2"));
                 curData.Add("BindTime", item.BindDate == null ? "" : item.BindDate.Value.ToString("yyyy-MM-dd HH:mm:ss"));
                 dataList.Add(curData);
             }
@@ -465,7 +482,7 @@ namespace MySystem.Areas.Api.Controllers.v1
                 if (Status == 4) Status = 2;
                 query = query.Where(m => m.Status == Status);
             }
-            if(!string.IsNullOrEmpty(SearchKey))
+            if (!string.IsNullOrEmpty(SearchKey))
             {
                 query = query.Where(m => m.Name.Contains(SearchKey));
             }
@@ -556,11 +573,11 @@ namespace MySystem.Areas.Api.Controllers.v1
             int UserId = int.Parse(function.CheckInt(data["UserId"].ToString())); //所属创客
             Dictionary<string, object> Obj = new Dictionary<string, object>();
             MerchantInfo edit = maindb.MerchantInfo.FirstOrDefault(m => m.Id == Id && m.UserId == UserId);
-            if(edit != null)
+            if (edit != null)
             {
                 maindb.MerchantInfo.Remove(edit);
                 MerchantAddInfo editadd = maindb.MerchantAddInfo.FirstOrDefault(m => m.Id == Id);
-                if(editadd != null)
+                if (editadd != null)
                 {
                     maindb.MerchantAddInfo.Remove(editadd);
                 }
@@ -630,14 +647,14 @@ namespace MySystem.Areas.Api.Controllers.v1
                 Start = DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd") + " 00:00:00");
             }
             else if (TimeType == "2")
-            { 
+            {
                 Start = DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd") + " 00:00:00").AddDays(-6);
             }
             else if (TimeType == "3")
-            { 
+            {
                 Start = DateTime.Parse(DateTime.Now.ToString("yyyy-MM") + "-01 00:00:00");
             }
-            while(Start <= DateTime.Now)
+            while (Start <= DateTime.Now)
             {
                 Dictionary<string, string> dic = new MerchantAmountSummayService().Sum("TradeAmount,TradeCount,TotalActual", " and MerchantId=" + Id + " and TradeDate='" + Start.ToString("yyyyMMdd") + "'");
                 TotalAmount += decimal.Parse(dic["TradeAmount"]);
@@ -652,7 +669,7 @@ namespace MySystem.Areas.Api.Controllers.v1
             Obj.Add("TotalActual", TotalActual); //实收总额
             MerchantInfo merchant = new MerchantInfoService().Query(Id);
             decimal AllocationAmount = merchant.ActMaxAmount - merchant.ActCurrentAmount;
-            if(AllocationAmount < 0) AllocationAmount = 0;
+            if (AllocationAmount < 0) AllocationAmount = 0;
             Obj.Add("AllocationAmount", AllocationAmount); //未分配活动金额
 
             return Obj;
@@ -758,34 +775,45 @@ namespace MySystem.Areas.Api.Controllers.v1
             Obj.Add("AlipayStatus", merchantAddInfo.QueryCount);
             Obj.Add("WeChatStatus", merchantAddInfo.Status);
             Obj.Add("CreateDate", query.CreateDate == null ? "" : query.CreateDate.Value.ToString("yyyy-MM-dd"));
+            Obj.Add("IsAct", query.IsAct); //是否激活(0 否 1 是)
+            if (query.IsAct == 1)
+            {
+                var orderInfo = maindb.MerchantDepositOrder.FirstOrDefault(m => m.Status == 1 && m.MerchantId == Id) ?? new MerchantDepositOrder();
+                var IsPay = 0;
+                if (orderInfo.Id > 0)
+                {
+                    IsPay = 1;
+                }
+                Obj.Add("IsPay", IsPay); //是否缴纳服务费(0 否 1 是)
+            }
             return Obj;
         }
         private 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 == 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 "已通过";
             return "";
         }
         private string GetStatusName(int WeChatStatus)
         {
-            if(WeChatStatus == -1) return "审核未通过";
-            if(WeChatStatus == 0) return "待审核";
-            if(WeChatStatus == 1) return "待签约";
-            if(WeChatStatus == 2) return "已通过";
+            if (WeChatStatus == -1) return "审核未通过";
+            if (WeChatStatus == 0) return "待审核";
+            if (WeChatStatus == 1) return "待签约";
+            if (WeChatStatus == 2) return "已通过";
             return "";
         }
         #endregion
@@ -814,10 +842,10 @@ namespace MySystem.Areas.Api.Controllers.v1
             Dictionary<string, object> Obj = new Dictionary<string, object>();
             string Sn = data["Sn"].ToString();
             string Machine = data["Machine"].ToString();
-            if(Sn.Length > 20)
+            if (Sn.Length > 20)
             {
                 Sn = System.Web.HttpUtility.UrlDecode(Sn);
-                if(!Sn.EndsWith("="))
+                if (!Sn.EndsWith("="))
                 {
                     Sn += "=";
                 }
@@ -825,7 +853,7 @@ namespace MySystem.Areas.Api.Controllers.v1
                 Sn = Sn.TrimEnd('\0');
                 Sn = Sn.Substring(0, Sn.Length - 8);
             }
-            if(Machine == Sn)
+            if (Machine == Sn)
             {
                 MerchantQrCode code = new MerchantQrCodeService().Query(Sn);
                 MerchantInfo query = new MerchantInfoService().Query(code.MerchantId);
@@ -925,7 +953,7 @@ namespace MySystem.Areas.Api.Controllers.v1
             if (Mobile == "13802211996")
             {
                 if (LoginPwd != "kxs2022")
-                { 
+                {
                     return Json(new AppResultJson() { Status = "-1", Info = "登录密码不正确" });
                 }
                 Obj.Add("Id", 1);

Services/MainModelsService/MerchantAddInfoService.cs

@@ -0,0 +1,483 @@
+// /*
+//  * 商户进件资料
+//  */
+
+// using System;
+// using System.Collections.Generic;
+// using System.Linq;
+// using System.Data;
+// using MySystem.MainModels;
+// using Library;
+// using LitJson;
+
+// namespace MySystem.Service.Main
+// {
+//     public class MerchantAddInfoService
+//     {
+//         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("ApplymentState"); //申请单状态
+
+//             Dictionary<string, object> obj = new DbService(AppConfig.Base.mainTables, _conn).IndexData("MerchantAddInfo", 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("ApplymentState"); //申请单状态
+
+//             Dictionary<string, object> obj = new DbService(AppConfig.Base.mainTables, _conn).IndexData("MerchantAddInfo", 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 MerchantAddInfo Query(int Id)
+//         {
+//             WebCMSEntities db = new WebCMSEntities();
+//             MerchantAddInfo editData = db.MerchantAddInfo.FirstOrDefault(m => m.Id == Id) ?? new MerchantAddInfo();
+//             db.Dispose();
+//             return editData;
+//         }
+
+//         public static MerchantAddInfo Query(string condition, string fields = "*")
+//         {
+//             var merchantAddInfo = new DbService(AppConfig.Base.mainTables, _conn).Query(fields, "MerchantAddInfo", condition);
+//             if (merchantAddInfo.Count > 0)
+//             {
+//                 return Newtonsoft.Json.JsonConvert.DeserializeObject<MerchantAddInfo>(Newtonsoft.Json.JsonConvert.SerializeObject(merchantAddInfo));
+//             }
+//             return new MerchantAddInfo();
+//         }
+
+//         public static decimal Sum(string condition, string field)
+//         {
+//             var dt = new DbService(AppConfig.Base.mainTables, _conn).Query("Sum(" + field + ") " + field, "MerchantAddInfo", condition);
+//             decimal amount = 0;
+//             if (dt.Count > 0)
+//             {
+//                 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.mainTables, _conn).Query("Count(" + field + ") " + field, "MerchantAddInfo", 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.MerchantAddInfo.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["ContactName"].ToString()))
+//                 {
+//                     return new AppResultJson() { Status = "-1", Info = "请填写管理员姓名" };
+//                 }
+//                 if (string.IsNullOrEmpty(fields["ContactIdNumber"].ToString()))
+//                 {
+//                     return new AppResultJson() { Status = "-1", Info = "请填写管理员身份证件号码" };
+//                 }
+//                 if (function.CheckIdCard(fields["ContactIdNumber"].ToString()) == "")
+//                 {
+//                     return new AppResultJson() { Status = "-1", Info = "请填写正确的管理员身份证件号码" };
+//                 }
+//                 if (string.IsNullOrEmpty(fields["OpenId"].ToString()))
+//                 {
+//                     return new AppResultJson() { Status = "-1", Info = "请填写管理员微信openid" };
+//                 }
+//                 if (string.IsNullOrEmpty(fields["MobilePhone"].ToString()))
+//                 {
+//                     return new AppResultJson() { Status = "-1", Info = "请填写联系手机" };
+//                 }
+//                 if (function.CheckMobile(fields["MobilePhone"].ToString()) == "")
+//                 {
+//                     return new AppResultJson() { Status = "-1", Info = "请填写正确的联系手机" };
+//                 }
+//                 if (string.IsNullOrEmpty(fields["ContactEmail"].ToString()))
+//                 {
+//                     return new AppResultJson() { Status = "-1", Info = "请填写联系邮箱" };
+//                 }
+//                 if (string.IsNullOrEmpty(fields["SubjectType"].ToString()))
+//                 {
+//                     return new AppResultJson() { Status = "-1", Info = "请填写主体类型" };
+//                 }
+//                 if (string.IsNullOrEmpty(fields["LicenseNumber"].ToString()))
+//                 {
+//                     return new AppResultJson() { Status = "-1", Info = "请填写统一社会信用代码" };
+//                 }
+//                 if (string.IsNullOrEmpty(fields["LegalPerson"].ToString()))
+//                 {
+//                     return new AppResultJson() { Status = "-1", Info = "请填写个体户经营者/法人姓名" };
+//                 }
+//                 if (string.IsNullOrEmpty(fields["MerchantShortname"].ToString()))
+//                 {
+//                     return new AppResultJson() { Status = "-1", Info = "请填写商户简称" };
+//                 }
+//                 if (string.IsNullOrEmpty(fields["SalesScenesType"].ToString()))
+//                 {
+//                     return new AppResultJson() { Status = "-1", Info = "请填写经营场景类型" };
+//                 }
+//                 if (string.IsNullOrEmpty(fields["BizStoreName"].ToString()))
+//                 {
+//                     return new AppResultJson() { Status = "-1", Info = "请填写门店名称" };
+//                 }
+//                 if (string.IsNullOrEmpty(fields["BizAddressCode"].ToString()))
+//                 {
+//                     return new AppResultJson() { Status = "-1", Info = "请填写门店省市编码" };
+//                 }
+//                 if (string.IsNullOrEmpty(fields["BizStoreAddress"].ToString()))
+//                 {
+//                     return new AppResultJson() { Status = "-1", Info = "请填写门店地址" };
+//                 }
+//                 if (string.IsNullOrEmpty(fields["MpAppid"].ToString()))
+//                 {
+//                     return new AppResultJson() { Status = "-1", Info = "请填写服务商公众号APPID" };
+//                 }
+//                 if (string.IsNullOrEmpty(fields["MpSubAppid"].ToString()))
+//                 {
+//                     return new AppResultJson() { Status = "-1", Info = "请填写商家公众号APPID" };
+//                 }
+//                 if (string.IsNullOrEmpty(fields["MiniProgramAppid"].ToString()))
+//                 {
+//                     return new AppResultJson() { Status = "-1", Info = "请填写服务商小程序APPID" };
+//                 }
+//                 if (string.IsNullOrEmpty(fields["MiniProgramSubAppid"].ToString()))
+//                 {
+//                     return new AppResultJson() { Status = "-1", Info = "请填写商家小程序APPID" };
+//                 }
+//                 if (string.IsNullOrEmpty(fields["AppAppid"].ToString()))
+//                 {
+//                     return new AppResultJson() { Status = "-1", Info = "请填写服务商应用APPID" };
+//                 }
+//                 if (string.IsNullOrEmpty(fields["AppSubAppid"].ToString()))
+//                 {
+//                     return new AppResultJson() { Status = "-1", Info = "请填写商家应用APPID" };
+//                 }
+//                 if (string.IsNullOrEmpty(fields["WebDomain"].ToString()))
+//                 {
+//                     return new AppResultJson() { Status = "-1", Info = "请填写互联网网站域名" };
+//                 }
+//                 if (string.IsNullOrEmpty(fields["WebAppId"].ToString()))
+//                 {
+//                     return new AppResultJson() { Status = "-1", Info = "请填写互联网网站对应的商家APPID" };
+//                 }
+//                 if (string.IsNullOrEmpty(fields["SubCorpId"].ToString()))
+//                 {
+//                     return new AppResultJson() { Status = "-1", Info = "请填写商家企业微信CorpID" };
+//                 }
+//                 if (string.IsNullOrEmpty(fields["SettlementId"].ToString()))
+//                 {
+//                     return new AppResultJson() { Status = "-1", Info = "请填写入驻结算规则ID" };
+//                 }
+//                 if (string.IsNullOrEmpty(fields["QualificationType"].ToString()))
+//                 {
+//                     return new AppResultJson() { Status = "-1", Info = "请填写所属行业" };
+//                 }
+//                 if (string.IsNullOrEmpty(fields["ActivitiesId"].ToString()))
+//                 {
+//                     return new AppResultJson() { Status = "-1", Info = "请填写优惠费率活动ID" };
+//                 }
+//                 if (string.IsNullOrEmpty(fields["BankAccountType"].ToString()))
+//                 {
+//                     return new AppResultJson() { Status = "-1", Info = "请填写账户类型" };
+//                 }
+//                 if (string.IsNullOrEmpty(fields["AccountName"].ToString()))
+//                 {
+//                     return new AppResultJson() { Status = "-1", Info = "请填写开户名称" };
+//                 }
+//                 if (string.IsNullOrEmpty(fields["AccountBank"].ToString()))
+//                 {
+//                     return new AppResultJson() { Status = "-1", Info = "请填写开户银行" };
+//                 }
+//                 if (string.IsNullOrEmpty(fields["BankAddressCode"].ToString()))
+//                 {
+//                     return new AppResultJson() { Status = "-1", Info = "请填写开户银行省市编码" };
+//                 }
+//                 if (string.IsNullOrEmpty(fields["BankBranchId"].ToString()))
+//                 {
+//                     return new AppResultJson() { Status = "-1", Info = "请填写开户银行联行号" };
+//                 }
+//                 if (string.IsNullOrEmpty(fields["BankName"].ToString()))
+//                 {
+//                     return new AppResultJson() { Status = "-1", Info = "请填写开户银行全称" };
+//                 }
+//                 if (string.IsNullOrEmpty(fields["AccountNumber"].ToString()))
+//                 {
+//                     return new AppResultJson() { Status = "-1", Info = "请填写银行账号" };
+//                 }
+
+//             }
+//             int Id = new DbService(AppConfig.Base.mainTables, _conn).Add("MerchantAddInfo", 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["ContactName"].ToString()))
+//                 {
+//                     return new AppResultJson() { Status = "-1", Info = "请填写管理员姓名" };
+//                 }
+//                 if (string.IsNullOrEmpty(fields["ContactIdNumber"].ToString()))
+//                 {
+//                     return new AppResultJson() { Status = "-1", Info = "请填写管理员身份证件号码" };
+//                 }
+//                 if (function.CheckIdCard(fields["ContactIdNumber"].ToString()) == "")
+//                 {
+//                     return new AppResultJson() { Status = "-1", Info = "请填写正确的管理员身份证件号码" };
+//                 }
+//                 if (string.IsNullOrEmpty(fields["OpenId"].ToString()))
+//                 {
+//                     return new AppResultJson() { Status = "-1", Info = "请填写管理员微信openid" };
+//                 }
+//                 if (string.IsNullOrEmpty(fields["MobilePhone"].ToString()))
+//                 {
+//                     return new AppResultJson() { Status = "-1", Info = "请填写联系手机" };
+//                 }
+//                 if (function.CheckMobile(fields["MobilePhone"].ToString()) == "")
+//                 {
+//                     return new AppResultJson() { Status = "-1", Info = "请填写正确的联系手机" };
+//                 }
+//                 if (string.IsNullOrEmpty(fields["ContactEmail"].ToString()))
+//                 {
+//                     return new AppResultJson() { Status = "-1", Info = "请填写联系邮箱" };
+//                 }
+//                 if (string.IsNullOrEmpty(fields["SubjectType"].ToString()))
+//                 {
+//                     return new AppResultJson() { Status = "-1", Info = "请填写主体类型" };
+//                 }
+//                 if (string.IsNullOrEmpty(fields["LicenseNumber"].ToString()))
+//                 {
+//                     return new AppResultJson() { Status = "-1", Info = "请填写统一社会信用代码" };
+//                 }
+//                 if (string.IsNullOrEmpty(fields["LegalPerson"].ToString()))
+//                 {
+//                     return new AppResultJson() { Status = "-1", Info = "请填写个体户经营者/法人姓名" };
+//                 }
+//                 if (string.IsNullOrEmpty(fields["MerchantShortname"].ToString()))
+//                 {
+//                     return new AppResultJson() { Status = "-1", Info = "请填写商户简称" };
+//                 }
+//                 if (string.IsNullOrEmpty(fields["SalesScenesType"].ToString()))
+//                 {
+//                     return new AppResultJson() { Status = "-1", Info = "请填写经营场景类型" };
+//                 }
+//                 if (string.IsNullOrEmpty(fields["BizStoreName"].ToString()))
+//                 {
+//                     return new AppResultJson() { Status = "-1", Info = "请填写门店名称" };
+//                 }
+//                 if (string.IsNullOrEmpty(fields["BizAddressCode"].ToString()))
+//                 {
+//                     return new AppResultJson() { Status = "-1", Info = "请填写门店省市编码" };
+//                 }
+//                 if (string.IsNullOrEmpty(fields["BizStoreAddress"].ToString()))
+//                 {
+//                     return new AppResultJson() { Status = "-1", Info = "请填写门店地址" };
+//                 }
+//                 if (string.IsNullOrEmpty(fields["MpAppid"].ToString()))
+//                 {
+//                     return new AppResultJson() { Status = "-1", Info = "请填写服务商公众号APPID" };
+//                 }
+//                 if (string.IsNullOrEmpty(fields["MpSubAppid"].ToString()))
+//                 {
+//                     return new AppResultJson() { Status = "-1", Info = "请填写商家公众号APPID" };
+//                 }
+//                 if (string.IsNullOrEmpty(fields["MiniProgramAppid"].ToString()))
+//                 {
+//                     return new AppResultJson() { Status = "-1", Info = "请填写服务商小程序APPID" };
+//                 }
+//                 if (string.IsNullOrEmpty(fields["MiniProgramSubAppid"].ToString()))
+//                 {
+//                     return new AppResultJson() { Status = "-1", Info = "请填写商家小程序APPID" };
+//                 }
+//                 if (string.IsNullOrEmpty(fields["AppAppid"].ToString()))
+//                 {
+//                     return new AppResultJson() { Status = "-1", Info = "请填写服务商应用APPID" };
+//                 }
+//                 if (string.IsNullOrEmpty(fields["AppSubAppid"].ToString()))
+//                 {
+//                     return new AppResultJson() { Status = "-1", Info = "请填写商家应用APPID" };
+//                 }
+//                 if (string.IsNullOrEmpty(fields["WebDomain"].ToString()))
+//                 {
+//                     return new AppResultJson() { Status = "-1", Info = "请填写互联网网站域名" };
+//                 }
+//                 if (string.IsNullOrEmpty(fields["WebAppId"].ToString()))
+//                 {
+//                     return new AppResultJson() { Status = "-1", Info = "请填写互联网网站对应的商家APPID" };
+//                 }
+//                 if (string.IsNullOrEmpty(fields["SubCorpId"].ToString()))
+//                 {
+//                     return new AppResultJson() { Status = "-1", Info = "请填写商家企业微信CorpID" };
+//                 }
+//                 if (string.IsNullOrEmpty(fields["SettlementId"].ToString()))
+//                 {
+//                     return new AppResultJson() { Status = "-1", Info = "请填写入驻结算规则ID" };
+//                 }
+//                 if (string.IsNullOrEmpty(fields["QualificationType"].ToString()))
+//                 {
+//                     return new AppResultJson() { Status = "-1", Info = "请填写所属行业" };
+//                 }
+//                 if (string.IsNullOrEmpty(fields["ActivitiesId"].ToString()))
+//                 {
+//                     return new AppResultJson() { Status = "-1", Info = "请填写优惠费率活动ID" };
+//                 }
+//                 if (string.IsNullOrEmpty(fields["BankAccountType"].ToString()))
+//                 {
+//                     return new AppResultJson() { Status = "-1", Info = "请填写账户类型" };
+//                 }
+//                 if (string.IsNullOrEmpty(fields["AccountName"].ToString()))
+//                 {
+//                     return new AppResultJson() { Status = "-1", Info = "请填写开户名称" };
+//                 }
+//                 if (string.IsNullOrEmpty(fields["AccountBank"].ToString()))
+//                 {
+//                     return new AppResultJson() { Status = "-1", Info = "请填写开户银行" };
+//                 }
+//                 if (string.IsNullOrEmpty(fields["BankAddressCode"].ToString()))
+//                 {
+//                     return new AppResultJson() { Status = "-1", Info = "请填写开户银行省市编码" };
+//                 }
+//                 if (string.IsNullOrEmpty(fields["BankBranchId"].ToString()))
+//                 {
+//                     return new AppResultJson() { Status = "-1", Info = "请填写开户银行联行号" };
+//                 }
+//                 if (string.IsNullOrEmpty(fields["BankName"].ToString()))
+//                 {
+//                     return new AppResultJson() { Status = "-1", Info = "请填写开户银行全称" };
+//                 }
+//                 if (string.IsNullOrEmpty(fields["AccountNumber"].ToString()))
+//                 {
+//                     return new AppResultJson() { Status = "-1", Info = "请填写银行账号" };
+//                 }
+
+//             }
+//             new DbService(AppConfig.Base.mainTables, _conn).Edit("MerchantAddInfo", 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.mainTables, _conn).Edit("MerchantAddInfo", fields, Id);
+//         }
+
+//         /// <summary>
+//         /// 删除数据
+//         /// </summary>
+//         /// <param name="Id">主键Id</param>
+//         public static void Delete(int Id)
+//         {
+//             new DbService(AppConfig.Base.mainTables, _conn).Delete("MerchantAddInfo", 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("MerchantAddInfo", 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.MerchantAddInfo.Add(new MerchantAddInfo()
+//                 {
+//                     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)
+//         // {
+
+//         // }
+//     }
+// }

Services/MainModelsService/MerchantDepositBackService.cs

@@ -0,0 +1,263 @@
+// /*
+//  * 商户服务费退还记录
+//  */
+
+// using System;
+// using System.Collections.Generic;
+// using System.Linq;
+// using System.Data;
+// using MySystem.Models.Main;
+// using Library;
+// using LitJson;
+
+// namespace MySystem.Service.Main
+// {
+//     public class MerchantDepositBackService
+//     {
+//         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"); //商户Id
+//             fields.Add("AlipayAccountNo"); //支付宝账号
+//             fields.Add("BankCardNo"); //银行卡号
+//             fields.Add("ReturnAmount"); //退还金额
+//             fields.Add("ReturnWay"); //退还方式
+//             fields.Add("ApplyNo"); //申请单号
+//             fields.Add("UserId"); //创客Id
+//             fields.Add("Remark"); //备注
+
+//             Dictionary<string, object> obj = new DbService(AppConfig.Base.mainTables, _conn).IndexData("MerchantDepositBack", 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"); //商户Id
+//             fields.Add("AlipayAccountNo"); //支付宝账号
+//             fields.Add("BankCardNo"); //银行卡号
+//             fields.Add("ReturnAmount"); //退还金额
+//             fields.Add("ReturnWay"); //退还方式
+//             fields.Add("ApplyNo"); //申请单号
+//             fields.Add("UserId"); //创客Id
+//             fields.Add("Remark"); //备注
+
+//             Dictionary<string, object> obj = new DbService(AppConfig.Base.mainTables, _conn).IndexData("MerchantDepositBack", 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.mainTables, _conn).IndexData("MerchantDepositBack", 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 MerchantDepositBack Query(int Id)
+//         {
+//             Dictionary<string, object> obj = new DbService(AppConfig.Base.mainTables, _conn).Query("*", "MerchantDepositBack", Id);
+//             if (obj.Keys.Count > 0)
+//             {
+//                 return Newtonsoft.Json.JsonConvert.DeserializeObject<MerchantDepositBack>(Newtonsoft.Json.JsonConvert.SerializeObject(obj));
+//             }
+//             return new MerchantDepositBack();
+//         }
+
+//         /// <summary>
+//         /// 查询一条记录
+//         /// </summary>
+//         /// <param name="condition">查询条件(sql语句)</param>
+//         /// <returns></returns>
+//         public static MerchantDepositBack Query(string condition)
+//         {
+//             Dictionary<string, object> obj = new DbService(AppConfig.Base.mainTables, _conn).Query("*", "MerchantDepositBack", condition);
+//             if (obj.Keys.Count > 0)
+//             {
+//                 return Newtonsoft.Json.JsonConvert.DeserializeObject<MerchantDepositBack>(Newtonsoft.Json.JsonConvert.SerializeObject(obj));
+//             }
+//             return new MerchantDepositBack();
+//         }
+
+//         /// <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.mainTables, _conn).Query(fields, "MerchantDepositBack", condition);
+//             return obj;
+//         }
+
+//         public static decimal Sum(string condition, string field)
+//         {
+//             decimal amount = 0;
+//             Dictionary<string, object> obj = new DbService(AppConfig.Base.mainTables, _conn).Query("Sum(" + field + ") " + field + "", "MerchantDepositBack", 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.mainTables, _conn).Query("count(" + field + ") " + field + "", "MerchantDepositBack", 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.mainTables, _conn).Query("1", "MerchantDepositBack", 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.mainTables, _conn).Add("MerchantDepositBack", 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.mainTables, _conn).Edit("MerchantDepositBack", 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.mainTables, _conn).Edit("MerchantDepositBack", fields, Id);
+//         }
+
+//         /// <summary>
+//         /// 删除数据
+//         /// </summary>
+//         /// <param name="Id">主键Id</param>
+//         public static void Delete(int Id)
+//         {
+//             new DbService(AppConfig.Base.mainTables, _conn).Delete("MerchantDepositBack", 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("MerchantDepositBack", 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.MerchantDepositBack.Add(new MerchantDepositBack()
+//             //     {
+//             //         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)
+//         // {
+
+//         // }
+//     }
+// }

Services/MainModelsService/MerchantDepositOrderService.cs

@@ -0,0 +1,287 @@
+// /*
+//  * 商户服务费缴纳记录
+//  */
+
+// using System;
+// using System.Collections.Generic;
+// using System.Linq;
+// using System.Data;
+// using MySystem.Models.Main;
+// using Library;
+// using LitJson;
+
+// namespace MySystem.Service.Main
+// {
+//     public class MerchantDepositOrderService
+//     {
+//         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"); //商户Id
+//             fields.Add("UserId"); //创客Id
+//             fields.Add("ActPayPrice"); //激活支付金额
+//             fields.Add("OrderNo"); //订单号
+
+//             Dictionary<string, object> obj = new DbService(AppConfig.Base.mainTables, _conn).IndexData("MerchantDepositOrder", 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"); //商户Id
+//             fields.Add("UserId"); //创客Id
+//             fields.Add("ActPayPrice"); //激活支付金额
+//             fields.Add("OrderNo"); //订单号
+
+//             Dictionary<string, object> obj = new DbService(AppConfig.Base.mainTables, _conn).IndexData("MerchantDepositOrder", 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.mainTables, _conn).IndexData("MerchantDepositOrder", 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 MerchantDepositOrder Query(int Id)
+//         {
+//             Dictionary<string, object> obj = new DbService(AppConfig.Base.mainTables, _conn).Query("*", "MerchantDepositOrder", Id);
+//             if (obj.Keys.Count > 0)
+//             {
+//                 return Newtonsoft.Json.JsonConvert.DeserializeObject<MerchantDepositOrder>(Newtonsoft.Json.JsonConvert.SerializeObject(obj));
+//             }
+//             return new MerchantDepositOrder();
+//         }
+
+//         /// <summary>
+//         /// 查询一条记录
+//         /// </summary>
+//         /// <param name="condition">查询条件(sql语句)</param>
+//         /// <returns></returns>
+//         public static MerchantDepositOrder Query(string condition)
+//         {
+//             Dictionary<string, object> obj = new DbService(AppConfig.Base.mainTables, _conn).Query("*", "MerchantDepositOrder", condition);
+//             if (obj.Keys.Count > 0)
+//             {
+//                 return Newtonsoft.Json.JsonConvert.DeserializeObject<MerchantDepositOrder>(Newtonsoft.Json.JsonConvert.SerializeObject(obj));
+//             }
+//             return new MerchantDepositOrder();
+//         }
+
+//         /// <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.mainTables, _conn).Query(fields, "MerchantDepositOrder", condition);
+//             return obj;
+//         }
+
+//         public static decimal Sum(string condition, string field)
+//         {
+//             decimal amount = 0;
+//             Dictionary<string, object> obj = new DbService(AppConfig.Base.mainTables, _conn).Query("Sum(" + field + ") " + field + "", "MerchantDepositOrder", 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.mainTables, _conn).Query("count(" + field + ") " + field + "", "MerchantDepositOrder", 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.mainTables, _conn).Query("1", "MerchantDepositOrder", 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)
+//             {
+//                 if (string.IsNullOrEmpty(fields["MerchantId"].ToString()))
+//                 {
+//                     return new AppResultJson() { Status = "-1", Info = "请填写商户Id" };
+//                 }
+//                 if (!function.IsInt(fields["MerchantId"].ToString()))
+//                 {
+//                     return new AppResultJson() { Status = "-1", Info = "请填写正确的商户Id" };
+//                 }
+//                 if (string.IsNullOrEmpty(fields["UserId"].ToString()))
+//                 {
+//                     return new AppResultJson() { Status = "-1", Info = "请填写创客Id" };
+//                 }
+//                 if (!function.IsInt(fields["UserId"].ToString()))
+//                 {
+//                     return new AppResultJson() { Status = "-1", Info = "请填写正确的创客Id" };
+//                 }
+
+//             }
+//             int Id = new DbService(AppConfig.Base.mainTables, _conn).Add("MerchantDepositOrder", 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["MerchantId"].ToString()))
+//                 {
+//                     return new AppResultJson() { Status = "-1", Info = "请填写商户Id" };
+//                 }
+//                 if (!function.IsInt(fields["MerchantId"].ToString()))
+//                 {
+//                     return new AppResultJson() { Status = "-1", Info = "请填写正确的商户Id" };
+//                 }
+//                 if (string.IsNullOrEmpty(fields["UserId"].ToString()))
+//                 {
+//                     return new AppResultJson() { Status = "-1", Info = "请填写创客Id" };
+//                 }
+//                 if (!function.IsInt(fields["UserId"].ToString()))
+//                 {
+//                     return new AppResultJson() { Status = "-1", Info = "请填写正确的创客Id" };
+//                 }
+
+//             }
+//             new DbService(AppConfig.Base.mainTables, _conn).Edit("MerchantDepositOrder", 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.mainTables, _conn).Edit("MerchantDepositOrder", fields, Id);
+//         }
+
+//         /// <summary>
+//         /// 删除数据
+//         /// </summary>
+//         /// <param name="Id">主键Id</param>
+//         public static void Delete(int Id)
+//         {
+//             new DbService(AppConfig.Base.mainTables, _conn).Delete("MerchantDepositOrder", 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("MerchantDepositOrder", 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.MerchantDepositOrder.Add(new MerchantDepositOrder()
+//             //     {
+//             //         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)
+//         // {
+
+//         // }
+//     }
+// }

Services/MainModelsService/MerchantInfoService.cs

@@ -0,0 +1,256 @@
+// /*
+//  * 商户
+//  */
+
+// using System;
+// using System.Collections.Generic;
+// using System.Linq;
+// using System.Data;
+// using MySystem.Models.Main;
+// using Library;
+// using LitJson;
+
+// namespace MySystem.Service.Main
+// {
+//     public class MerchantInfoService
+//     {
+//         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("Name"); //名称
+//             fields.Add("Mobile"); //手机号
+//             fields.Add("Areas"); //所在地区
+//             fields.Add("Address"); //详细地址
+//             fields.Add("IsAuth"); //是否认证
+//             fields.Add("TotalAmount"); //平台总收益
+//             fields.Add("TotalOrder"); //累计订单
+//             fields.Add("TotalCustomer"); //累计客户
+//             fields.Add("TotalUser"); //会员数
+//             fields.Add("TotalActual"); //营收总额
+//             fields.Add("LastAddConsumerDate"); //最后加入会员时间
+//             fields.Add("TotalConsumeCount"); //累计消费次数
+//             fields.Add("LastConsumeDate"); //最后消费时间
+//             fields.Add("UserId"); //所属创客
+//             fields.Add("ActivationStatus"); //激活状态
+//             fields.Add("ActivationDate"); //激活时间
+
+//             Dictionary<string, object> obj = new DbService(AppConfig.Base.mainTables, _conn).IndexData("MerchantInfo", 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("Name"); //名称
+//             fields.Add("Mobile"); //手机号
+//             fields.Add("Areas"); //所在地区
+//             fields.Add("Address"); //详细地址
+//             fields.Add("IsAuth"); //是否认证
+//             fields.Add("TotalAmount"); //平台总收益
+//             fields.Add("TotalOrder"); //累计订单
+//             fields.Add("TotalCustomer"); //累计客户
+//             fields.Add("TotalUser"); //会员数
+//             fields.Add("TotalActual"); //营收总额
+//             fields.Add("LastAddConsumerDate"); //最后加入会员时间
+//             fields.Add("TotalConsumeCount"); //累计消费次数
+//             fields.Add("LastConsumeDate"); //最后消费时间
+//             fields.Add("UserId"); //所属创客
+//             fields.Add("ActivationStatus"); //激活状态
+//             fields.Add("ActivationDate"); //激活时间
+
+//             Dictionary<string, object> obj = new DbService(AppConfig.Base.mainTables, _conn).IndexData("MerchantInfo", 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 MerchantInfo Query(int Id)
+//         {
+//             WebCMSEntities db = new WebCMSEntities();
+//             MerchantInfo editData = db.MerchantInfo.FirstOrDefault(m => m.Id == Id) ?? new MerchantInfo();
+//             db.Dispose();
+//             return editData;
+//         }
+//         public static MerchantInfo Query(string condition, string fields = "*")
+//         {
+//             var merchantInfo = new DbService(AppConfig.Base.mainTables, _conn).Query(fields, "MerchantInfo", condition);
+//             if (merchantInfo.Count > 0)
+//             {
+//                 return Newtonsoft.Json.JsonConvert.DeserializeObject<MerchantInfo>(Newtonsoft.Json.JsonConvert.SerializeObject(merchantInfo));
+//             }
+//             return new MerchantInfo();
+//         }
+
+//         public static decimal Sum(string condition, string field)
+//         {
+//             var dt = new DbService(AppConfig.Base.mainTables, _conn).Query("Sum(" + field + ") " + field, "MerchantInfo", condition);
+//             decimal amount = 0;
+//             if (dt.Count > 0)
+//             {
+//                 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.mainTables, _conn).Query("Count(" + field + ") " + field, "MerchantInfo", 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.MerchantInfo.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["Name"].ToString()))
+//                 {
+//                     return new AppResultJson() { Status = "-1", Info = "请填写名称" };
+//                 }
+//                 if (string.IsNullOrEmpty(fields["Mobile"].ToString()))
+//                 {
+//                     return new AppResultJson() { Status = "-1", Info = "请填写手机号" };
+//                 }
+
+//             }
+//             int Id = new DbService(AppConfig.Base.mainTables, _conn).Add("MerchantInfo", 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["Name"].ToString()))
+//                 {
+//                     return new AppResultJson() { Status = "-1", Info = "请填写名称" };
+//                 }
+//                 if (string.IsNullOrEmpty(fields["Mobile"].ToString()))
+//                 {
+//                     return new AppResultJson() { Status = "-1", Info = "请填写手机号" };
+//                 }
+
+//             }
+//             new DbService(AppConfig.Base.mainTables, _conn).Edit("MerchantInfo", 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.mainTables, _conn).Edit("MerchantInfo", fields, Id);
+//         }
+
+//         /// <summary>
+//         /// 删除数据
+//         /// </summary>
+//         /// <param name="Id">主键Id</param>
+//         public static void Delete(int Id)
+//         {
+//             new DbService(AppConfig.Base.mainTables, _conn).Delete("MerchantInfo", 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("MerchantInfo", 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.MerchantInfo.Add(new MerchantInfo()
+//                 {
+//                     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)
+//         // {
+
+//         // }
+//     }
+// }

Services/MerchantAddInfoService.cs

@@ -105,28 +105,28 @@ namespace MySystem
             db.Dispose();
         }
 
-        /// <summary>
-        /// 导出excel表格
-        /// </summary>
-        /// <param name="fields">查询条件(单个字段)</param>
-        /// <param name="condition">查询条件(sql语句)</param>
-        /// <returns></returns>
-        public Dictionary<string, object> ExportExcel(List<FieldItem> fields, string condition, string orderby = "Id desc")
-        {
-            Dictionary<string, object> obj = new DbService(AppConfig.Base.mainTables, _conn).IndexData("MerchantAddInfo", fields, orderby, "0", 1, 20000, condition, "Id", false);
-            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
-            foreach (Dictionary<string, object> dic in diclist)
-            {
-            }
+        // /// <summary>
+        // /// 导出excel表格
+        // /// </summary>
+        // /// <param name="fields">查询条件(单个字段)</param>
+        // /// <param name="condition">查询条件(sql语句)</param>
+        // /// <returns></returns>
+        // public Dictionary<string, object> ExportExcel(List<FieldItem> fields, string condition, string orderby = "Id desc")
+        // {
+        //     Dictionary<string, object> obj = new DbService(AppConfig.Base.mainTables, _conn).IndexData("MerchantAddInfo", fields, orderby, "0", 1, 20000, condition, "Id", false);
+        //     List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
+        //     foreach (Dictionary<string, object> dic in diclist)
+        //     {
+        //     }
 
-            Dictionary<string, object> result = new Dictionary<string, object>();
-            result.Add("Status", "1");
-            result.Add("Info", "Excel报表-" + DateTime.Now.ToString("yyyy-MM-ddTHH:mm:ss") + ".xlsx");
-            result.Add("Obj", diclist);
-            Dictionary<string, object> ReturnFields = new Dictionary<string, object>();
+        //     Dictionary<string, object> result = new Dictionary<string, object>();
+        //     result.Add("Status", "1");
+        //     result.Add("Info", "Excel报表-" + DateTime.Now.ToString("yyyy-MM-ddTHH:mm:ss") + ".xlsx");
+        //     result.Add("Obj", diclist);
+        //     Dictionary<string, object> ReturnFields = new Dictionary<string, object>();
 
-            result.Add("Fields", ReturnFields);
-            return result;
-        }
+        //     result.Add("Fields", ReturnFields);
+        //     return result;
+        // }
     }
 }

Services/MerchantAmountSummayService.cs

@@ -43,6 +43,17 @@ namespace MySystem
             db.Dispose();
             return editData;
         }
+
+        public MerchantAmountSummay Query(string condition, string fields = "*")
+        {
+            var merchantAmountSummay = new DbService(AppConfig.Base.mainTables, _conn).Query(fields, "MerchantAmountSummay", condition);
+            if (merchantAmountSummay.Count > 0)
+            {
+                return Newtonsoft.Json.JsonConvert.DeserializeObject<MerchantAmountSummay>(Newtonsoft.Json.JsonConvert.SerializeObject(merchantAmountSummay));
+            }
+            return new MerchantAmountSummay();
+        }
+
         public Dictionary<string, string> Sum(string field, string condition)
         {
             Dictionary<string, string> result = new Dictionary<string, string>();
@@ -126,28 +137,28 @@ namespace MySystem
             db.Dispose();
         }
 
-        /// <summary>
-        /// 导出excel表格
-        /// </summary>
-        /// <param name="fields">查询条件(单个字段)</param>
-        /// <param name="condition">查询条件(sql语句)</param>
-        /// <returns></returns>
-        public Dictionary<string, object> ExportExcel(List<FieldItem> fields, string condition, string orderby = "Id desc")
-        {
-            Dictionary<string, object> obj = new DbService(AppConfig.Base.mainTables, _conn).IndexData("MerchantAmountSummay", fields, orderby, "0", 1, 20000, condition, "Id", false);
-            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
-            foreach (Dictionary<string, object> dic in diclist)
-            {
-            }
+        // /// <summary>
+        // /// 导出excel表格
+        // /// </summary>
+        // /// <param name="fields">查询条件(单个字段)</param>
+        // /// <param name="condition">查询条件(sql语句)</param>
+        // /// <returns></returns>
+        // public Dictionary<string, object> ExportExcel(List<FieldItem> fields, string condition, string orderby = "Id desc")
+        // {
+        //     Dictionary<string, object> obj = new DbService(AppConfig.Base.mainTables, _conn).IndexData("MerchantAmountSummay", fields, orderby, "0", 1, 20000, condition, "Id", false);
+        //     List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
+        //     foreach (Dictionary<string, object> dic in diclist)
+        //     {
+        //     }
 
-            Dictionary<string, object> result = new Dictionary<string, object>();
-            result.Add("Status", "1");
-            result.Add("Info", "Excel报表-" + DateTime.Now.ToString("yyyy-MM-ddTHH:mm:ss") + ".xlsx");
-            result.Add("Obj", diclist);
-            Dictionary<string, object> ReturnFields = new Dictionary<string, object>();
+        //     Dictionary<string, object> result = new Dictionary<string, object>();
+        //     result.Add("Status", "1");
+        //     result.Add("Info", "Excel报表-" + DateTime.Now.ToString("yyyy-MM-ddTHH:mm:ss") + ".xlsx");
+        //     result.Add("Obj", diclist);
+        //     Dictionary<string, object> ReturnFields = new Dictionary<string, object>();
 
-            result.Add("Fields", ReturnFields);
-            return result;
-        }
+        //     result.Add("Fields", ReturnFields);
+        //     return result;
+        // }
     }
 }

Util/MerchantAmountSummayUtil.cs

@@ -0,0 +1,70 @@
+// using MySystem.Models.Main;
+// using Library;
+// using MySystem.Service.Main;
+// using System.Collections.Generic;
+// using System;
+// namespace MySystem
+// {
+//     /// <summary>
+//     /// 商户业绩统计工具类
+//     /// </summary>
+//     public class MerchantAmountSummayUtil
+//     {
+//         #region 已激活商户-达标信息列表
+//         /// <summary>
+//         /// 已激活商户-达标信息列表
+//         /// </summary>
+//         /// <param name="MerchantId">商户Id</param>
+//         /// <param name="PageSize">条数</param>
+//         /// <param name="PageNum">页数</param>
+//         /// <returns></returns>
+//         public static List<Dictionary<string, object>> ListDo(int MerchantId, int PageSize, int PageNum)
+//         {
+//             List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
+//             var query = MerchantDepositOrderService.Query(" and Status=1 and MerchantId=" + MerchantId + "");
+//             var Status = 0;//活动交易状态
+//             var IsJoin = 0;//是否参加活动(0 否 1 是)
+//             if (query.Id == 0) IsJoin = 1;
+//             var month = DateTime.Parse(query.CreateDate.ToString());
+//             var TradeMonth = "";
+//             decimal TradeAmount = 0.00M;
+//             Dictionary<string, string> dic = new Dictionary<string, string>();
+//             for (int i = 0; i < 10; i++)
+//             {
+//                 month = month.AddMonths(i + 1);
+//                 TradeMonth = month.ToString("yyyy-MM");
+//                 var check = MerchantAmountSummayService.Query(" and IsAct=1 and TradeMonth='" + TradeMonth + "' and MerchantId=" + MerchantId + "");
+//                 if (check.Id > 0)
+//                 {
+//                     dic = MerchantAmountSummayService.Sum("TradeAmount", " and IsAct=1 and TradeMonth='" + TradeMonth + "'");
+//                     TradeAmount = decimal.Parse(dic["TradeAmount"].ToString());
+//                 }
+//                 if (IsJoin == 0)
+//                 {
+//                     //未参与
+//                     Status = 3;
+//                 }
+//                 else
+//                 {
+//                     //考核中
+//                     if (DateTime.Now.ToString("yyyy-MM") == TradeMonth) Status = 1;
+//                     //待考核
+//                     if (int.Parse(DateTime.Now.ToString("yyyyMM")) < int.Parse(month.ToString("yyyyMM"))) Status = 0;
+//                     //已通过
+//                     if (TradeAmount >= 10000 && IsJoin != 3 && check.Id > 0) Status = 2;
+//                     //未通过
+//                     if (TradeAmount < 10000 && IsJoin != 3 && check.Id > 0) Status = -1;
+
+//                     Dictionary<string, object> curData = new Dictionary<string, object>();
+//                     curData.Add("TradeMonth", TradeMonth); //月份
+//                     curData.Add("TradeAmount", TradeAmount); //订单金额
+//                     curData.Add("Status", Status); //状态(-1 未通过 0 待考核 1 考核中 2 已通过 3 未参与)
+//                     dataList.Add(curData);
+//                 }
+//             }
+//             return dataList;
+//         }
+//         #endregion
+
+//     }
+// }

Util/MerchantDepositBackUtil.cs

@@ -0,0 +1,52 @@
+// using MySystem.Models.Main;
+// using Library;
+// using MySystem.Service.Main;
+// using System.Collections.Generic;
+// namespace MySystem
+// {
+//     /// <summary>
+//     /// 商户服务费退还记录工具类
+//     /// </summary>
+//     public class MerchantDepositBackUtil
+//     {
+
+//         #region 商户激活—商户服务费退还
+//         /// <summary>
+//         /// 商户激活—商户服务费退还
+//         /// </summary>
+//         /// <param name="MerchantId">商户Id</param>
+//         /// <param name="ReturnWay">退还方式</param>
+//         /// <param name="MobileCode">短信验证码</param>
+//         /// <param name="ReturnNo">退还账号</param>
+//         /// <returns></returns>
+//         public static string AddMerchantDepositBackDo(int MerchantId, int ReturnWay, string MobileCode, string ReturnNo)
+//         {
+//             var query = MerchantAddInfoService.Query(MerchantId);
+//             MobileCodeCheck mobilecheck = RedisDbconn.Instance.Get<MobileCodeCheck>("MobileCodeCheck:" + query.ServicePhone);
+//             if (mobilecheck == null)
+//             {
+//                 return "短信验证码不正确";
+//             }
+//             if (mobilecheck.CheckCode != MobileCode)
+//             {
+//                 return "短信验证码不正确";
+//             }
+//             string checks = RedisDbconn.Instance.Get<string>("MerchantDepositBack:" + MerchantId);
+//             if (checks == "1")
+//             {
+//                 return "已申请退押，请勿重复申请";
+//             }
+//             RedisDbconn.Instance.Clear("MobileCodeCheck:" + query.ServicePhone);
+//             Dictionary<string, object> Obj = new Dictionary<string, object>();
+//             RedisDbconn.Instance.Set("MerchantDepositBack:" + MerchantId, "1");
+//             RedisDbconn.Instance.SetExpire("MerchantDepositBack:" + MerchantId, 10);
+//             Dictionary<string, object> fields = new Dictionary<string, object>();
+//             fields.Add("MerchantId", MerchantId); //商户Id
+//             fields.Add("ReturnWay", ReturnWay); //退还方式
+//             AppResultJson resultJson = MerchantDepositBackService.Add(fields);
+//             return "success";
+//         }
+//         #endregion
+
+//     }
+// }

Util/MerchantDepositOrderUtil.cs

@@ -0,0 +1,33 @@
+// using MySystem.Models.Main;
+// using Library;
+// using MySystem.Service.Main;
+// using System.Collections.Generic;
+// namespace MySystem
+// {
+//     /// <summary>
+//     /// 商户服务费缴纳记录工具类
+//     /// </summary>
+//     public class MerchantDepositOrderUtil
+//     {
+//         #region 添加商户服务费缴纳记录
+//         /// <summary>
+//         /// 添加商户服务费缴纳记录
+//         /// </summary>
+//         /// <param name="ConsumerId">消费者Id</param>
+//         /// <param name="OpenId">商户的OpenId</param>
+//         /// <returns></returns>
+//         public static int AddMerchantDepositOrder(string OrderNo, int UserId, int MerchantId, decimal ActPayPrice)
+//         {
+//             Dictionary<string, object> fields = new Dictionary<string, object>();
+//             fields.Add("OrderNo", OrderNo); //订单号
+//             fields.Add("UserId", UserId); //所属创客Id
+//             fields.Add("MerchantId", MerchantId); //商户Id
+//             fields.Add("ActPayPrice", ActPayPrice); //服务费总额
+//             AppResultJson resultJson = MerchantDepositOrderService.Add(fields, false);
+//             var Id = int.Parse(resultJson.Data.ToString());
+//             return Id;
+//         }
+//         #endregion
+
+//     }
+// }