暂存，自测中

Areas/Api/Controllers/Main/MerchantAmountSummayController.cs

@@ -0,0 +1,74 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+using Microsoft.AspNetCore.Authorization;
+using System.Web;
+using MySystem.Service.Main;
+using MySystem.Models;
+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) : base(accessor)
+        {
+        }
+
+
+
+
+        #region 已激活商户-达标信息列表
+        // [Authorize]
+        public JsonResult List(string value)
+        {
+            value = PublicFunction.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>>();
+            dataList = MerchantAmountSummayUtil.ListDo(MerchantId, pageSize, pageNum);
+            return dataList;
+        }
+        #endregion
+
+
+
+        #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);
+        }
+
+        #endregion
+
+    }
+}

Areas/Api/Controllers/Main/MerchantDepositBackController.cs

@@ -27,7 +27,7 @@ namespace MySystem.Areas.Api.Controllers.v1
         }
 
         #region 商户激活—商户服务费退还
-        [Authorize]
+        // [Authorize]
         public JsonResult AddMerchantDepositBack(string value)
         {
             value = DesDecrypt(value);
@@ -42,44 +42,67 @@ namespace MySystem.Areas.Api.Controllers.v1
             int ReturnWay = int.Parse(function.CheckInt(data.getItem("ReturnWay").ToString())); //退还方式
             string MobileCode = data["MobileCode"].ToString(); //短信验证码
             string ReturnNo = data["ReturnNo"].ToString(); //退还账号
-            if (string.IsNullOrEmpty(data["MerchantId"].ToString()))
+            var info = MerchantDepositBackUtil.AddMerchantDepositBackDo(MerchantId, ReturnWay, MobileCode, ReturnNo);
+            if (info == "success")
             {
-                return new AppResultJson() { Status = "-1", Info = "请填写商户Id" };
+                return new AppResultJson() { Status = "1", Info = info, Data = info };
             }
-            if (!function.IsInt(data["MerchantId"].ToString()))
+            else
             {
-                return new AppResultJson() { Status = "-1", Info = "请填写正确的商户Id" };
+                return new AppResultJson() { Status = "-1", Info = info, Data = info };
             }
-            if (string.IsNullOrEmpty(data["ReturnWay"].ToString()))
-            {
-                return new AppResultJson() { Status = "-1", Info = "请填写退还方式" };
-            }
-            if (!function.IsInt(data["ReturnWay"].ToString()))
-            {
-                return new AppResultJson() { Status = "-1", Info = "请填写正确的退还方式" };
-            }
-            MobileCodeCheck mobilecheck = RedisDbconn.Instance.Get<MobileCodeCheck>("MobileCodeCheck:手机号");
-            if (mobilecheck == null)
-            {
-                return new AppResultJson() { Status = "-1", Info = "短信验证码不正确" };
-            }
-            if (mobilecheck.CheckCode != MobileCode)
+        }
+        #endregion
+
+
+        #region 商户激活-银行选项名称
+        // [Authorize]
+        public JsonResult Options(string value)
+        {
+            value = DesDecrypt(value);
+            JsonData data = JsonMapper.ToObject(value);
+            List<Dictionary<string, object>> dataList = OptionsDo(value);
+            return Json(new AppResultJson() { Status = "1", Info = "", Data = dataList });
+        }
+        public List<Dictionary<string, object>> OptionsDo(string value)
+        {
+            JsonData data = JsonMapper.ToObject(value);
+            int PageSize = int.Parse(function.CheckInt(data["PageSize"].ToString()));
+            int PageNum = int.Parse(function.CheckInt(data["PageNum"].ToString()));
+            List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
+            var query = GetBanks();
+            foreach (string key in query.Keys)
             {
-                return new AppResultJson() { Status = "-1", Info = "短信验证码不正确" };
+                Dictionary<string, object> curData = new Dictionary<string, object>();
+                curData.Add("text", query[key]); //文本
+                curData.Add("value", key); //值
+                dataList.Add(curData);
             }
-            RedisDbconn.Instance.Clear("MobileCodeCheck:手机号");
-            Dictionary<string, object> Obj = new Dictionary<string, object>();
-            MerchantDepositBack query = new MerchantDepositBack();
-            Dictionary<string, object> fields = new Dictionary<string, object>();
-            fields.Add("CreateDate", DateTime.Now); //创建时间
-            fields.Add("UpdateDate", DateTime.Now); //修改时间
-            fields.Add("MerchantId", MerchantId); //商户Id
-            fields.Add("ReturnWay", ReturnWay); //退还方式
-            // AppResultJson resultJson = MerchantDepositBackService.Add(fields);
-
-            return new AppResultJson() { Status = "1", Info = "", Data = Obj };
+            return dataList;
         }
         #endregion
 
