暂存，自测中

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

@@ -52,8 +52,8 @@ namespace MySystem.Areas.Api.Controllers.v1
             {
                 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)
+                var check = new MerchantAmountSummayService().QueryAmount("TradeAmount", " and IsAct=1 and TradeMonth='" + TradeMonth + "' and MerchantId=" + MerchantId + "");
+                if (check.Count > 0)
                 {
                     dic = new MerchantAmountSummayService().Sum("TradeAmount", " and IsAct=1 and TradeMonth='" + TradeMonth + "'");
                     TradeAmount = decimal.Parse(dic["TradeAmount"].ToString());
@@ -70,9 +70,9 @@ namespace MySystem.Areas.Api.Controllers.v1
                     //待考核
                     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.Count > 0) Status = 2;
                     //未通过
-                    if (TradeAmount < 10000 && IsJoin != 3 && check.Id > 0) Status = -1;
+                    if (TradeAmount < 10000 && IsJoin != 3 && check.Count > 0) Status = -1;
 
                     Dictionary<string, object> curData = new Dictionary<string, object>();
                     curData.Add("TradeMonth", TradeMonth); //月份

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

@@ -1,106 +1,129 @@
-// 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 MerchantDepositBackController : BaseController
-//     {
-//         public MerchantDepositBackController(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 MerchantDepositBackController : BaseController
+    {
+        public MerchantDepositBackController(IHttpContextAccessor accessor, ILogger<BaseController> logger, IOptions<Setting> setting) : base(accessor, logger, setting)
+        {
+        }
 
 
 
 
-//         #region 商户激活-商户服务费退还
-//         [Authorize]
-//         public JsonResult AddMerchantDepositBack(string value)
-//         {
-//             value = DesDecrypt(value);
-//             JsonData data = JsonMapper.ToObject(value);
-//             AppResultJson result = AddMerchantDepositBackDo(value);
-//             return Json(new AppResultJson() { Status = result.Status, Info = result.Info, Data = result.Data });
-//         }
-//         private AppResultJson AddMerchantDepositBackDo(string value)
-//         {
-//             JsonData data = JsonMapper.ToObject(value);
-//             int MerchantId = int.Parse(function.CheckInt(data["MerchantId"].ToString())); //商户Id
-//             int ReturnWay = int.Parse(function.CheckInt(data["ReturnWay"].ToString())); //退还方式
-//             string MobileCode = data["MobileCode"].ToString(); //短信验证码
-//             string ReturnNo = data["ReturnNo"].ToString(); //退还账号
-//             if (string.IsNullOrEmpty(data["MerchantId"].ToString()))
-//             {
-//                 return new AppResultJson() { Status = "-1", Info = "请填写商户Id" };
-//             }
-//             if (!function.IsInt(data["MerchantId"].ToString()))
-//             {
-//                 return new AppResultJson() { Status = "-1", Info = "请填写正确的商户Id" };
-//             }
-//             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)
-//             {
-//                 return new AppResultJson() { Status = "-1", Info = "短信验证码不正确" };
-//             }
-//             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("create_date", DateTime.Now); //创建时间
-//             fields.Add("update_date", DateTime.Now); //修改时间
-//             fields.Add("MerchantId", MerchantId); //商户Id
-//             fields.Add("ReturnWay", ReturnWay); //退还方式
-//             AppResultJson resultJson = MerchantDepositBackService.Add(fields, false);
+        #region 商户激活-商户服务费退还
+        [Authorize]
+        public JsonResult AddMerchantDepositBack(string value)
+        {
+            value = DesDecrypt(value);
+            JsonData data = JsonMapper.ToObject(value);
+            AppResultJson result = AddMerchantDepositBackDo(value);
+            return Json(new AppResultJson() { Status = result.Status, Info = result.Info, Data = result.Data });
+        }
+        private AppResultJson AddMerchantDepositBackDo(string value)
+        {
+            JsonData data = JsonMapper.ToObject(value);
+            int MerchantId = int.Parse(function.CheckInt(data["MerchantId"].ToString())); //商户Id
+            int ReturnWay = int.Parse(function.CheckInt(data["ReturnWay"].ToString())); //退还方式
+            string MobileCode = data["MobileCode"].ToString(); //短信验证码
+            string ReturnNo = data["ReturnNo"].ToString(); //退还账号
+            var info = MerchantDepositBackUtil.AddMerchantDepositBackDo(MerchantId, ReturnWay, MobileCode, ReturnNo);
+            if (info == "success")
+            {
+                return new AppResultJson() { Status = "1", Info = info, Data = info };
+            }
+            else
+            {
+                return new AppResultJson() { Status = "-1", Info = info, Data = info };
+            }
+        }
+        #endregion
 
-//             return new AppResultJson() { Status = "1", Info = "", Data = Obj };
-//         }
-//         #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)
+            {
+                Dictionary<string, object> curData = new Dictionary<string, object>();
+                curData.Add("text", query[key]); //文本
+                curData.Add("value", key); //值
+                dataList.Add(curData);
+            }
+            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;
+        }
 
-//         #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
+        #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/v1/MainServer/MerchantDepositOrderController.cs