+        public Dictionary<string, string> GetBanks()
+        {
+            Dictionary<string, string> dic = new Dictionary<string, string>();
+            dic.Add("工商银行", "工商银行");
+            dic.Add("农业银行", "农业银行");
+            dic.Add("邮储银行", "邮储银行");
+            dic.Add("建设银行", "建设银行");
+            dic.Add("招商银行", "招商银行");
+            dic.Add("中国银行", "中国银行");
+            dic.Add("交通银行", "交通银行");
+            dic.Add("浦发银行", "浦发银行");
+            dic.Add("广发银行", "广发银行");
+            dic.Add("民生银行", "民生银行");
+            dic.Add("平安银行", "平安银行");
+            dic.Add("光大银行", "光大银行");
+            dic.Add("兴业银行", "兴业银行");
+            dic.Add("中信银行", "中信银行");
+            dic.Add("上海银行", "上海银行");
+            dic.Add("其他银行", "其他银行");
+            return dic;
+        }
+
     }
 }

Areas/Api/Controllers/Main/MerchantDepositOrderController.cs

@@ -36,19 +36,20 @@ namespace MySystem.Areas.Api.Controllers.v1
         {
             JsonData data = JsonMapper.ToObject(value);
             int PayMode = int.Parse(function.CheckInt(data["PayMode"].ToString())); //支付方式(1 支付宝)
+            int MerchantId = int.Parse(function.CheckInt(data["MerchantId"].ToString())); //商户Id
+            int Id = int.Parse(function.CheckInt(data["Id"].ToString())); //订单记录Id
             Dictionary<string, object> Obj = new Dictionary<string, object>();
-            int MerchantId = int.Parse(function.CheckInt(data["MerchantId"].ToString()));
-            int Id = int.Parse(function.CheckInt(data["Id"].ToString()));
-            Orders query = db.Orders.FirstOrDefault(m => m.Id == Id);
-            if (query != null)
+            var query = MerchantDepositOrderService.Query(Id);
+            if (query.Id > 0)
             {
-                query.PayMode = PayMode; //支付方式
-                kxsdb.SaveChanges();
+                Dictionary<string, object> fields = new Dictionary<string, object>();
+                fields.Add("Sort", PayMode); //订单号
+                MerchantDepositOrderService.Edit(fields, Id, false);
                 string PayData = "";
-                PublicAccountSet set = new AlipayFunctionForKxs(_accessor.HttpContext).SetData(MerchantId);
+                Models.KxsMainModels.PublicAccountSet set = new AlipayFunctionForKxs(_accessor.HttpContext).SetData(MerchantId);
                 if (PayMode == 1)
                 {
-                    string TotalPrice = query.TotalPrice.ToString();
+                    string TotalPrice = query.ActPayPrice.ToString();
                     function.WriteLog(query.OrderNo, "支付宝支付日志");
                     function.WriteLog(TotalPrice.ToString(), "支付宝支付日志");
                     function.WriteLog("商户激活—确认订单", "支付宝支付日志");
@@ -78,6 +79,7 @@ namespace MySystem.Areas.Api.Controllers.v1
             JsonData data = JsonMapper.ToObject(value);
             int MerchantId = int.Parse(function.CheckInt(data["MerchantId"].ToString())); //商户Id
             Dictionary<string, object> Obj = new Dictionary<string, object>();
+            MerchantInfo merchant = MerchantInfoService.Query(MerchantId);
             string OrderNo = "SHJH" + DateTime.Now.ToString("yyyyMMddHHmmssfff") + function.get_Random(8);
             string check = RedisDbconn.Instance.Get<string>("ConfirmOrder:" + MerchantId + "_" + OrderNo);
             if (!string.IsNullOrEmpty(check))
@@ -85,21 +87,42 @@ namespace MySystem.Areas.Api.Controllers.v1
                 return new AppResultJson() { Status = "-1", Info = "请勿重复下单！" };
             }
             RedisDbconn.Instance.Set("ConfirmOrder:" + MerchantId + "_" + OrderNo, "1");
-            RedisDbconn.Instance.SetExpire("ConfirmOrder:" + MerchantId + "_" + OrderNo, 60);
+            RedisDbconn.Instance.SetExpire("ConfirmOrder:" + MerchantId + "_" + OrderNo, 10);
             decimal ActPayPrice = 365; //服务费总额
-            // MerchantActOrders query = maindb.MerchantActOrders.Add(new MerchantActOrders()
-            // {
-            //     OrderNo = OrderNo,
-            //     UserId = UserId, //创客
-            //     MerchantId = MerchantId, //商户Id
-            //     ActPayPrice = ActPayPrice, //服务费总额
-            // }).Entity;
-            // maindb.SaveChanges();
-            // Obj.Add("Id", query.Id); //Id
-            // Obj.Add("CreateDate", query.CreateDate); //创建时间
+            var Id = MerchantDepositOrderUtil.AddMerchantDepositOrder(OrderNo, merchant.UserId, MerchantId, ActPayPrice);
+            var query = MerchantDepositOrderService.Query(Id);
+            Obj.Add("Id", Id); //Id
+            Obj.Add("CreateDate", query.CreateDate); //创建时间
             return new AppResultJson() { Status = "1", Info = "", Data = Obj };
         }
         #endregion
 
+
+        #region 已激活商户-活动时间
+        // [Authorize]
+        public JsonResult Info(string value)
+        {
+            value = PublicFunction.DesDecrypt(value); ;
+            JsonData data = JsonMapper.ToObject(value);
+            Dictionary<string, object> Obj = InfoDo(value);
+            return Json(new AppResultJson() { Status = "1", Info = "", Data = Obj });
+        }
+        private Dictionary<string, object> InfoDo(string value)
+        {
+            JsonData data = JsonMapper.ToObject(value);
+            int MerchantId = int.Parse(function.CheckInt(data["MerchantId"].ToString())); //商户Id
+            Dictionary<string, object> Obj = new Dictionary<string, object>();
+            var query = MerchantDepositOrderService.Query(" and Status=1 and MerchantId=" + MerchantId + "");
+            var CreateDate = DateTime.Parse(query.CreateDate.ToString()).Year + "年" + DateTime.Parse(query.CreateDate.ToString()).Month + "月" + DateTime.Parse(query.CreateDate.ToString()).Day + "日";
+            var StartDate = DateTime.Parse(query.CreateDate.ToString()).AddMonths(1).Year + "年" + DateTime.Parse(query.CreateDate.ToString()).AddMonths(1).Month + "月";
+            var EndDate = DateTime.Parse(query.CreateDate.ToString()).AddMonths(11).Year + "年" + DateTime.Parse(query.CreateDate.ToString()).AddMonths(11).Month + "月";
+            Obj.Add("CreateDate", CreateDate); //参与时间
+            Obj.Add("StartDate", StartDate); //考核开始时间
+            Obj.Add("EndDate", EndDate); //考核结束时间
+
+            return Obj;
+        }
+        #endregion
+
     }
 }