@@ -1,147 +1,155 @@
-// 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 MerchantDepositOrderController : BaseController
-//     {
-//         public MerchantDepositOrderController(IHttpContextAccessor accessor, ILogger<BaseController> logger, IOptions<Setting> setting) : base(accessor, logger, setting)
-//         {
-//         }
-
-
-
-
-//         #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 });
-//         }
-//         private AppResultJson PayDo(string value)
-//         {
-//             JsonData data = JsonMapper.ToObject(value);
-//             int MerchantId = int.Parse(function.CheckInt(data["MerchantId"].ToString())); //商户Id
-//             string PayMode = data["PayMode"].ToString(); //支付方式(1 支付宝)
-//             if (string.IsNullOrEmpty(data["MerchantId"].ToString()))
-//             {
-//                 return new AppResultJson() { Status = "-1", Info = "请填写商户Id" };
-//             }
-//             if (!function.IsInt(data["MerchantId"].ToString()))
-//             {
-//                 return new AppResultJson() { Status = "-1", Info = "请填写正确的商户Id" };
-//             }
-//             Dictionary<string, object> Obj = new Dictionary<string, object>();
-//             MerchantDepositOrder query = new MerchantDepositOrder();
-//             Dictionary<string, object> fields = new Dictionary<string, object>();
-//             fields.Add("create_date", DateTime.Now); //创建时间
-//             fields.Add("update_date", DateTime.Now); //修改时间
-//             fields.Add("MerchantId", MerchantId); //商户Id
-//             AppResultJson resultJson = MerchantDepositOrderService.Add(fields, false);
-
-//             return new AppResultJson() { Status = "1", Info = "", Data = Obj };
-//         }
-//         #endregion
-
-
-
-//         #region 商户激活-确认订单
-//         [Authorize]
-//         public JsonResult ConfirmOrder(string value)
-//         {
-//             value = PublicFunction.DesDecrypt(value); ;
-//             JsonData data = JsonMapper.ToObject(value);
-//             AppResultJson result = ConfirmOrderDo(value);
-//             return Json(new AppResultJson() { Status = result.Status, Info = result.Info, Data = result.Data });
-//         }
-//         private AppResultJson ConfirmOrderDo(string value)
-//         {
-//             JsonData data = JsonMapper.ToObject(value);
-//             int MerchantId = int.Parse(function.CheckInt(data["MerchantId"].ToString())); //商户Id
-//             if (string.IsNullOrEmpty(data["MerchantId"].ToString()))
-//             {
-//                 return new AppResultJson() { Status = "-1", Info = "请填写商户Id" };
-//             }
-//             if (!function.IsInt(data["MerchantId"].ToString()))
-//             {
-//                 return new AppResultJson() { Status = "-1", Info = "请填写正确的商户Id" };
-//             }
-//             Dictionary<string, object> Obj = new Dictionary<string, object>();
-//             MerchantDepositOrder query = new MerchantDepositOrder();
-//             Dictionary<string, object> fields = new Dictionary<string, object>();
-//             fields.Add("create_date", DateTime.Now); //创建时间
-//             fields.Add("update_date", DateTime.Now); //修改时间
-//             fields.Add("MerchantId", MerchantId); //商户Id
-//             AppResultJson resultJson = MerchantDepositOrderService.Add(fields, false);
-//             Obj.Add("id", query.Id); //id
-//             Obj.Add("create_date", 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>();
-//             MerchantDepositOrder query = new MerchantDepositOrder();
-//             query = MerchantDepositOrderService.Query(id);
-//             Obj.Add("StartDate", ""); //考核开始时间
-//             Obj.Add("EndDate", ""); //考核结束时间
-
-//             return 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
-
-//     }
-// }
+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 MySystem.Service.Main;
+
+namespace MySystem.Areas.Api.Controllers.v1
+{
+    [Area("Api")]
+    [Route("Api/v1/[controller]/[action]")]
+    public class MerchantDepositOrderController : BaseController
+    {
+        public MerchantDepositOrderController(IHttpContextAccessor accessor, ILogger<BaseController> logger, IOptions<Setting> setting) : base(accessor, logger, setting)
+        {
+        }
+
+
+
+
+        #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 支付宝)
+            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>();
+            var query = new MerchantDepositOrderService().QueryById(Id);
+            if (query.Id > 0)
+            {
+                Dictionary<string, object> fields = new Dictionary<string, object>();
+                fields.Add("Sort", PayMode); //订单号
+                MerchantDepositOrderService.Edit(fields, Id, false);
+                string PayData = "";
+                KxsMainModels.PublicAccountSet set = new AlipayFunctionForKxs(_accessor.HttpContext).SetData(MerchantId);
+                if (PayMode == 1)
+                {
+                    string TotalPrice = query.ActPayPrice.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 });
+        }
+        private 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>();
+            MerchantInfo merchant = new 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))
+            {
+                return new AppResultJson() { Status = "-1", Info = "请勿重复下单！" };
+            }
+            RedisDbconn.Instance.Set("ConfirmOrder:" + MerchantId + "_" + OrderNo, "1");
+            RedisDbconn.Instance.SetExpire("ConfirmOrder:" + MerchantId + "_" + OrderNo, 10);
+            decimal ActPayPrice = 365; //服务费总额
+            var Id = MerchantDepositOrderUtil.AddMerchantDepositOrder(OrderNo, merchant.UserId, MerchantId, ActPayPrice);
+            var query = new MerchantDepositOrderService().QueryById(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 = 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 = new MerchantInfoService().Query(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
+
+
+
+        #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/v1/MainServer/MerchantInfoController.cs

@@ -864,6 +864,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 是)
             }
             else
             {
@@ -876,6 +877,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;
         }

Services/MainModelsService/MerchantAddInfoService.cs

@@ -1,483 +0,0 @@
-// /*
-//  * 商户进件资料
-//  */
-
-// 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

@@ -1,263 +0,0 @@
-// /*
-//  * 商户服务费退还记录
-//  */
-
-// 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

@@ -1,287 +0,0 @@
-// /*
-//  * 商户服务费缴纳记录
-//  */
-
-// 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/MerchantAmountSummayService.cs

@@ -44,14 +44,25 @@ namespace MySystem
             return editData;
         }
 
-        public MerchantAmountSummay Query(string condition, string fields = "*")
+        public Dictionary<string, string> QueryAmount(string field, string condition)
         {
-            var merchantAmountSummay = new DbService(AppConfig.Base.mainTables, _conn).Query(fields, "MerchantAmountSummay", condition);
-            if (merchantAmountSummay.Count > 0)
+            Dictionary<string, string> result = new Dictionary<string, string>();
+            string sumString = "";
+            string[] fieldlist = field.Split(',');
+            foreach(string f in fieldlist)
             {
-                return Newtonsoft.Json.JsonConvert.DeserializeObject<MerchantAmountSummay>(Newtonsoft.Json.JsonConvert.SerializeObject(merchantAmountSummay));
+                sumString += "sum(" + f + ") " + f + ",";
             }
-            return new MerchantAmountSummay();
+            sumString = sumString.TrimEnd(',');
+            DataTable dt = CustomerSqlConn.dtable("select " + sumString + " from MerchantAmountSummay where 1=1" + condition, _conn);
+            if(dt.Rows.Count > 0)
+            {
+                foreach(string f in fieldlist)
+                {
+                    result.Add(f, function.CheckNum(dt.Rows[0][f].ToString()));
+                }
+            }
+            return result;
         }
 
         public Dictionary<string, string> Sum(string field, string condition)

Services/MerchantDepositBackService.cs

@@ -1,263 +1,162 @@
-// /*
-//  * 商户服务费退还记录
-//  */
-
-// using System;
-// using System.Collections.Generic;
-// using System.Linq;
-// using System.Data;
-// using MySystem.Models.QrCodePlateMain;
-// using Library;
-// using LitJson;
-
-// namespace MySystem.Service.QrCodePlateMain
-// {
-//     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.dbTables, _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.dbTables, _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.dbTables, _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.dbTables, _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.dbTables, _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.dbTables, _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.dbTables, _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.dbTables, _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.dbTables, _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.dbTables, _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.dbTables, _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.dbTables, _conn).Edit("MerchantDepositBack", fields, Id);
-//         }
-
-//         /// <summary>
-//         /// 删除数据
-//         /// </summary>
-//         /// <param name="Id">主键Id</param>
-//         public static void Delete(int Id)
-//         {
-//             new DbService(AppConfig.Base.dbTables, _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.dbTables, _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)
-//         // {
-            
-//         // }
-//     }
-// }
+/*
+ * 商户服务费退还记录
+ */
+
+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 MerchantDepositBackService
+    {
+     string _conn = ConfigurationManager.AppSettings["SqlConnStr"].ToString();
+
+        /// <summary>
+        /// 查询列表
+        /// </summary>
+        /// <param name="fields">查询条件(单个字段)</param>
+        /// <param name="condition">查询条件(sql语句)</param>
+        /// <param name="page">页码</param>
+        /// <param name="limit">每页条数</param>
+        /// <returns></returns>
+        public List<Dictionary<string, object>> List(List<FieldItem> fields, string condition, int page = 1, int limit = 30, string orderby = "Id desc")
+        {
+            Dictionary<string, object> obj = new DbService(AppConfig.Base.mainTables, _conn).IndexData("MerchantDepositBack", fields, orderby, "0", page, limit, condition);
+            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
+            return diclist;
+        }
+
+        /// <summary>
+        /// 查询一条记录
+        /// </summary>
+        /// <param name="Id">主键Id</param>
+        /// <returns></returns>
+        public MerchantDepositBack Query(int MerchantId)
+        {
+            WebCMSEntities db = new WebCMSEntities();
+            MerchantDepositBack editData = db.MerchantDepositBack.FirstOrDefault(m => m.Status == 1 && m.MerchantId == MerchantId) ?? new MerchantDepositBack();
+            db.Dispose();
+            return editData;
+        }
+
+        public Dictionary<string, string> Sum(string field, string condition)
+        {
+            Dictionary<string, string> result = new Dictionary<string, string>();
+            string sumString = "";
+            string[] fieldlist = field.Split(',');
+            foreach(string f in fieldlist)
+            {
+                sumString += "sum(" + f + ") " + f + ",";
+            }
+            sumString = sumString.TrimEnd(',');
+            DataTable dt = CustomerSqlConn.dtable("select " + sumString + " from MerchantDepositBack where 1=1" + condition, _conn);
+            if(dt.Rows.Count > 0)
+            {
+                foreach(string f in fieldlist)
+                {
+                    result.Add(f, function.CheckNum(dt.Rows[0][f].ToString()));
+                }
+            }
+            return result;
+        }
+
+        /// <summary>
+        /// 添加数据
+        /// </summary>
+        /// <param name="Fields">要设置的字段</param>
+        /// <returns></returns>
+        public 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 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 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 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 void Sort(int Id, int Sort)
+        {
+            new DbService(AppConfig.Base.mainTables, _conn).Sort("MerchantDepositBack", Sort, Id);
+        }
+
+        /// <summary>
+        /// 导入数据
+        /// </summary>
+        /// <param name="ExcelData">json数据</param>
+        public 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 void ExportExcel(List<RelationData> relationData, string condition)
+        // {
+
+        // }
+    }
+}