Areas/Api/Controllers/Main/MerchantInfoController.cs

@@ -352,6 +352,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 = MerchantDepositOrderService.Query(" and Status=1 and MerchantId=" + Id + "");
+                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
@@ -497,7 +514,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);
             }
@@ -674,6 +691,17 @@ 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 = MerchantDepositOrderService.Query(" and Status=1 and MerchantId=" + Id + "");
+                var IsPay = 0;
+                if (orderInfo.Id > 0)
+                {
+                    IsPay = 1;
+                }
+                Obj.Add("IsPay", IsPay); //是否缴纳服务费(0 否 1 是)
+            }
             return Obj;
         }
         private string GetMainStatusName(int AlipayStatus, int WeChatStatus)
@@ -739,6 +767,7 @@ namespace MySystem.Areas.Api.Controllers.v1
             Obj.Add("Logo", DefaultPic(query.Logo)); //Logo图片
             Obj.Add("DiviPercent", set.IsAll == 1 ? 0M : set.DiviPercent);
             Obj.Add("MinPayMoney", set.MinPayMoney);
+            Obj.Add("IsAct", query.IsAct); //是否激活(0 否 1 是)
             return Obj;
         }
         #endregion

Areas/Api/Controllers/Main/PayController.cs

@@ -1,129 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Data;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
-using Microsoft.AspNetCore.Authorization;
-using System.Web;
-using MySystem.Models.KxsMainModels;
-using LitJson;
-using Library;
-
-namespace MySystem.Areas.Api.Controllers.v1.pos
-{
-    [Area("Api")]
-    [Route("Api/v1/[controller]/[action]")]
-    public class PayController : BaseController
-    {
-        public PayController(IHttpContextAccessor accessor) : base(accessor)
-        {
-        }
-
-
-        #region 商户激活-确认支付
-        // [Authorize]
-        public JsonResult Pay(string value)
-        {
-            value = DesDecrypt(value);
-            JsonData data = JsonMapper.ToObject(value);
-            AppResultJson result = PayDo(value);
-            return Json(new AppResultJson() { Status = result.Status, Info = result.Info, Data = result.Data });
-        }
-        public AppResultJson PayDo(string value)
-        {
-            JsonData data = JsonMapper.ToObject(value);
-            int PayMode = int.Parse(function.CheckInt(data["PayMode"].ToString())); //支付方式(1 支付宝)
-            Dictionary<string, object> Obj = new Dictionary<string, object>();
-            int MerchantId = int.Parse(function.CheckInt(data["MerchantId"].ToString()));
-            int Id = int.Parse(function.CheckInt(data["Id"].ToString()));
-            Orders query = kxsdb.Orders.FirstOrDefault(m => m.Id == Id);
-            if (query != null)
-            {
-                query.PayMode = PayMode; //支付方式
-                kxsdb.SaveChanges();
-                string PayData = "";
-                PublicAccountSet set = new AlipayFunctionForKxs(_accessor.HttpContext).SetData(MerchantId);
-                if (PayMode == 1)
-                {
-                    string TotalPrice = query.TotalPrice.ToString();
-                    function.WriteLog(query.OrderNo, "支付宝支付日志");
-                    function.WriteLog(TotalPrice.ToString(), "支付宝支付日志");
-                    function.WriteLog("商户激活—确认订单", "支付宝支付日志");
-                    string ProductName = "商户激活—确认订单";
-                    PayData = new Alipay.AlipayPublicClass(_accessor.HttpContext).GetAlipayInfo(query.OrderNo, TotalPrice, ProductName, set.AlipayAppId, set.AlipayPrivateKey, SpHost + "/Api/Alipay/NoticePay");
-                    function.WriteLog(PayData, "支付宝支付日志");
-                }
-                Obj.Add("PayData", PayData); //支付宝微信SDK所需数据
-            }
-            return new AppResultJson() { Status = "1", Info = "", Data = Obj };
-        }
-        #endregion
-
-
-        #region 商户激活—确认订单
-        // [Authorize]
-        public JsonResult ConfirmOrder(string value)
-        {
-            value = DesDecrypt(value);
-            JsonData data = JsonMapper.ToObject(value);
-            AppResultJson result = ConfirmOrderDo(value);
-            return Json(new AppResultJson() { Status = result.Status, Info = result.Info, Data = result.Data });
-        }
-        public AppResultJson ConfirmOrderDo(string value)
-        {
-            function.WriteLog(value, "商户激活—确认订单");
-            JsonData data = JsonMapper.ToObject(value);
-            int MerchantId = int.Parse(function.CheckInt(data["MerchantId"].ToString())); //商户Id
-            Dictionary<string, object> Obj = new Dictionary<string, object>();
-            string OrderNo = "SHJH" + DateTime.Now.ToString("yyyyMMddHHmmssfff") + function.get_Random(8);
-            string check = RedisDbconn.Instance.Get<string>("ConfirmOrder:" + MerchantId + "_" + OrderNo);
-            if (!string.IsNullOrEmpty(check))
-            {
-                return new AppResultJson() { Status = "-1", Info = "请勿重复下单！" };
-            }
-            RedisDbconn.Instance.Set("ConfirmOrder:" + MerchantId + "_" + OrderNo, "1");
-            RedisDbconn.Instance.SetExpire("ConfirmOrder:" + MerchantId + "_" + OrderNo, 60);
-            decimal ActPayPrice = 365; //服务费总额
-            // MerchantActOrders query = maindb.MerchantActOrders.Add(new MerchantActOrders()
-            // {
-            //     OrderNo = OrderNo,
-            //     UserId = UserId, //创客
-            //     MerchantId = MerchantId, //商户Id
-            //     ActPayPrice = ActPayPrice, //服务费总额
-            // }).Entity;
-            // maindb.SaveChanges();
-            // Obj.Add("Id", query.Id); //Id
-            // Obj.Add("CreateDate", query.CreateDate); //创建时间
-            return new AppResultJson() { Status = "1", Info = "", Data = Obj };
-        }
-        #endregion
-
-
-
-        #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);
-        }
-
-        #endregion
-
-    }
-}

Service/Main/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)
+        // {
+
+        // }
+    }
+}

Service/Main/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)
+        // {
+
+        // }
+    }
+}

Util/Main/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/Main/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/Main/MerchantDepositOrderUtil.cs

@@ -0,0 +1,35 @@
+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="OrderNo">订单号</param>
+        /// <param name="UserId">创客Id</param>
+        /// <param name="MerchantId">商户Id</param>
+        /// <param name="ActPayPrice">总金额</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
+
+    }
+}