Services/MerchantDepositOrderService.cs

@@ -1,287 +1,238 @@
-// /*
-//  * 商户服务费缴纳记录
-//  */
-
-// using System;
-// using System.Collections.Generic;
-// using System.Linq;
-// using System.Data;
-// using MySystem.Models.QrCodePlateMain;
-// using Library;
-// using LitJson;
-
-// namespace MySystem.Service.QrCodePlateMain
-// {
-//     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.dbTables, _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.dbTables, _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.dbTables, _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.dbTables, _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.dbTables, _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.dbTables, _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.dbTables, _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.dbTables, _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.dbTables, _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.dbTables, _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.dbTables, _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.dbTables, _conn).Edit("MerchantDepositOrder", fields, Id);
-//         }
-
-//         /// <summary>
-//         /// 删除数据
-//         /// </summary>
-//         /// <param name="Id">主键Id</param>
-//         public static void Delete(int Id)
-//         {
-//             new DbService(AppConfig.Base.dbTables, _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.dbTables, _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)
-//         // {
-            
-//         // }
-//     }
-// }
+/*
+ * 商户服务费缴纳记录
+ */
+
+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 MerchantDepositOrderService
+    {
+        static string _conn = ConfigurationManager.AppSettings["SqlConnStr"].ToString();
+
+        /// <summary>
+        /// 查询列表
+        /// </summary>
+        /// <param name="fields">查询条件(单个字段)</param>
+        /// <param name="condition">查询条件(sql语句)</param>
+        /// <param name="page">页码</param>
+        /// <param name="limit">每页条数</param>
+        /// <returns></returns>
+        public List<Dictionary<string, object>> List(List<FieldItem> fields, string condition, int page = 1, int limit = 30, string orderby = "Id desc")
+        {
+            Dictionary<string, object> obj = new DbService(AppConfig.Base.mainTables, _conn).IndexData("MerchantDepositOrder", fields, orderby, "0", page, limit, condition);
+            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
+            return diclist;
+        }
+
+        /// <summary>
+        /// 通过商户Id查询一条记录
+        /// </summary>
+        /// <param name="MerchantId">商户Id</param>
+        /// <returns></returns>
+        public MerchantDepositOrder QueryByMerchantId(int MerchantId)
+        {
+            WebCMSEntities db = new WebCMSEntities();
+            MerchantDepositOrder editData = db.MerchantDepositOrder.FirstOrDefault(m => m.Status == 1 && m.MerchantId == MerchantId) ?? new MerchantDepositOrder();
+            db.Dispose();
+            return editData;
+        }
+
+        /// <summary>
+        /// 通过Id查询一条记录
+        /// </summary>
+        /// <param name="Id">主键Id</param>
+        /// <returns></returns>
+        public MerchantDepositOrder QueryById(int Id)
+        {
+            WebCMSEntities db = new WebCMSEntities();
+            MerchantDepositOrder editData = db.MerchantDepositOrder.FirstOrDefault(m =>  m.Id == Id) ?? new MerchantDepositOrder();
+            db.Dispose();
+            return editData;
+        }
+
+        public Dictionary<string, string> Sum(string field, string condition)
+        {
+            Dictionary<string, string> result = new Dictionary<string, string>();
+            string sumString = "";
+            string[] fieldlist = field.Split(',');
+            foreach(string f in fieldlist)
+            {
+                sumString += "sum(" + f + ") " + f + ",";
+            }
+            sumString = sumString.TrimEnd(',');
+            DataTable dt = CustomerSqlConn.dtable("select " + sumString + " from MerchantDepositOrder where 1=1" + condition, _conn);
+            if(dt.Rows.Count > 0)
+            {
+                foreach(string f in fieldlist)
+                {
+                    result.Add(f, function.CheckNum(dt.Rows[0][f].ToString()));
+                }
+            }
+            return result;
+        }
+
+        // /// <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/Kxs/AlipayFunctionForKxs.cs

@@ -0,0 +1,441 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Aop.Api;
+using Library;
+using LitJson;
+using Microsoft.AspNetCore.Http;
+using Aop.Api.Request;
+using Aop.Api.Response;
+using Aop.Api.Util;
+using System.Collections;
+using MySystem.KxsMainModels;
+
+namespace MySystem
+{
+    public class AlipayFunctionForKxs
+    {
+        private HttpContext _context;
+        private string AppId = "2021003116616751";
+        private string PrivateKey = "MIIEpAIBAAKCAQEA1KjMzZJIRG6QQ3+c/euVrc+8RR0xMw6A+EONSKhJq4Bg+rtxQPCfdF2bpZ4NMaSqfalSiLoxrZSYBYOZhpDP67i9LXGUoFCWdRL7ROTqJvuU6KyEeMplQ6Q3uwWbuKbh9COt0vhqn/pjlUsomTwq+DRQv10awynkZikqceXdP0EH4iGZG0hyerEP5yLHpHiggf4f7TOsovHX+fGLPmWFO1zUTHHbz7HxU4BQKn3yuje4yMhoyv5h/wZzeVwvj+Qti8Hlh351rF0f5BHwN1YMGIrWuPU5bF8OMHS/UXPxh7Bs795ZZyplYztTz26QfKfLWVVsLOng4pvgPS+OgzZydwIDAQABAoIBAEu6mMQT9Zw46zK+PP/HZxPwSBEsphqSbab7F1LqauGh4+cl3NzNU1szAnxl3jjxdK0vIO8DrzErGz/Lb16WLxS4QtXt/olgaVPjoIsWIbQkHxEEbmA9YvZFgnsdMij9dLVmBz57rCywE8pUa262GG8u4hpjY2Zggq9GtZC91J3zOeETBG828gU+FLHGcDpfz7pD1jC0noDfDRxmIImOMZvChIvvY+tm6MpySXN8lw1vxhLc0aZbKSQkuVyCyB4fIsdJJvh2dRPiY+BA0jXNK3mWwnnHzac/9JXqWFlwk6iPIIjXPUldz7Zq3EpCI+9p+UqLtIu6BAUbk1biFTt8xMECgYEA+2iIxZfdl1N1suA/aEbUdjd0kxeeOsGv7Ps0rOYn+4/q1dkUukg2V6VRy3E8BUt+9zLPTR8DmL7oBi+kDsGehjHlH7U6Pe8qKszB4ufQBDHc71yg9liqOWa4s9VoBD0VIU9CO0HtYjRor7rVuUzp+j58SLP7wIEPGEwdgjeYENECgYEA2IsYEyHiwhjy5rx7fmv3duZC5zyesIqxdAz79AuZ7gnpNEhddi5cEpcibnVmwZliCe6SoLzXZ6difEfD4VmLsYEAWqf5sqJ2PswZmHtA9F4We9WUe2zj+pFG0yCCVrcbDZXzQYaLmyuMNe/jpgyY178czohpnvQlr++bYa9DYMcCgYEAqGX6xy/UM9qpiel/T1+yTIUUxroZOI4oQvp47B82ROC/kgJYSfa4v7hys2zjoUBSiU41YRkXFac6T3p1z5SNlKGzMav4mSer/QMuE8jmowirToGjJ594Vf6iVYLqq3wmvSsT2BFu6krknGDva7FDQGW+Zgx44xcPf1zsnx6R8yECgYEAtfFA3Cp3lbBSvy4U8ScUOPHFuvbDOwB9k02pkOcCgfAP4p7+8GKJeBFGm9rG6NnQdxneV3Hz5yLL7DJ8UebkKdODEajbc41vntnsk6LT877uU0QkSwQ2FX1lLdW9zdBxyZt5VVAQEuOnHlaeRxGEhpoMQTh6zlTDKa1AN/aDvVcCgYApytvSEdTpKcQuEyPOfbQv2pXYujCacMFIRHvJW/HvX7yaZSAvSYK+lw8l53bTbJpJ3pq/1Tol6tyjY7HRsVvQ68Jn1MApARMlldn1GoAPcgDFzlJCB0JCOUAE1rBS5lA97wQ1YhI8qBRqaE7Qrtf4D5oZdEjbtq8VCeIaD9huIQ==";
+        private string PublicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1KjMzZJIRG6QQ3+c/euVrc+8RR0xMw6A+EONSKhJq4Bg+rtxQPCfdF2bpZ4NMaSqfalSiLoxrZSYBYOZhpDP67i9LXGUoFCWdRL7ROTqJvuU6KyEeMplQ6Q3uwWbuKbh9COt0vhqn/pjlUsomTwq+DRQv10awynkZikqceXdP0EH4iGZG0hyerEP5yLHpHiggf4f7TOsovHX+fGLPmWFO1zUTHHbz7HxU4BQKn3yuje4yMhoyv5h/wZzeVwvj+Qti8Hlh351rF0f5BHwN1YMGIrWuPU5bF8OMHS/UXPxh7Bs795ZZyplYztTz26QfKfLWVVsLOng4pvgPS+OgzZydwIDAQAB";
+        private string AlipayPublicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxycehrmnTl2IaIAECP+0HWc1eWGM/T6x022K7K6fdf+xoyC97TBJaG4G3Bcon4gsJX+Sad5IA9OJIQ4eN1joM35hIlwcFZ6MmCuVXx/SMAKThIjK0jsRc6aTxVQG+GVCgS7dXMKb4Sm+vK2wEM6xtDeqcfYMB0BqGZRvxbIV59a2ooPrha4FkV6nNC9DQefzC0picHXV64oYUjMM2ed4ASTQVds7HP9BZfalz//APZcWdBV08f+xv7n79Twz/gNtVAadfuTAlcjsS6aK+G/OrZtr/diuemeRPRUKlVhcr5xOQDhqBgtdIw8M9Wp6I4ULXRlthKVBWToH9j6n9vDIiwIDAQAB";
+        public AlipayFunctionForKxs(HttpContext context)
+        {
+            _context = context;
+        }
+
+
+        #region 代商家签约
+
+        //（开启事务）接口创建应用事务，返回生成代商户操作事务编号 batch_no
+        public string GetBatchNo(string AlipayAccount, string Name, string Mobile, string Email)
+        {
+            IAopClient client = new DefaultAopClient("https://openapi.alipay.com/gateway.do", AppId, PrivateKey, "json", "1.0", "RSA2", AlipayPublicKey, "utf-8", false);
+            AlipayOpenAgentCreateRequest request = new AlipayOpenAgentCreateRequest();
+            request.BizContent = "{" +
+            "\"account\":\"" + AlipayAccount + "\"," +
+            "\"contact_info\":{" +
+            "\"contact_name\":\"" + Name + "\"," +
+            "\"contact_mobile\":\"" + Mobile + "\"," +
+            "\"contact_email\":\"" + Email + "\"" +
+            "}" +
+            "}";
+            string result = "";
+            try
+            {
+                AlipayOpenAgentCreateResponse response = client.Execute(request);
+                result = response.Body;
+                //{"alipay_open_agent_create_response":{"code":"10000","msg":"Success","batch_no":"2022021011321326200059849","batch_status":"init"},"sign":"su+weyK1CZEXES8mdckalg16J4BELTQeVNJSpXVYg3nh5g3E7jDh/mQctkjH8HbM0RybQSahZ2j60aUTossPMXqdq2nPRkR4c/kM34toFFNU/2p7jqo9k/MbB1JotW+qFI+C/GCX/9mZQqm2tSQdYIiZlCsEtP13ZP2EQ6momEZrApyLQYUl1H54PojJgqo6zGKDXTnXuZcpi/VPP5YoWhYMx8WPFMS6+T3zr+LNPDOI94j5vDdUHQdjFAGiQMyyhfNOBcFFi18bAfWhPqlLWwblCZamTHN/QaOHo+fkBZeo9uKqrnSHPn8XW0tDAIf1qNUfY2eBzYZUIqWKbz509A=="}
+            }
+            catch (Exception ex)
+            {
+                function.WriteLog(ex.ToString(), "接口创建应用事务异常");
+                result = "";
+            }
+            return result;
+        }
+        //代签约产品通用接口，代商家发起签约产品申请
+        public string CommonSign(string BatchNo, string MccCode, string BusinessLicenseNo = "", string BusinessLicensePicPath = "", string ShopScenePicPath = "", string ShopSignBoardPicPath = "")
+        { 
+            IAopClient client = new DefaultAopClient("https://openapi.alipay.com/gateway.do", AppId, PrivateKey, "json", "1.0", "RSA2", AlipayPublicKey, "utf-8", false);
+            AlipayOpenAgentCommonSignRequest request = new AlipayOpenAgentCommonSignRequest();
+            request.BatchNo = BatchNo;
+            request.MccCode = MccCode; //软件系统商 D_D05_7372
+            FileItem SpecialLicensePic = new FileItem(BusinessLicensePicPath);
+            request.SpecialLicensePic = SpecialLicensePic;
+            if (!string.IsNullOrEmpty(BusinessLicenseNo))
+            {
+                request.BusinessLicenseNo = BusinessLicenseNo;  //营业执照号码
+            }
+            if (!string.IsNullOrEmpty(BusinessLicensePicPath))
+            {
+                FileItem BusinessLicensePic = new FileItem(BusinessLicensePicPath);
+                request.BusinessLicensePic = BusinessLicensePic; //营业执照图片。被代创建商户运营主体为个人账户必填，企业账户无需填写
+            }
+            FileItem BusinessLicenseAuthPic = new FileItem(BusinessLicensePicPath);
+            request.BusinessLicenseAuthPic = BusinessLicenseAuthPic;
+            request.LongTerm = true;
+            request.DateLimitation = "长期";
+            if (!string.IsNullOrEmpty(ShopScenePicPath))
+            {
+                FileItem ShopScenePic = new FileItem(ShopScenePicPath);
+                request.ShopScenePic = ShopScenePic;
+            }
+            if (!string.IsNullOrEmpty(ShopSignBoardPicPath))
+            {
+                FileItem ShopSignBoardPic = new FileItem(ShopSignBoardPicPath);
+                request.ShopSignBoardPic = ShopSignBoardPic;
+            }
+            request.ProductCode = "QUICK_WAP_WAY"; //isv要代商户签约产品码，产品码是支付宝内部对产品的唯一标识
+            request.AppName = "客小爽";
+            // FileItem AppDemo = new FileItem(BusinessLicensePicPath);
+            // request.AppDemo = AppDemo;
+            List<string> WebSites = new List<string>();
+            WebSites.Add("www.kexiaoshuang.com");
+            request.WebSites = WebSites;
+            request.AlipayLifeName = "客小爽";
+            request.WechatOfficialAccountName = "客小爽";
+            // FileItem WebSitesLoa = new FileItem(BusinessLicensePicPath);
+            // request.WebSitesLoa = WebSitesLoa;
+            request.WebTestAccount = "testAccount";
+            request.WebTestAccountPassword = "testPassword";
+            FileItem WebHomeScreenshot = new FileItem(BusinessLicensePicPath);
+            request.WebHomeScreenshot = WebHomeScreenshot;
+            FileItem WebItemScreenshot = new FileItem(BusinessLicensePicPath);
+            request.WebItemScreenshot = WebItemScreenshot;
+            FileItem WebPayScreenshot = new FileItem(BusinessLicensePicPath);
+            request.WebPayScreenshot = WebPayScreenshot;
+            request.WebStatus = "已上线";
+            string result = "";
+            try
+            {
+                AlipayOpenAgentCommonSignResponse response = client.Execute(request);
+                result = response.Body;
+                //{"alipay_open_agent_common_sign_response":{"code":"10000","msg":"Success"},"sign":"qt0DiXFXIJ7mX+W2+IX+cyYXx8ROGe8yxesXHGNltxpEv/s/zW16xzf4HQLtUlaAiWf3DiD2QV7Hj+REyoZw9AcktDAmlobcjQ28lTYufPECZoUJHpkn9VpGB932FC0hScVwCbsxQakH84MGT4cmjr1hCuSs7+XogdhlCTIKjau1e7ZglLnt7f1NqT8JnljVhmvkkE9gJTLq5H+Zq6XbFfBVptvM9w09HdjfhrsxAXJyQ4yU6JYX2tUYsRGz8ZrveDQMvXKTN9jnwKE9hh8ik6Sq49eUqfutV9GkKqhC96+Vy3nOTOTnPoECXZkco1wP5jsqHottWVsRV+NxdylnTw=="}
+            }
+            catch (Exception ex)
+            {
+                function.WriteLog(ex.ToString(), "代签约产品通用接口异常");
+                result = "";
+            }
+            return result;
+        }
+        //代商户签约，提交信息确认接口
+        public string CommonSignConfirm(string BatchNo)
+        {
+            IAopClient client = new DefaultAopClient("https://openapi.alipay.com/gateway.do", AppId, PrivateKey, "json", "1.0", "RSA2", AlipayPublicKey, "utf-8", false);
+            AlipayOpenAgentCommonsignConfirmRequest request= new AlipayOpenAgentCommonsignConfirmRequest();
+            request.BizContent="{" +
+            "\"batch_no\":\"" + BatchNo + "\"" +
+            "}";
+            string result = "";
+            try
+            {
+                AlipayOpenAgentCommonsignConfirmResponse response = client.Execute(request);
+                result = response.Body;
+                //{"alipay_open_agent_order_query_response":{"code":"10000","msg":"Success","order_no":"20220210034000100000015895929361","product_agent_status_infos":[{"product_code":"QUICK_WAP_WAY","product_name":"手机网站支付","status":"WAIT_CONFIRM"}],"order_status":"MERCHANT_CONFIRM","confirm_url":"https:\/\/openhome.alipay.com\/isv\/settling\/confirm.htm?orderNo=20220210034000100000015895929361","merchant_pid":"2088012934025363"},"sign":"mgdhauHMV9352S3FVrQmesXvHOrk633FX/EOXRYdc2ix5phCBZJ2KZRRP9MWJ566YEtWbnQlAJzHVS9X29hjgiJWOQ/wCidql4AoSAYYeqPtxiqKAZw/QEM/du5AdbWC0xBmmkQljXF9Hx8cm+IrOyPMSJXIw4Tqpm/T96YBwhsjw4Xr5dcUcvF6HX9h/i5FSdIJODxQ26PJcqQ98GQ3Y50YhTpPQkIPDFVE2QzcL6dvuhBOpwu5KbTxvgzS8Wtm3G6nMbzJ33Cv/I2lhTCIMHz90c9bvyjJpWxPWBzywO2zzv7+EZCbDkZGkdRic9l5s6qac+ZVMHkPbveaZ2wyig=="}
+            }
+            catch (Exception ex)
+            {
+                function.WriteLog(ex.ToString(), "接口创建应用事务异常");
+                result = "";
+            }
+            return result;
+        }
+
+        #endregion
+
+        #region （查询申请单状态）查询签约申请的结果
+        public string QuerySignStatus(string BatchNo)
+        {
+            IAopClient client = new DefaultAopClient("https://openapi.alipay.com/gateway.do", AppId, PrivateKey, "json", "1.0", "RSA2", AlipayPublicKey, "utf-8", false);
+            AlipayOpenAgentOrderQueryRequest  request= new AlipayOpenAgentOrderQueryRequest() ;
+            request.BizContent="{" +
+            "  \"batch_no\":\"" + BatchNo + "\"" +
+            "}";
+            string result = "";
+            try
+            {
+                AlipayOpenAgentOrderQueryResponse response = client.Execute(request);
+                result = response.Body;
+            }
+            catch (Exception ex)
+            {
+                function.WriteLog(ex.ToString(), "查询签约申请的结果异常");
+                result = "";
+            }
+            return result;
+        }
+
+        #endregion
+        
+        #region 小程序支付请调用MySystemLib下的统一收单交易创建，返回交易号返给小程序请求支付my.tradePay
+        public string GetToken()
+        {
+            IAopClient client = new DefaultAopClient("https://openapi.alipay.com/gateway.do", AppId, PrivateKey, "json", "1.0", "RSA2", AlipayPublicKey, "utf-8", false);
+            AlipayOpenAuthTokenAppRequest request = new AlipayOpenAuthTokenAppRequest();
+            request.BizContent = "{" +
+            "\"grant_type\":\"authorization_code\"," +
+            "\"code\":\"P16be77ee92264acc99553528b8a7103\"" +
+            "  }";
+            string result = "";
+            try
+            {
+                AlipayOpenAuthTokenAppResponse response = client.Execute(request);
+                result = response.Body;
+                //{"alipay_open_auth_token_app_response":{"code":"10000","msg":"Success","tokens":[{"app_auth_token":"202202BBd8c1365cd09b4a27a0c0f0b7f8cabX03","app_refresh_token":"202202BB539f0f5aa99f4b509aa3628b0af25X03","auth_app_id":"2021003116654736","expires_in":31536000,"re_expires_in":32140800,"user_id":"2088141704579033"}]},"sign":"VZINXguZZFvVDyhVp/iMK5BWXYnDYLvxYEMEZTZOVUl9MUy6xQesDzpwBBUclLLU+QgrKpeekaxj9zgwRXdh7cKlVot2lkVPkGdfkqcK/B9t8kxPXa13WIszcROCqIutlcBZW9pCIUAbWRjorDvzRCc5rLNfSBAjEldZDA0rGOPeWJXM/5uLi/70oTwyO6eaEbKdRyHLjUwp0qtolhXIvyf9HL1HbZMGtyY/Hzq35BmhB/jQ4XIVdcOEpFtNoC/1S/viLOsBCD2m4aNCGUY0i24lr92dRsEinZlCxAQq+FK6ILNUnDmBUjNkPTycDrJFw+w9sEC6AcZodNB6OC8XTw=="}
+            }
+            catch (Exception ex)
+            {
+                function.WriteLog(ex.ToString(), "支付宝统一收单交易创建(获取authtoken)异常");
+                result = "";
+            }
+            return result;
+        }
+
+        public string CreateTrade(string OrderNo, string Subject, string Amount, string BuyerId, string Notify_Url, string Token)
+        {
+            IAopClient client = new DefaultAopClient("https://openapi.alipay.com/gateway.do", AppId, PrivateKey, "json", "1.0", "RSA2", AlipayPublicKey, "utf-8", false);
+            AlipayTradeCreateRequest request = new AlipayTradeCreateRequest();
+            request.SetNotifyUrl(Notify_Url);
+            request.BizContent = "{" +
+            "\"out_trade_no\":\"" + OrderNo + "\"," +
+            "\"total_amount\":" + Amount + "," +
+            "\"subject\":\"" + Subject + "\"," +
+            "\"buyer_id\":\"" + BuyerId + "\"," +
+            "\"timeout_express\":\"10m\"" +
+            "}";
+            string result = "";
+            try
+            {
+                AlipayTradeCreateResponse response = client.Execute(request, null, Token);
+                result = response.Body;
+                function.WriteLog(DateTime.Now.ToString() + "\n" + result, "支付宝统一收单交易创建");
+            }
+            catch (Exception ex)
+            {
+                function.WriteLog(ex.ToString(), "支付宝统一收单交易创建异常");
+                result = "";
+            }
+            return result;
+        }
+
+        public string QueryTrade(string OrderNo, string Token)
+        {
+            IAopClient client = new DefaultAopClient("https://openapi.alipay.com/gateway.do", AppId, PrivateKey, "json", "1.0", "RSA2", AlipayPublicKey, "utf-8", false);
+            AlipayTradeQueryRequest request = new AlipayTradeQueryRequest();
+            request.BizContent = "{" +
+            "\"out_trade_no\":\"" + OrderNo + "\"" +
+            "}";
+            string result = "";
+            try
+            {
+                AlipayTradeQueryResponse response = client.Execute(request, null, Token);
+                result = response.Body;
+            }
+            catch (Exception ex)
+            {
+                function.WriteLog(ex.ToString(), "统一收单线下交易查询异常");
+                result = "";
+            }
+            return result;
+        }
+
+        #endregion
+
+
+
+
+
+
+
+
+
+        //小程序
+        string MiniAppId = "2021003116654736";
+        //应用公钥
+        // string PublicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnTchC1mU0rFnRv8/eqDz1i/gS5Wd5fDD/TobKDBlj1UgQPRnT9g8wy/uTtqMnImR09ZQ5C/Ekw8B2GlN6bLbza0+7Fym7rNNKw3EvEL8tQ6pMe1GbIu68tCEjIslPXswGCgGRI30LeSj0BElaSAaqbvvyTHp+vxNLwav/hSGokPa8C76SzgCpvvzjXk9oGiNV5eutdoWEKbwyvw45kv70JHragNANTqU8DouzPLHenoD5V+QqJw1He9mZSb08QgSHCFW1dau8Hmxy0oXsfUVXXHJfzkhoyJOerYiR+oVuRqaIIF9xFlUPsNdpsAnJCP+HaAqRJpvuKfV4hNdg7uvIQIDAQAB";
+        //支付宝公钥
+        string MiniAlipayPublicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxycehrmnTl2IaIAECP+0HWc1eWGM/T6x022K7K6fdf+xoyC97TBJaG4G3Bcon4gsJX+Sad5IA9OJIQ4eN1joM35hIlwcFZ6MmCuVXx/SMAKThIjK0jsRc6aTxVQG+GVCgS7dXMKb4Sm+vK2wEM6xtDeqcfYMB0BqGZRvxbIV59a2ooPrha4FkV6nNC9DQefzC0picHXV64oYUjMM2ed4ASTQVds7HP9BZfalz//APZcWdBV08f+xv7n79Twz/gNtVAadfuTAlcjsS6aK+G/OrZtr/diuemeRPRUKlVhcr5xOQDhqBgtdIw8M9Wp6I4ULXRlthKVBWToH9j6n9vDIiwIDAQAB";
+        //应用私钥
+        string MiniPrivateKey = "MIIEogIBAAKCAQEAnTchC1mU0rFnRv8/eqDz1i/gS5Wd5fDD/TobKDBlj1UgQPRnT9g8wy/uTtqMnImR09ZQ5C/Ekw8B2GlN6bLbza0+7Fym7rNNKw3EvEL8tQ6pMe1GbIu68tCEjIslPXswGCgGRI30LeSj0BElaSAaqbvvyTHp+vxNLwav/hSGokPa8C76SzgCpvvzjXk9oGiNV5eutdoWEKbwyvw45kv70JHragNANTqU8DouzPLHenoD5V+QqJw1He9mZSb08QgSHCFW1dau8Hmxy0oXsfUVXXHJfzkhoyJOerYiR+oVuRqaIIF9xFlUPsNdpsAnJCP+HaAqRJpvuKfV4hNdg7uvIQIDAQABAoIBACrMZDmDxIjq9JOWTwCiKl8nn2bULyz2s1QPam8xZaR0ZxhnsGxDEJ+OP9DFnDvNE57YnCLSgjAKiNUSLbyuDTpbrGKKAoO+2gYbdHBPyB2+BP9reZ15GIabj0n3Y0bubzRUSQiGoG+R66pr0IRi0f9dAzUBWpIR9y0TI/wGOHSZmQ92CgTbdmimtUNxE17vF1jaiahDzvJ1MMag0iAbCXybe48eccURKNYOTm+CuQvykBExZyN45ppKQte4YMCCIqy8VlNlAaRQtcwsQjnWh6leLitfNSfSXV+14Zzyyb/acNPGv6Hq0sw4JlQiFOaoyBVSYqapaa2l7J0RCGs5HrECgYEAzerndj/KUh2YCc2zeC7RdjbsXY2w3wTvVPTZ5DTfhJe1+xGTMC1GXLqfdPrN94DoIhvAjQsNPM9lZES32S35KI73uauxVoVr0wP8RQr8VrVUZhkvUSfLy/u5/Y6iRMnq2oM58GxeBYzewKBUN4Spm62Rl1rosvxRCO2SHw8AFW0CgYEAw3PdjlzwJYlcIx04963oGcEXpPjYg2vpJwJ+GJYWKZlp7xL5bUrDiO8BYr1V5Gmcusa3RgKLxOCZZyEenkglhg64IITa9bT9R/yjaKQBQsiTDnWHogijnkn2Oh7Z5JymBG3OCgbU6eSLr1g7y3PypZ49Ur5cBqV49jVhsq3R1AUCgYANhSHjarbPA3BrHF1vQ6uvFlYYomf9jKZmLplr2WjfnNJvBK1kWWSoS/ySQrFpUcZsDuRqnlIlLvzaQ4TKtrEIT7LGNxaytpnoxfc3VUxSKR+8gGTR8En6P7HriwTufU91P257cbIOrTwm65/78TLtrMzFYkurDNQJQQf6EBMSVQKBgEypIGhbSZHfe3UGXDbBTjzzwHtjY0DAzZUQZDbuf0jXtHYiAhT88w69d9SroInTZrbXhEEAdKPG2ERb+C9q6tTW5x9SHLOsxn86tzkuwpPYKd3M+WLzcoF+TwZi3WHOk0s/akYCgfYvPx6KRAG7u5t8Il9W7K9qrbQcIfK8PIWlAoGAB+Nn+C7GGXYtEOWyJo4SqTYpaVJBdyqbq+UighHXQD0wci8b3E35SsR/QqDAvOgEpKhmjrt63KcfdJax4VztPwroKRTz+Iy/HwGcBSVwnUn8XPTlHFkTufUtPScWuYjSXTJ+MyIMif2rcaJubvSGyZOKNMbcvAQx5tnNbF5SrVU=";
+
+        //小程序AES密钥，目前用于解密手机号
+        string Key = "2Krm6dSew4NAL+l0mQf0fA==";
+        public string GetAlipayUserId(string Auth_code)
+        {
+            string result = "";
+            try
+            {
+                IAopClient client = new DefaultAopClient("https://openapi.alipay.com/gateway.do", MiniAppId, MiniPrivateKey, "json", "1.0", "RSA2", MiniAlipayPublicKey, "UTF-8", false);
+                //获取access_token
+                AlipaySystemOauthTokenRequest requestAccess_token = new AlipaySystemOauthTokenRequest();
+                requestAccess_token.GrantType = "authorization_code";
+                requestAccess_token.Code = Auth_code;
+                AlipaySystemOauthTokenResponse responseAccess_token = client.Execute(requestAccess_token);
+                string AlipayUserId = responseAccess_token.AlipayUserId; //20881043611849171819285350010300
+                string UserId = responseAccess_token.UserId; //2088222145274001
+                result = UserId + "|" + AlipayUserId;
+            }
+            catch (Exception ex)
+            {
+                function.WriteLog(DateTime.Now.ToString() + "\r\n" + ex.ToString(), "支付宝授权报错日志");
+            }
+            return result;
+        }
+
+
+        public string GetAlipayMobile(string response)
+        {
+            function.WriteLog(response, "解密报文");
+            //1. 获取验签和解密所需要的参数
+            IDictionary openapiResult = Jayrock.Json.Conversion.JsonConvert.Import(response) as IDictionary;
+            string signType;
+            if (openapiResult.Contains("sign_type"))
+            {
+                signType = openapiResult["sign_type"].ToString();
+            }
+            else
+            {
+                signType = "RSA2";
+            }
+            string charset;
+            if (openapiResult.Contains("charset"))
+            {
+                charset = openapiResult["charset"].ToString();
+            }
+            else
+            {
+                charset = "UTF-8";
+            }
+            string encryptType;
+            if (openapiResult.Contains("encrypt_type"))
+            {
+                encryptType = openapiResult["encrypt_type"].ToString();
+            }
+            else
+            {
+                encryptType = "AES";
+            }
+            string sign = openapiResult["sign"].ToString();
+            string content = openapiResult["response"].ToString();
+            // 是否为加密报文
+            bool isDataEncrypted = !content.StartsWith("{", StringComparison.Ordinal);
+            // bool signCheckPass = false;
+            //2. 验签
+            string signContent = content;
+            signContent = "\"" + signContent + "\"";
+            string signVeriKey = MiniAlipayPublicKey;
+            string decryptKey = MiniPrivateKey;
+            string result = "";
+            try
+            {
+                function.WriteLog(content, "解密报文");
+                result = AlipayEncrypt.AesDencrypt(Key, content, charset);
+                JsonData obj = JsonMapper.ToObject(result);
+                if (obj["code"].ToString() == "10000")
+                {
+                    result = "success|" + obj["mobile"].ToString();
+                }
+                //{\"code\":\"10000\",\"msg\":\"Success\",\"mobile\":\"14781419364\"}
+            }
+            catch (Exception ex)
+            {
+                //解密异常, 记录日志        
+                function.WriteLog(ex.ToString(), "获取手机号解密异常");
+            }
+            return result;
+            // 如果是加密的报文则需要在密文的前后添加双引号
+            // if (isDataEncrypted)
+            // {
+            //     signContent = "\"" + signContent + "\"";
+            // }
+            // try
+            // {
+            //     signContent = signContent.Trim('"');
+            //     signCheckPass = AlipaySignature.RSACheckContent(signContent, sign, signVeriKey, charset, signType);
+            // }
+            // catch (Exception ex)
+            // {
+            //     //验签异常, 日志    
+            //     throw new Exception("验签失败", ex);
+            // }
+            // if (!signCheckPass)
+            // {
+            //     //验签不通过（异常或者报文被篡改），终止流程（不需要做解密）   
+            //     throw new Exception("验签失败");
+            // }
+            // //3. 解密
+            // string plainData = null;
+            // if (isDataEncrypted)
+            // {
+            //     try
+            //     {
+            //         plainData = AlipayEncrypt.AesDencrypt(decryptKey, content, charset);
+            //     }
+            //     catch (Exception ex)
+            //     {
+            //         //解密异常, 记录日志        
+            //         throw new Exception("解密异常", ex);
+            //     }
+            // }
+            // else
+            // {
+            //     plainData = content;
+            // }
+            // return result;
+        }
+
+        public string test()
+        {
+            string result = "";
+            string str = "PsQMXBobiYsZPG5q2dbsX5Zvnee73Zpg55guE2FTxMijl+xdj+oCjEErUpZNxRK0S132GVcWBQUjFeA5fcLq1A==";
+            try
+            {
+                result = AlipayEncrypt.AesDencrypt(Key, str, "UTF-8");
+                JsonData obj = JsonMapper.ToObject(result);
+                if (obj["code"].ToString() == "10000")
+                {
+                    result = "success|" + obj["mobile"].ToString();
+                }
+                //{\"code\":\"10000\",\"msg\":\"Success\",\"mobile\":\"14781419364\"}
+            }
+            catch (Exception ex)
+            {
+                //解密异常, 记录日志        
+                function.WriteLog(ex.ToString(), "获取手机号解密异常");
+            }
+            return result;
+        }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+        // 支付宝参数
+        public PublicAccountSet SetData(int UserId = 0)
+        {
+            WebCMSEntities db = new WebCMSEntities();
+            PublicAccountSet set = db.PublicAccountSet.FirstOrDefault() ?? new PublicAccountSet();
+            // set.AlipayAppId = "2021003122642236";
+            // set.AlipayPrivateKey = "MIIEpAIBAAKCAQEAmfSplznW6H+wCyKh806jBxVdRabpK2P9RP4QNSGsHNIAscuH2yPbI1dNfKESC+QXAfWVRg90Vb+7yQz1I/S2vT159yY7ZH6duCopPpScfpNmICtjVukc1V5PZX+ptuDZc0YQSsRnn5WVKNO0bBR6iS3Jl9HQT949I3rHttA1+iqBn2LWyvGcUSDCOFNwstOYFM3FJTg7rQEdjmEQonEPXSbTQl1aw+fx1D+NcGx9BFSVAbE+nqfiX2co4V6yQ++N1RMlnBtbMZmTgvcoHZujqqBmjRcfRUW8I0B9aPJGNji94STBRPf0hP7yN4PHP2LixAK5gfzZ5NP2iK99sQ9tmwIDAQABAoIBAAR0N5PQcI85YnZwAg9v7vd9fr1NHuHKesFMOFvRJZGP4cVDBiMo3mYfWHaKkmMVrjS4TiFAwTTZ3yzp2w23PrIq3SRxTraRky6Iybitw/lFembj2nPhOpxRpiphjx9jUecr17zSAc10HmSX+1hFH2ZolLR3tXcaDtq/6pc3Xthl5uT0HIkisgbgxG5M8B+x26ZWnu8pbk+nT9bsAh9LrkQX+xaxTCgpmWpUTFMhG2t9pl04jT/LPOWXCmrs1BYEadqMirivcZdAXEiRbisSVrDI8cGKvPZpNZU9jfg9W5DEgfUdhnaZfRZzeAWORrBogXV1Osjlcjh2XXA3pAzCP8ECgYEA1jKv/S4RVCswh5LZTVFqVTAVyMBL/nLSu1L4mgaim19QDINxCDpN8kOfIBIBatwvkg7HzzQquotbDqj8pKgCFHTyf5gof6iFA1uGGP6AYBdL0k5tAG+uKwpo9rtRAUlOeLqwCC4rVhO1hE9tsey+t57BoAGVqi9JYIyCwEmCmo8CgYEAuABGodDT+RVbzJhUi4gHmDNDsil214uDyRYprCvD+wsJp5ma7M30hPm2NluGRWJUSdo237T0a8RkrNuXHW1ptgFKED8Qy4JV+eKemMZ21yMKyNZcjNs9X55b9BK3cGKkxXieXcxGLhz1YeLqTatS516uKfUHte62E3neZDySsjUCgYEApQGLHWi9pK9YxTfU+oD7fwB555prcGqX+AJkzJLL9REpo1omWwY/QZ/iF1yHhwB0DPoh5nbza50q2lJHvbhHUeb9YFmg6SaywPFijiKQVnXbzPjpc2qVK0brsRZ/wpPsRYjbTpHyhG7OaEyf3m7YRK+hzVcrKl0fE6dqmiKG3/UCgYEAt+2WrVRZQAjIrdir0pqUtOCxz9tA76+HebAM0g0hp8XdzcpvIj2yKmaPbQDKVHs5NGXMKozxMvSrilsrUIA5hnT9ewX/nN7ZYKPW03K4AtAFjMMy2p6hV/6tfmpjMhV5DehHrg1vLdNGuqWgfyk+AwgS4uAL6CIJoahV1S7zmO0CgYBGMNtHyIsYbnYycat2SEOQOGbLAro+jRNDPCI3FGOf1fAOpXD9JgQMD7oXSRSnZRzwvsxNQ944UXqLrHPS5yEtcmAu6BdR1QjJlpj5ClRYuQuDK7k1LR3+0eI3FySbinAMspr6UVNo0UqUkLa2k/igH2yUyThIUDOiqkfuxsu/aA==";
+            // set.AlipayPublicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxycehrmnTl2IaIAECP+0HWc1eWGM/T6x022K7K6fdf+xoyC97TBJaG4G3Bcon4gsJX+Sad5IA9OJIQ4eN1joM35hIlwcFZ6MmCuVXx/SMAKThIjK0jsRc6aTxVQG+GVCgS7dXMKb4Sm+vK2wEM6xtDeqcfYMB0BqGZRvxbIV59a2ooPrha4FkV6nNC9DQefzC0picHXV64oYUjMM2ed4ASTQVds7HP9BZfalz//APZcWdBV08f+xv7n79Twz/gNtVAadfuTAlcjsS6aK+G/OrZtr/diuemeRPRUKlVhcr5xOQDhqBgtdIw8M9Wp6I4ULXRlthKVBWToH9j6n9vDIiwIDAQAB";
+        
+            // set.AlipayAppId = "2021003126605468";
+            // set.AlipayPrivateKey = "MIIEogIBAAKCAQEA1O3mknrWGkWsDiojx/hUgq5jnO/D8rjMGUpz8C7A88iJmm6ZSxssTz2+OkL75omlxRJcMZAYt+icZtLWVm6mSklCipieWZGEWiId6bsHwlEPOkwmhPw5bDBF+y6ZSkXtW+fofrmsk8/a9SZ/N3h+FJ5sqLbihn9pXNp4X1VgnZHGGNWsRTFgBdWdEWAEhDImAPNRv8IB7ZyVbbRo3aIvTCH4EDUu8Y5IMs8l5Ne0aUAkPgz81IbiSMzWqU5z9W5m1cPIOz/w5Bru/JvJliu2qkQrDlh9ccIcBIsrOddYAzxyXsxO+EqUM/m9HEtg5atvMIV9XMzgwnGpM3jVydRBywIDAQABAoIBAAdaO6b9NN1tYHaQv/GMwqZMjUYDBXohJXMOHhjCFImWeCHsBcERLCOEV0g9veMFB8NZUfOoLSJUlun6B8quQXG5O+H7SSSAoNhX6z6B5c+w6tyxencHGpiAxjnZLxPgfES7Kk0N7kagW8gxTx1EPN5LZichQYsxZRr+tD9efFqUeOnutUjECdvYNb6FsJ46tgCVRSEl7kBueR+VmFl5FXjc7B3bREGzaNylu846BK4vK6u1/IKIDczJKfZDRtwSpvMPUGwscfZAkPHOxtneKCyB1itouUyrhjaBb9AJMKIaCi7j5btazo81B3BZVK9uHV+B+gVA3d+aWwSteU9WMukCgYEA6bk0ua6285e/N6YC5KvqRTaangjtSJckx3FRVuK6799mIDyyvScz6Befi/EJ0kwF0J0HPI+GKGa7XWzk1CR4pz1Zd85uzL8TIcn9AHqjeYe62hKLSPQMlR+GTP/J604rHERlGVoo7LEHT7MrVmQhTJWmJGezldPpmwbuKoWgel8CgYEA6TlShy3qO5LYVmd360BRWrR7k6cZkkTaC/ivjLZNENLXG7nJeUKkS4LaexLu7RB2L45IWzDqhCrPqfG5P/XkxvskkzntEUmChN58xhfpS20yeTpfDhjvdbJEEYgbmkNqOD8L2Q25XRMAJ8vomzgIEIw9aDQCM3ZBK1s0zyXwyBUCgYARqthbeOOHgl8H+9qYIo6w8LG7ZH1bUWGMWfqGENmErGRx52Sze7UmxDJhR7UwWmLOJDCZ2VeQ0kMzirm5d5BPRAnxTn99pqvxj+06DgsxcpsjROeWeixBUYK7a1J+IQiNOHZT9kbFrZQZ6DdMboE94soOUnB20PAFsf5q5HL/DQKBgHXVmHTkJexjjRpavKQHoxMJDUbUrn7QerqBs3CMyvMtE7HWdIzntsrQGkMEleMA5jWw1a39UP/mAXYDw20ld6lxSlF4eua5FVC8eJ49homtaksFyvD8eEAnCW0yL4AJf6lbcUkBPh5gczuoMqX58VkrAfucC2Ck5thZBJ2EtdrhAoGAVeQbC4m789Yr+kXKPECGxI7RwIVV5xjc3TCvfE6JKztmn0IZyWT53vqvxi2LpqeAMlwc8PrCpiqd/8Tk5M/WZkzGYTj7mrp0A7BXXRWMjnbrhq3W15P1Q45aU64NofOcQvX3LdKkpEWHYXktJaSKBlZgjSQVK7ZntF6LJCiMcQ0=";
+            // set.AlipayPublicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnw14hKejqS+si/XZpNQpFAVOVXJIThj5Qn7H14n/vsb7uRLug1+Jcve8ehTkaN3s5ibrrELCnz0dvshi3cOz9svDSbLG5OdC1biAvZzpDkvVPswOd9f9jO8Jvqk3QTXTI3MSN9gOpKomI0te3qs5kkOQx6kRozzKjU/G//o/PbJCxpBxf/QNRV3XmCwJLZMBE7ukYqi1WO9Jra8jdczFKwrd/nhiKBKdupAtVVeKlylGD2i2YLkGAH1cLsPUN9DtzrXNblGXm2HK3l9SnMDjqnakiVdEQJTNYNpEiHaOJsVmPQL38nM6miz5wNd4gTchKzXPtoZWqto+eIvYaEA/KwIDAQAB";
+            return set;
+        }
+    }
+}

Util/MerchantAmountSummayUtil.cs

@@ -1,70 +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;
+using MySystem.MainModels;
+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 = new MerchantDepositOrderService().QueryByMerchantId(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().QueryAmount("TradeAmount", " and IsAct=1 and TradeMonth='" + TradeMonth + "' and MerchantId=" + MerchantId + "");
+                if (check.Count > 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.Count > 0) Status = 2;
+                    //未通过
+                    if (TradeAmount < 10000 && IsJoin != 3 && check.Count > 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
 
-//     }
-// }
+    }
+}

Util/MerchantDepositBackUtil.cs

@@ -1,52 +1,52 @@
-// using MySystem.Models.Main;
-// using Library;
-// using MySystem.Service.Main;
-// using System.Collections.Generic;
-// namespace MySystem
-// {
-//     /// <summary>
-//     /// 商户服务费退还记录工具类
-//     /// </summary>
-//     public class MerchantDepositBackUtil
-//     {
+using MySystem.MainModels;
+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
+        #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 = new 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); //退还方式
+            new MerchantDepositBackService().Add(fields);
+            return "success";
+        }
+        #endregion
 
-//     }
-// }
+    }
+}

Util/MerchantDepositOrderUtil.cs

@@ -1,33 +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="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
-
-//     }
-// }
+using MySystem.MainModels;
+using Library;
+using MySystem.Service.Main;
+using System.Collections.Generic;
+using System;
+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
+    }
+}