暂存

Areas/Api/Controllers/Business/BusinessController.cs

@@ -0,0 +1,141 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+using Microsoft.AspNetCore.Authorization;
+using System.Web;
+using MySystem.Models.Main;
+using LitJson;
+using Library;
+using System.Data;
+using MySystem.Service.Main;
+
+namespace MySystem.Areas.Api.Controllers.v1
+{
+    [Area("Api")]
+    [Route("Api/v1/[controller]/[action]")]
+    public class BusinessController : BaseController
+    {
+        public BusinessController(IHttpContextAccessor accessor) : base(accessor)
+        {
+        }
+
+        #region 经营数据-经营数据记录(月)
+        [Authorize]
+        public JsonResult BussinessRecordForMonth(string value)
+        {
+            value = DesDecrypt(value);
+            JsonData data = JsonMapper.ToObject(value);
+            List<Dictionary<string, object>> dataList = BussinessRecordForMonthDo(value);
+            return Json(new AppResultJson() { Status = "1", Info = "", Data = dataList });
+        }
+        private List<Dictionary<string, object>> BussinessRecordForMonthDo(string value)
+        {
+            JsonData data = JsonMapper.ToObject(value);
+            string Kind = data["Kind"].ToString(); //通道类型(1 原生 2 好哒)
+            int MerchantId = int.Parse(function.CheckInt(data["MerchantId"].ToString())); //商户Id
+            string TradeMonth = data["TradeMonth"].ToString(); //月份
+            int pageSize = int.Parse(function.CheckInt(data["PageSize"].ToString()));
+            int pageNum = int.Parse(function.CheckInt(data["PageNum"].ToString()));
+
+            var dataList = BusinessUtil.BussinessRecordForMonth(MerchantId, TradeMonth, pageSize, pageNum);
+            return dataList;
+        }
+        #endregion
+
+
+
+        #region 经营数据-经营数据记录(半年)
+        [Authorize]
+        public JsonResult BussinessRecordForHalfYear(string value)
+        {
+            value = DesDecrypt(value);
+            JsonData data = JsonMapper.ToObject(value);
+            List<Dictionary<string, object>> dataList = BussinessRecordForHalfYearDo(value);
+            return Json(new AppResultJson() { Status = "1", Info = "", Data = dataList });
+        }
+        private List<Dictionary<string, object>> BussinessRecordForHalfYearDo(string value)
+        {
+            JsonData data = JsonMapper.ToObject(value);
+            string Kind = data["Kind"].ToString(); //通道类型(1 原生 2 好哒)
+            int MerchantId = int.Parse(function.CheckInt(data["MerchantId"].ToString())); //商户Id
+            int pageSize = int.Parse(function.CheckInt(data["PageSize"].ToString()));
+            int pageNum = int.Parse(function.CheckInt(data["PageNum"].ToString()));
+
+            var dataList = BusinessUtil.BussinessRecordForHalfYear(MerchantId, pageSize, pageNum);
+            return dataList;
+        }
+        #endregion
+
+
+
+        #region 经营数据-经营数据记录-经营详情列表
+        [Authorize]
+        public JsonResult DayDetailList(string value)
+        {
+            value = DesDecrypt(value);
+            JsonData data = JsonMapper.ToObject(value);
+            List<Dictionary<string, object>> dataList = DayDetailListDo(value);
+            return Json(new AppResultJson() { Status = "1", Info = "", Data = dataList });
+        }
+        private List<Dictionary<string, object>> DayDetailListDo(string value)
+        {
+            JsonData data = JsonMapper.ToObject(value);
+            string Kind = data["Kind"].ToString(); //通道类型(1 原生 2 好哒)
+            int MerchantId = int.Parse(function.CheckInt(data["MerchantId"].ToString())); //商户Id
+            string TradeDate = data["TradeMonth"].ToString(); //日期
+            int pageSize = int.Parse(function.CheckInt(data["PageSize"].ToString()));
+            int pageNum = int.Parse(function.CheckInt(data["PageNum"].ToString()));
+            string condition = " and Status>=1";
+            if (!string.IsNullOrEmpty(data["MerchantId"].ToString()))
+            {
+                condition += " and MerchantId=" + MerchantId;
+            }
+            if (!string.IsNullOrEmpty(data["TradeDate"].ToString()))
+            {
+                condition += " and TradeDate='" + TradeDate + "'";
+            }
+
+            var dataList = BusinessUtil.DayDetailList(condition, pageSize, pageNum);
+            return dataList;
+        }
+        #endregion
+
+
+
+        #region 经营数据-经营数据记录-交易详情
+        [Authorize]
+        public JsonResult OrderDetail(string value)
+        {
+            value = DesDecrypt(value);
+            JsonData data = JsonMapper.ToObject(value);
+            Dictionary<string, object> dataList = OrderDetailDo(value);
+            return Json(new AppResultJson() { Status = "1", Info = "", Data = dataList });
+        }
+        private Dictionary<string, object> OrderDetailDo(string value)
+        {
+            JsonData data = JsonMapper.ToObject(value);
+            string Kind = data["Kind"].ToString(); //通道类型(1 原生 2 好哒)
+            int MerchantId = int.Parse(function.CheckInt(data["MerchantId"].ToString())); //商户Id
+            int OrderId = int.Parse(function.CheckInt(data["OrderId"].ToString())); //订单Id
+            string condition = " and Status>=1";
+            if (!string.IsNullOrEmpty(data["OrderId"].ToString()))
+            {
+                condition += " and OrderId=" + OrderId;
+            }
+            if (!string.IsNullOrEmpty(data["MerchantId"].ToString()))
+            {
+                condition += " and MerchantId=" + MerchantId;
+            }
+
+            var obj = BusinessUtil.OrderDetail(condition);
+            return obj;
+        }
+        #endregion
+
+
+    }
+}

Areas/Api/Controllers/Message/MessageController.cs

@@ -0,0 +1,130 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+using Microsoft.AspNetCore.Authorization;
+using System.Web;
+using MySystem.Models.Main;
+using LitJson;
+using Library;
+using System.Data;
+using MySystem.Service.Main;
+
+namespace MySystem.Areas.Api.Controllers.v1
+{
+    [Area("Api")]
+    [Route("Api/v1/[controller]/[action]")]
+    public class MessageController : BaseController
+    {
+        public MessageController(IHttpContextAccessor accessor) : base(accessor)
+        {
+        }
+
+        #region 消费者-支付接口
+        // [Authorize]
+        public JsonResult Pay(string value)
+        {
+            if (string.IsNullOrEmpty(value))
+            {
+                System.IO.StreamReader sr = new System.IO.StreamReader(Request.Body);
+                value = sr.ReadToEnd();
+                value = value.Split('=')[1];
+            }
+            value = DesDecrypt(value);
+            JsonData data = JsonMapper.ToObject(value);
+            string SnNo = data["Sn"].ToString(); //商户
+            string Machine = data["Machine"].ToString();
+            int PayMode = int.Parse(function.CheckInt(data["PayMode"].ToString())); //支付方式(1 支付宝 2 微信)
+            decimal PayMoney = decimal.Parse(function.CheckNum(data["PayMoney"].ToString())); //支付金额
+            string Code = data["Code"].ToString();
+            if (string.IsNullOrEmpty(data["PayMode"].ToString()))
+            {
+                return Json(new AppResultJson() { Status = "-1", Info = "请填写支付方式" });
+            }
+            if (string.IsNullOrEmpty(data["PayMoney"].ToString()))
+            {
+                return Json(new AppResultJson() { Status = "-1", Info = "请填写支付金额" });
+            }
+            if (!function.IsNum(data["PayMoney"].ToString()))
+            {
+                return Json(new AppResultJson() { Status = "-1", Info = "请填写正确的支付金额" });
+            }
+            var qrcode = MerchantQrCodeService.Query(" SnNo='" + SnNo + "'");
+            var merchant = MerchantInfoService.Query(qrcode.MerchantId);
+            var merchantAdd = MerchantAddInfoService.Query(qrcode.MerchantId);
+            var merchantset = MerchantParamSetService.Query(qrcode.MerchantId);
+            var ledgerModel = merchantset.IsAll == 1 ? "1" : "5";
+            string openid = "";
+            if (PayMode == 1)
+            {
+                openid = new AlipayFunction(_accessor.HttpContext).GetAlipayUserId(Code);
+                if (openid.Contains("|"))
+                {
+                    openid = openid.Split('|')[0];
+                }
+            }
+            else
+            {
+                string result = function.GetWebRequest("https://api.weixin.qq.com/sns/jscode2session?appid=" + new WeChatFunction().AppId + "&secret=" + new WeChatFunction().AppSecret + "&js_code=" + Code + "&grant_type=authorization_code");
+                function.WriteLog(DateTime.Now.ToString() + "\n" + result, "微信小程序获取openid");
+                JsonData jsonObj = JsonMapper.ToObject(result);
+                openid = jsonObj["openid"].ToString();
+            }
+            int ConsumerId = 0;
+            var check = ConsumerOpenIdsService.Exist(openid);
+            if (check == false)
+            {
+                var info = ConsumersUtil.AddConsumers(ConsumerId, openid);
+                ConsumerId = int.Parse(info.Data.ToString());
+                ConsumerOpenIdsUtil.AddConsumerOpenIds(ConsumerId, openid);
+            }
+            else
+            {
+                var info = ConsumerOpenIdsService.Query(" OpenId='" + openid + "'");
+                ConsumerId = info.ConsumerId;
+            }
+            Dictionary<string, object> Obj = new Dictionary<string, object>();
+            string OrderNo = DateTime.Now.ToString("yyyyMMddHHmmssfff") + function.get_Random(8);
+            bool ActFlag = merchantset.IsAll == 1 ? false : true;
+            if (PayMoney < merchantset.MinPayMoney) //支付金额小于活动最小金额，则不分账
+            {
+                ActFlag = false;
+            }
+            var infos = ConsumerOrdersUtil.AddConsumerOrders(qrcode.MerchantId, ConsumerId, merchant.UserId, PayMode, PayMoney, SnNo, OrderNo, ActFlag ? PayMoney * merchantset.DiviPercent / 100 : 0, ActFlag ? 1u : 0u, ActFlag ? PayMoney * merchantset.GetPercent / 100 : PayMoney, Newtonsoft.Json.JsonConvert.SerializeObject(merchantset));
+            ConsumerOrderForNoUtil.AddConsumerOrderForNo(OrderNo, int.Parse(infos.Data.ToString()));
+            if (PayMode == 1)
+            {
+                string backString = HaoDaHelper.Instance.Alipay(merchantAdd.OutMchtNo, merchantAdd.StoreNo, OrderNo, PayMoney, SpHost + "/api/alipay/hdnotice", openid, function.get_Random(4), ledgerModel);
+                JsonData obj = JsonMapper.ToObject(backString);
+                if (obj["resultCode"].ToString() == "1")
+                {
+                    string tradeNo = obj["prePayId"].ToString();
+                    Obj.Add("respCode", obj["resultCode"].ToString());
+                    Obj.Add("tradeNo", tradeNo);
+                }
+                else
+                {
+                    Obj.Add("respCode", obj["resultCode"].ToString());
+                    Obj.Add("tradeNo", "");
+                    return Json(new AppResultJson() { Status = "-1", Info = obj["errorDesc"].ToString(), Data = Obj });
+                }
+            }
+            else if (PayMode == 2)
+            {
+                var dic = JsonMapper.ToObject(HaoDaHelper.Instance.WeChatPay(merchantAdd.OutMchtNo, merchantAdd.StoreNo, OrderNo, PayMoney, SpHost + "/api/wechat/hdnotice", openid, function.get_Random(4), AppConfig.WeChat.AppId, "MINI_PROGRAM", ledgerModel));
+                Obj.Add("appId", dic["payInfo"]["appId"].ToString()); //微信小程序appid
+                Obj.Add("timeStamp", dic["payInfo"]["timeStamp"].ToString()); //时间戳
+                Obj.Add("nonceStr", dic["payInfo"]["nonceStr"].ToString()); //随机字符串
+                Obj.Add("package", dic["payInfo"]["wxPackage"].ToString()); //统一支付接口返回的prepayid参数值
+                Obj.Add("paySign", dic["payInfo"]["paySign"].ToString()); //支付签名
+                Obj.Add("ConsumerId", ConsumerId);
+            }
+            return Json(new AppResultJson() { Status = "1", Info = "", Data = Obj });
+        }
+        #endregion
+
+    }
+}

Areas/Api/Controllers/MySelf/MySelfController.cs

@@ -0,0 +1,131 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+using Microsoft.AspNetCore.Authorization;
+using System.Web;
+using MySystem.Models.Main;
+using LitJson;
+using Library;
+using System.Data;
+using MySystem.Service.Main;
+
+namespace MySystem.Areas.Api.Controllers.v1
+{
+    [Area("Api")]
+    [Route("Api/v1/[controller]/[action]")]
+    public class MySelfController : BaseController
+    {
+        public MySelfController(IHttpContextAccessor accessor) : base(accessor)
+        {
+        }
+
+        #region 我的-到账记录-到账记录列表
+        [Authorize]
+        public JsonResult CardInComeRecordList(string value)
+        {
+            value = DesDecrypt(value);
+            JsonData data = JsonMapper.ToObject(value);
+            List<Dictionary<string, object>> dataList = CardInComeRecordListDo(value);
+            return Json(new AppResultJson() { Status = "1", Info = "", Data = dataList });
+        }
+        private List<Dictionary<string, object>> CardInComeRecordListDo(string value)
+        {
+            JsonData data = JsonMapper.ToObject(value);
+            int MerchantId = int.Parse(function.CheckInt(data["MerchantId"].ToString())); //商户Id
+            string TradeMonth = data["TradeMonth"].ToString(); //交易月份
+            string pageSize = data["PageSize"].ToString();
+            string pageNum = data["PageNum"].ToString();
+
+            var dataList = MySelfUtil.CardInComeRecordList(MerchantId, TradeMonth, pageSize, pageNum);
+            return dataList;
+        }
+        #endregion
+
+        #region 我的-到账记录-到账记录详情
+        [Authorize]
+        public JsonResult CardInComeRecordDetail(string value)
+        {
+            value = DesDecrypt(value);
+            JsonData data = JsonMapper.ToObject(value);
+            Dictionary<string, object> obj = CardInComeRecordDetailDo(value);
+            return Json(new AppResultJson() { Status = "1", Info = "", Data = obj });
+        }
+        private Dictionary<string, object> CardInComeRecordDetailDo(string value)
+        {
+            JsonData data = JsonMapper.ToObject(value);
+            int MerchantId = int.Parse(function.CheckInt(data["MerchantId"].ToString())); //商户Id
+            string OrderId = data["OrderId"].ToString(); //记录Id
+
+            var obj = MySelfUtil.CardInComeRecordDetail(MerchantId, OrderId);
+            return obj;
+        }
+        #endregion
+
+        #region 我的-设置-修改登录手机号(原手机验证)
+        [Authorize]
+        public JsonResult OldMobileCheck(string value)
+        {
+            value = DesDecrypt(value);
+            JsonData data = JsonMapper.ToObject(value);
+            AppResultJson result = OldMobileCheckDo(value);
+            return Json(new AppResultJson() { Status = result.Status, Info = result.Info, Data = result.Data });
+        }
+        private AppResultJson OldMobileCheckDo(string value)
+        {
+            JsonData data = JsonMapper.ToObject(value);
+            string MobileCode = data["MobileCode"].ToString(); //短信验证码
+            string Mobile = data["Mobile"].ToString(); //手机号
+            MobileCodeCheck mobilecheck = RedisDbconn.Instance.Get<MobileCodeCheck>("MobileCodeCheck:" + Mobile);
+            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>();
+            return new AppResultJson() { Status = "1", Info = "", Data = Obj };
+        }
+        #endregion
+
+        #region 我的-设置-修改登录手机号(新手机验证)
+        [Authorize]
+        public JsonResult ChangeLoginMobile(string value)
+        {
+            value = DesDecrypt(value);
+            JsonData data = JsonMapper.ToObject(value);
+            AppResultJson result = ChangeLoginMobileDo(value);
+            return Json(new AppResultJson() { Status = result.Status, Info = result.Info, Data = result.Data });
+        }
+        private AppResultJson ChangeLoginMobileDo(string value)
+        {
+            JsonData data = JsonMapper.ToObject(value);
+            string LoginMobile = data["LoginMobile"].ToString(); //原手机号
+            string Mobile = data["Mobile"].ToString(); //手机号
+            string MobileCode = data["MobileCode"].ToString(); //短信验证码
+            MobileCodeCheck mobilecheck = RedisDbconn.Instance.Get<MobileCodeCheck>("MobileCodeCheck:" + Mobile);
+            if (mobilecheck == null)
+            {
+                return new AppResultJson() { Status = "-1", Info = "短信验证码不正确" };
+            }
+            if (mobilecheck.CheckCode != MobileCode)
+            {
+                return new AppResultJson() { Status = "-1", Info = "短信验证码不正确" };
+            }
+            RedisDbconn.Instance.Clear("MobileCodeCheck:" + Mobile);
+            var info = MySelfUtil.ChangeLoginMobile(LoginMobile, Mobile);
+            return new AppResultJson() { Status = "1", Info = "", Data = info };
+        }
+        #endregion
+
+
+
+
+    }
+}

Areas/Api/Controllers/WorkSpace/WorkSpaceController.cs

@@ -0,0 +1,53 @@
+// using System;
+// using System.Collections.Generic;
+// using System.Linq;
+// using Microsoft.AspNetCore.Mvc;
+// using Microsoft.AspNetCore.Http;
+// using Microsoft.Extensions.Logging;
+// using Microsoft.Extensions.Options;
+// using Microsoft.AspNetCore.Authorization;
+// using System.Web;
+// using MySystem.Models.Main;
+// using LitJson;
+// using Library;
+// using System.Data;
+// using MySystem.Service.Main;
+
+// namespace MySystem.Areas.Api.Controllers.v1
+// {
+//     [Area("Api")]
+//     [Route("Api/v1/[controller]/[action]")]
+//     public class WorkSpaceController : BaseController
+//     {
+//         public WorkSpaceController(IHttpContextAccessor accessor) : base(accessor)
+//         {
+//         }
+
+//         #region 工作台-交易统计
+//         [Authorize]
+//         public JsonResult TradeAmount(string value)
+//         {
+//             value = DesDecrypt(value);
+//             JsonData data = JsonMapper.ToObject(value);
+//             Dictionary<string, object> Obj = TradeAmountDo(value);
+//             return Json(new AppResultJson() { Status = "1", Info = "", Data = Obj });
+//         }
+//         private Dictionary<string, object> TradeAmountDo(string value)
+//         {
+//             JsonData data = JsonMapper.ToObject(value);
+//             string Kind = data["Kind"].ToString(); //通道类型(1 原生 2 好哒)
+//             int MerchantId = int.Parse(function.CheckInt(data["MerchantId"].ToString())); //商户
+//             string TradeMonth = data["TradeMonth"].ToString(); //月份
+//             string TradeDate = data["TradeDate"].ToString(); //日期
+//             Dictionary<string, object> Obj = new Dictionary<string, object>();
+//             Merchantamountsummay query = new Merchantamountsummay();
+//             int Id = int.Parse(function.CheckInt(data["Id"].ToString()));
+//             query = MerchantamountsummayService.Query(Id);
+//             Obj.Add("TradeAmount", query.Tradeamount); //订单金额
+
+//             return Obj;
+//         }
+//         #endregion
+
+//     }
+// }

Models/Main/MerchantAccountLinkInfo.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models.Main
+{
+    public partial class MerchantAccountLinkInfo
+    {
+        public int Id { get; set; }
+        public int Sort { get; set; }
+        public int QueryCount { get; set; }
+        public int Status { get; set; }
+        public int Version { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public string CreateMan { get; set; }
+        public string UpdateMan { get; set; }
+        public string SeoTitle { get; set; }
+        public string SeoKeyword { get; set; }
+        public string SeoDescription { get; set; }
+        public int MerchantId { get; set; }
+        public int Kind { get; set; }
+        public int LoginId { get; set; }
+    }
+}

Models/Main/MerchantAddInfo.cs

@@ -142,5 +142,7 @@ namespace MySystem.Models.Main
         public int OpenAct { get; set; }
         public string StoreNo { get; set; }
         public string OutMchtNo { get; set; }
+        public string AliMerchantId { get; set; }
+        public string WeChatMerchantId { get; set; }
     }
 }

Models/Main/MerchantLoginInfo.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models.Main
+{
+    public partial class MerchantLoginInfo
+    {
+        public int Id { get; set; }
+        public int Sort { get; set; }
+        public int QueryCount { get; set; }
+        public int Status { get; set; }
+        public int Version { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public string CreateMan { get; set; }
+        public string UpdateMan { get; set; }
+        public string SeoTitle { get; set; }
+        public string SeoKeyword { get; set; }
+        public string SeoDescription { get; set; }
+        public string LoginPwd { get; set; }
+        public string LoginMobile { get; set; }
+    }
+}

Models/Main/MerchantTradeSummary.cs

@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models.Main
+{
+    public partial class MerchantTradeSummary
+    {
+        public int Id { get; set; }
+        public int Sort { get; set; }
+        public int QueryCount { get; set; }
+        public int Status { get; set; }
+        public int Version { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public string CreateMan { get; set; }
+        public string UpdateMan { get; set; }
+        public string SeoTitle { get; set; }
+        public string SeoKeyword { get; set; }
+        public string SeoDescription { get; set; }
+        public int OderCount { get; set; }
+        public decimal InFactAmount { get; set; }
+        public decimal TradeAmount { get; set; }
+        public string TradeDate { get; set; }
+        public string TradeMonth { get; set; }
+        public int MerchantId { get; set; }
+        public decimal AliPayInFactAmount { get; set; }
+        public decimal WeChatInfactAmount { get; set; }
+    }
+}

Models/Main/WebCMSEntities.cs

@@ -84,6 +84,7 @@ namespace MySystem.Models.Main
         public virtual DbSet<MachineReturn> MachineReturn { get; set; }
         public virtual DbSet<MachineUnBind> MachineUnBind { get; set; }
         public virtual DbSet<MenuRight> MenuRight { get; set; }
+        public virtual DbSet<MerchantAccountLinkInfo> MerchantAccountLinkInfo { get; set; }
         public virtual DbSet<MerchantAddInfo> MerchantAddInfo { get; set; }
         public virtual DbSet<MerchantAdmin> MerchantAdmin { get; set; }
         public virtual DbSet<MerchantAmountSummay> MerchantAmountSummay { get; set; }
@@ -98,9 +99,11 @@ namespace MySystem.Models.Main
         public virtual DbSet<MerchantForMobile> MerchantForMobile { get; set; }
         public virtual DbSet<MerchantForName> MerchantForName { get; set; }
         public virtual DbSet<MerchantInfo> MerchantInfo { get; set; }
+        public virtual DbSet<MerchantLoginInfo> MerchantLoginInfo { get; set; }
         public virtual DbSet<MerchantParamSet> MerchantParamSet { get; set; }
         public virtual DbSet<MerchantQrCode> MerchantQrCode { get; set; }
         public virtual DbSet<MerchantRebateDetail> MerchantRebateDetail { get; set; }
+        public virtual DbSet<MerchantTradeSummary> MerchantTradeSummary { get; set; }
         public virtual DbSet<Merchants> Merchants { get; set; }
         public virtual DbSet<MobileCodeCheck> MobileCodeCheck { get; set; }
         public virtual DbSet<MsgAlert> MsgAlert { get; set; }
@@ -5071,6 +5074,76 @@ namespace MySystem.Models.Main
                     .HasCollation("utf8_general_ci");
             });
 
+            modelBuilder.Entity<MerchantAccountLinkInfo>(entity =>
+            {
+                entity.HasComment("帐号关联信息");
+
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.CreateDate)
+                    .HasColumnType("datetime")
+                    .HasComment("创建时间");
+
+                entity.Property(e => e.CreateMan)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("创建人")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Kind)
+                    .HasColumnType("int(11)")
+                    .HasComment("进件通道");
+
+                entity.Property(e => e.LoginId)
+                    .HasColumnType("int(11)")
+                    .HasComment("登录账户Id");
+
+                entity.Property(e => e.MerchantId)
+                    .HasColumnType("int(11)")
+                    .HasComment("商户Id");
+
+                entity.Property(e => e.QueryCount)
+                    .HasColumnType("int(11)")
+                    .HasComment("点击量");
+
+                entity.Property(e => e.SeoDescription)
+                    .HasColumnType("varchar(500)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoKeyword)
+                    .HasColumnType("varchar(200)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoTitle)
+                    .HasColumnType("varchar(100)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Sort)
+                    .HasColumnType("int(11)")
+                    .HasComment("排序序号");
+
+                entity.Property(e => e.Status)
+                    .HasColumnType("int(11)")
+                    .HasComment("状态");
+
+                entity.Property(e => e.UpdateDate)
+                    .HasColumnType("datetime")
+                    .HasComment("更新时间");
+
+                entity.Property(e => e.UpdateMan)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("更新人")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Version)
+                    .HasColumnType("int(11)")
+                    .HasComment("版本号");
+            });
+
             modelBuilder.Entity<MerchantAddInfo>(entity =>
             {
                 entity.Property(e => e.Id).HasColumnType("int(11)");
@@ -5141,6 +5214,12 @@ namespace MySystem.Models.Main
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.AliMerchantId)
+                    .HasColumnType("varchar(100)")
+                    .HasComment("支付宝商户号")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
                 entity.Property(e => e.AlipayAuthToken)
                     .HasColumnType("varchar(100)")
                     .HasCharSet("utf8")
@@ -5725,13 +5804,19 @@ namespace MySystem.Models.Main
 
                 entity.Property(e => e.Version).HasColumnType("int(11)");
 
+                entity.Property(e => e.WeChatMerchantId)
+                    .HasColumnType("varchar(100)")
+                    .HasComment("微信商户号")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
                 entity.Property(e => e.WeChatRemark)
                     .HasColumnType("varchar(500)")
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
                 entity.Property(e => e.WeChatSignUrl)
-                    .HasColumnType("varchar(500)")
+                    .HasColumnType("longtext")
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
@@ -6533,6 +6618,76 @@ namespace MySystem.Models.Main
                 entity.Property(e => e.Version).HasColumnType("int(11)");
             });
 
+            modelBuilder.Entity<MerchantLoginInfo>(entity =>
+            {
+                entity.HasComment("商户登录信息");
+
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.CreateDate)
+                    .HasColumnType("datetime")
+                    .HasComment("创建时间");
+
+                entity.Property(e => e.CreateMan)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("创建人")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.LoginMobile)
+                    .HasColumnType("varchar(11)")
+                    .HasComment("登录手机")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.LoginPwd)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("登录密码")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.QueryCount)
+                    .HasColumnType("int(11)")
+                    .HasComment("点击量");
+
+                entity.Property(e => e.SeoDescription)
+                    .HasColumnType("varchar(500)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoKeyword)
+                    .HasColumnType("varchar(200)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoTitle)
+                    .HasColumnType("varchar(100)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Sort)
+                    .HasColumnType("int(11)")
+                    .HasComment("排序序号");
+
+                entity.Property(e => e.Status)
+                    .HasColumnType("int(11)")
+                    .HasComment("状态");
+
+                entity.Property(e => e.UpdateDate)
+                    .HasColumnType("datetime")
+                    .HasComment("更新时间");
+
+                entity.Property(e => e.UpdateMan)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("更新人")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Version)
+                    .HasColumnType("int(11)")
+                    .HasComment("版本号");
+            });
+
             modelBuilder.Entity<MerchantParamSet>(entity =>
             {
                 entity.Property(e => e.Id).HasColumnType("int(11)");
@@ -6748,6 +6903,100 @@ namespace MySystem.Models.Main
                 entity.Property(e => e.Version).HasColumnType("int(11)");
             });
 
+            modelBuilder.Entity<MerchantTradeSummary>(entity =>
+            {
+                entity.HasComment("商户交易统计表");
+
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.AliPayInFactAmount)
+                    .HasColumnType("decimal(18,2)")
+                    .HasComment("支付宝实收金额");
+
+                entity.Property(e => e.CreateDate)
+                    .HasColumnType("datetime")
+                    .HasComment("创建时间");
+
+                entity.Property(e => e.CreateMan)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("创建人")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.InFactAmount)
+                    .HasColumnType("decimal(18,2)")
+                    .HasComment("实收金额");
+
+                entity.Property(e => e.MerchantId)
+                    .HasColumnType("int(11)")
+                    .HasComment("商户Id");
+
+                entity.Property(e => e.OderCount)
+                    .HasColumnType("int(11)")
+                    .HasComment("订单数");
+
+                entity.Property(e => e.QueryCount)
+                    .HasColumnType("int(11)")
+                    .HasComment("点击量");
+
+                entity.Property(e => e.SeoDescription)
+                    .HasColumnType("varchar(500)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoKeyword)
+                    .HasColumnType("varchar(200)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoTitle)
+                    .HasColumnType("varchar(100)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Sort)
+                    .HasColumnType("int(11)")
+                    .HasComment("排序序号");
+
+                entity.Property(e => e.Status)
+                    .HasColumnType("int(11)")
+                    .HasComment("状态");
+
+                entity.Property(e => e.TradeAmount)
+                    .HasColumnType("decimal(18,2)")
+                    .HasComment("交易金额");
+
+                entity.Property(e => e.TradeDate)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("交易日期")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.TradeMonth)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("交易月份")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.UpdateDate)
+                    .HasColumnType("datetime")
+                    .HasComment("更新时间");
+
+                entity.Property(e => e.UpdateMan)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("更新人")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Version)
+                    .HasColumnType("int(11)")
+                    .HasComment("版本号");
+
+                entity.Property(e => e.WeChatInfactAmount)
+                    .HasColumnType("decimal(18,2)")
+                    .HasComment("微信实收金额");
+            });
+
             modelBuilder.Entity<Merchants>(entity =>
             {
                 entity.Property(e => e.Id).HasColumnType("int(11)");

Service/Main/ConsumerProfitService.cs

@@ -0,0 +1,236 @@
+/*
+ * 消费者分红记录
+ */
+
+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 ConsumerProfitService
+    {
+        static string _conn = ConfigurationManager.AppSettings["SqlConnStr"].ToString();
+
+        /// <summary>
+        /// 查询列表
+        /// </summary>
+        /// <param name="relationData">关联表</param>
+        /// <param name="condition">查询条件(sql语句)</param>
+        /// <param name="count">总数（输出）</param>
+        /// <param name="page">页码</param>
+        /// <param name="limit">每页条数</param>
+        /// <returns></returns>
+        public static List<Dictionary<string, object>> List(List<RelationData> relationData, string condition, out int count, int page = 1, int limit = 30, string orderBy = "Sort desc,Id desc")
+        {
+            List<string> fields = new List<string>(); //要显示的列
+            fields.Add("Id");
+            fields.Add("CreateDate"); //添加时间
+            fields.Add("Status"); //状态
+            fields.Add("MerchantId"); //商户
+            fields.Add("ConsumerId"); //消费者
+            fields.Add("OrderNo"); //订单号
+            fields.Add("PayMode"); //支付方式
+            fields.Add("PayMoney"); //支付金额
+            fields.Add("ReturnMoney"); //已返金额
+            fields.Add("SnNo"); //SN号
+            fields.Add("MaxDivi"); //最大分红
+            fields.Add("CurDivi"); //当前分红
+            fields.Add("IsAct"); //是否活动
+
+            Dictionary<string, object> obj = new DbService(AppConfig.Base.mainTables, _conn).IndexData("ConsumerProfit", relationData, orderBy, page, limit, condition, fields);
+            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
+            count = int.Parse(obj["count"].ToString());
+            return diclist;
+        }
+        public static List<Dictionary<string, object>> List(List<RelationData> relationData, string condition, int page = 1, int limit = 30, string orderBy = "Sort desc,Id desc")
+        {
+            List<string> fields = new List<string>(); //要显示的列
+            fields.Add("Id");
+            fields.Add("CreateDate"); //添加时间
+            fields.Add("Status"); //状态
+            fields.Add("MerchantId"); //商户
+            fields.Add("ConsumerId"); //消费者
+            fields.Add("OrderNo"); //订单号
+            fields.Add("PayMode"); //支付方式
+            fields.Add("PayMoney"); //支付金额
+            fields.Add("ReturnMoney"); //已返金额
+            fields.Add("SnNo"); //SN号
+            fields.Add("MaxDivi"); //最大分红
+            fields.Add("CurDivi"); //当前分红
+            fields.Add("IsAct"); //是否活动
+
+            Dictionary<string, object> obj = new DbService(AppConfig.Base.mainTables, _conn).IndexData("ConsumerProfit", relationData, orderBy, page, limit, condition, fields);
+            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
+            return diclist;
+        }
+
+        /// <summary>
+        /// 查询一条记录
+        /// </summary>
+        /// <param name="Id">主键Id</param>
+        /// <returns></returns>
+        public static ConsumerProfit Query(int Id)
+        {
+            WebCMSEntities db = new WebCMSEntities();
+            ConsumerProfit editData = db.ConsumerProfit.FirstOrDefault(m => m.Id == Id) ?? new ConsumerProfit();
+            db.Dispose();
+            return editData;
+        }
+        public static ConsumerProfit Query(string condition, string fields = "*")
+        {
+            var consumerProfit = new DbService(AppConfig.Base.mainTables, _conn).Query(fields, "ConsumerProfit", condition);
+            if (consumerProfit.Count > 0)
+            {
+                return Newtonsoft.Json.JsonConvert.DeserializeObject<ConsumerProfit>(Newtonsoft.Json.JsonConvert.SerializeObject(consumerProfit));
+            }
+            return new ConsumerProfit();
+        }
+
+        public static decimal Sum(string condition, string field)
+        {
+            var dt = new DbService(AppConfig.Base.mainTables, _conn).Query("Sum(" + field + ") " + field, "ConsumerProfit", 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, "ConsumerProfit", condition);
+            int result = 0;
+            if (dt.Count > 0)
+            {
+                result = int.Parse(dt[field].ToString());
+            }
+            return result;
+        }
+
+        /// <summary>
+        /// 查询是否存在
+        /// </summary>
+        /// <param name="Id">主键Id</param>
+        /// <returns></returns>
+        public static bool Exist(int Id)
+        {
+            WebCMSEntities db = new WebCMSEntities();
+            bool check = db.ConsumerProfit.Any(m => m.Id == Id);
+            db.Dispose();
+            return check;
+        }
+
+        /// <summary>
+        /// 添加数据
+        /// </summary>
+        /// <param name="Fields">要设置的字段</param>
+        /// <returns></returns>
+        public static AppResultJson Add(Dictionary<string, object> fields, bool check = true)
+        {
+            if (check)
+            {
+                if (string.IsNullOrEmpty(fields["IsAct"].ToString()))
+                {
+                    return new AppResultJson() { Status = "-1", Info = "请填写是否活动" };
+                }
+
+            }
+            int Id = new DbService(AppConfig.Base.mainTables, _conn).Add("ConsumerProfit", fields, 0);
+            return new AppResultJson() { Status = "1", Data = Id };
+        }
+
+        /// <summary>
+        /// 修改数据
+        /// </summary>
+        /// <param name="Fields">要设置的字段</param>
+        /// <param name="Id">主键Id</param>
+        public static AppResultJson Edit(Dictionary<string, object> fields, int Id, bool check = true)
+        {
+            if (check)
+            {
+                if (string.IsNullOrEmpty(fields["IsAct"].ToString()))
+                {
+                    return new AppResultJson() { Status = "-1", Info = "请填写是否活动" };
+                }
+
+            }
+            new DbService(AppConfig.Base.mainTables, _conn).Edit("ConsumerProfit", fields, Id);
+            return new AppResultJson() { Status = "1", Data = Id };
+        }
+
+        /// <summary>
+        /// 逻辑删除
+        /// </summary>
+        /// <param name="Id">主键Id</param>
+        public static void Remove(int Id)
+        {
+            Dictionary<string, object> fields = new Dictionary<string, object>();
+            fields.Add("Status", -1);
+            new DbService(AppConfig.Base.mainTables, _conn).Edit("ConsumerProfit", fields, Id);
+        }
+
+        /// <summary>
+        /// 删除数据
+        /// </summary>
+        /// <param name="Id">主键Id</param>
+        public static void Delete(int Id)
+        {
+            new DbService(AppConfig.Base.mainTables, _conn).Delete("ConsumerProfit", Id);
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="Id">主键Id</param>
+        /// <param name="Sort">排序序号</param>
+        public static void Sort(int Id, int Sort)
+        {
+            new DbService(AppConfig.Base.mainTables, _conn).Sort("ConsumerProfit", Sort, Id);
+        }
+
+        /// <summary>
+        /// 导入数据
+        /// </summary>
+        /// <param name="ExcelData">json数据</param>
+        public static void Import(string ExcelData)
+        {
+            WebCMSEntities db = new WebCMSEntities();
+            JsonData list = JsonMapper.ToObject(ExcelData);
+            for (int i = 1; i < list.Count; i++)
+            {
+                JsonData dr = list[i];
+
+                db.ConsumerProfit.Add(new ConsumerProfit()
+                {
+                    CreateDate = DateTime.Now,
+                    UpdateDate = DateTime.Now,
+
+                });
+                db.SaveChanges();
+            }
+            db.Dispose();
+        }
+
+        /// <summary>
+        /// 导出excel表格
+        /// </summary>
+        /// <param name="fields">查询条件(单个字段)</param>
+        /// <param name="condition">查询条件(sql语句)</param>
+        /// <returns></returns>
+        // public static void ExportExcel(List<RelationData> relationData, string condition)
+        // {
+
+        // }
+    }
+}

Service/Main/MerchantAccountLinkInfoService.cs

@@ -0,0 +1,238 @@
+/*
+ * 商户登录信息
+ */
+
+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 MerchantAccountLinkInfoSercice
+    {
+        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("Sort");
+            fields.Add("QueryCount");
+            fields.Add("Status");
+            fields.Add("CreateDate");
+            fields.Add("UpdateDate");
+            fields.Add("SeoTitle");
+            fields.Add("SeoKeyword");
+            fields.Add("SeoDescription");
+            fields.Add("PayMode"); //支付方式
+            fields.Add("TotalActual"); //实际返现金额
+            fields.Add("TradeAmount"); //订单金额
+            fields.Add("TradeDate"); //日期
+            fields.Add("TradeMonth"); //月份
+            fields.Add("MerchantId"); //商户
+            fields.Add("TradeCount"); //交易笔数
+            fields.Add("IsAct"); //交易笔数
+            Dictionary<string, object> obj = new DbService(AppConfig.Base.mainTables, _conn).IndexData("MerchantAccountLinkInfo", 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("Sort");
+            fields.Add("QueryCount");
+            fields.Add("Status");
+            fields.Add("CreateDate");
+            fields.Add("UpdateDate");
+            fields.Add("SeoTitle");
+            fields.Add("SeoKeyword");
+            fields.Add("SeoDescription");
+            fields.Add("PayMode"); //支付方式
+            fields.Add("TotalActual"); //实际返现金额
+            fields.Add("TradeAmount"); //订单金额
+            fields.Add("TradeDate"); //日期
+            fields.Add("TradeMonth"); //月份
+            fields.Add("MerchantId"); //商户
+            fields.Add("TradeCount"); //交易笔数
+            fields.Add("IsAct"); //交易笔数
+
+            Dictionary<string, object> obj = new DbService(AppConfig.Base.mainTables, _conn).IndexData("MerchantAccountLinkInfo", 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 MerchantAccountLinkInfo Query(int Id)
+        {
+            WebCMSEntities db = new WebCMSEntities();
+            MerchantAccountLinkInfo editData = db.MerchantAccountLinkInfo.FirstOrDefault(m => m.Id == Id) ?? new MerchantAccountLinkInfo();
+            db.Dispose();
+            return editData;
+        }
+        public static MerchantAccountLinkInfo Query(string condition, string fields = "*")
+        {
+            var merchantAccountLinkInfo = new DbService(AppConfig.Base.mainTables, _conn).Query(fields, "MerchantAccountLinkInfo", condition);
+            if (merchantAccountLinkInfo.Count > 0)
+            {
+                return Newtonsoft.Json.JsonConvert.DeserializeObject<MerchantAccountLinkInfo>(Newtonsoft.Json.JsonConvert.SerializeObject(merchantAccountLinkInfo));
+            }
+            return new MerchantAccountLinkInfo();
+        }
+
+        public static decimal Sum(string condition, string field)
+        {
+            var dt = new DbService(AppConfig.Base.mainTables, _conn).Query("Sum(" + field + ") " + field, "MerchantAccountLinkInfo", 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, "MerchantAccountLinkInfo", 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.MerchantAccountLinkInfo.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)
+            {
+            }
+            int Id = new DbService(AppConfig.Base.mainTables, _conn).Add("MerchantAccountLinkInfo", 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["NickName"].ToString()))
+                {
+                    return new AppResultJson() { Status = "-1", Info = "请填写昵称" };
+                }
+
+            }
+            new DbService(AppConfig.Base.mainTables, _conn).Edit("MerchantAccountLinkInfo", 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("MerchantAccountLinkInfo", fields, Id);
+        }
+
+        /// <summary>
+        /// 删除数据
+        /// </summary>
+        /// <param name="Id">主键Id</param>
+        public static void Delete(int Id)
+        {
+            new DbService(AppConfig.Base.mainTables, _conn).Delete("MerchantAccountLinkInfo", 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("MerchantAccountLinkInfo", 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.MerchantAccountLinkInfo.Add(new MerchantAccountLinkInfo()
+                {
+                    CreateDate = DateTime.Now,
+                    UpdateDate = DateTime.Now,
+
+                });
+                db.SaveChanges();
+            }
+            db.Dispose();
+        }
+
+        /// <summary>
+        /// 导出excel表格
+        /// </summary>
+        /// <param name="fields">查询条件(单个字段)</param>
+        /// <param name="condition">查询条件(sql语句)</param>
+        /// <returns></returns>
+        // public static void ExportExcel(List<RelationData> relationData, string condition)
+        // {
+
+        // }
+    }
+}

Service/Main/MerchantAmountSummayService.cs

@@ -0,0 +1,238 @@
+/*
+ * 商户业绩统计
+ */
+
+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 MerchantAmountSummayService
+    {
+        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("Sort");
+            fields.Add("QueryCount");
+            fields.Add("Status");
+            fields.Add("CreateDate");
+            fields.Add("UpdateDate");
+            fields.Add("SeoTitle");
+            fields.Add("SeoKeyword");
+            fields.Add("SeoDescription");
+            fields.Add("PayMode"); //支付方式
+            fields.Add("TotalActual"); //实际返现金额
+            fields.Add("TradeAmount"); //订单金额
+            fields.Add("TradeDate"); //日期
+            fields.Add("TradeMonth"); //月份
+            fields.Add("MerchantId"); //商户
+            fields.Add("TradeCount"); //交易笔数
+            fields.Add("IsAct"); //交易笔数
+            Dictionary<string, object> obj = new DbService(AppConfig.Base.mainTables, _conn).IndexData("MerchantAmountSummay", 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("Sort");
+            fields.Add("QueryCount");
+            fields.Add("Status");
+            fields.Add("CreateDate");
+            fields.Add("UpdateDate");
+            fields.Add("SeoTitle");
+            fields.Add("SeoKeyword");
+            fields.Add("SeoDescription");
+            fields.Add("PayMode"); //支付方式
+            fields.Add("TotalActual"); //实际返现金额
+            fields.Add("TradeAmount"); //订单金额
+            fields.Add("TradeDate"); //日期
+            fields.Add("TradeMonth"); //月份
+            fields.Add("MerchantId"); //商户
+            fields.Add("TradeCount"); //交易笔数
+            fields.Add("IsAct"); //交易笔数
+
+            Dictionary<string, object> obj = new DbService(AppConfig.Base.mainTables, _conn).IndexData("MerchantAmountSummay", 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 MerchantAmountSummay Query(int Id)
+        {
+            WebCMSEntities db = new WebCMSEntities();
+            MerchantAmountSummay editData = db.MerchantAmountSummay.FirstOrDefault(m => m.Id == Id) ?? new MerchantAmountSummay();
+            db.Dispose();
+            return editData;
+        }
+        public static MerchantAmountSummay Query(string condition, string fields = "*")
+        {
+            var merchantAmountSummay = new DbService(AppConfig.Base.mainTables, _conn).Query(fields, "MerchantAmountSummay", condition);
+            if (merchantAmountSummay.Count > 0)
+            {
+                return Newtonsoft.Json.JsonConvert.DeserializeObject<MerchantAmountSummay>(Newtonsoft.Json.JsonConvert.SerializeObject(merchantAmountSummay));
+            }
+            return new MerchantAmountSummay();
+        }
+
+        public static decimal Sum(string condition, string field)
+        {
+            var dt = new DbService(AppConfig.Base.mainTables, _conn).Query("Sum(" + field + ") " + field, "MerchantAmountSummay", 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, "MerchantAmountSummay", 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.MerchantAmountSummay.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)
+            {
+            }
+            int Id = new DbService(AppConfig.Base.mainTables, _conn).Add("MerchantAmountSummay", 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["NickName"].ToString()))
+                {
+                    return new AppResultJson() { Status = "-1", Info = "请填写昵称" };
+                }
+
+            }
+            new DbService(AppConfig.Base.mainTables, _conn).Edit("MerchantAmountSummay", 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("MerchantAmountSummay", fields, Id);
+        }
+
+        /// <summary>
+        /// 删除数据
+        /// </summary>
+        /// <param name="Id">主键Id</param>
+        public static void Delete(int Id)
+        {
+            new DbService(AppConfig.Base.mainTables, _conn).Delete("MerchantAmountSummay", 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("MerchantAmountSummay", 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.MerchantAmountSummay.Add(new MerchantAmountSummay()
+                {
+                    CreateDate = DateTime.Now,
+                    UpdateDate = DateTime.Now,
+
+                });
+                db.SaveChanges();
+            }
+            db.Dispose();
+        }
+
+        /// <summary>
+        /// 导出excel表格
+        /// </summary>
+        /// <param name="fields">查询条件(单个字段)</param>
+        /// <param name="condition">查询条件(sql语句)</param>
+        /// <returns></returns>
+        // public static void ExportExcel(List<RelationData> relationData, string condition)
+        // {
+
+        // }
+    }
+}

Service/Main/MerchantLoginInfoService.cs

@@ -0,0 +1,238 @@
+/*
+ * 商户登录信息
+ */
+
+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 MerchantLoginInfoService
+    {
+        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("Sort");
+            fields.Add("QueryCount");
+            fields.Add("Status");
+            fields.Add("CreateDate");
+            fields.Add("UpdateDate");
+            fields.Add("SeoTitle");
+            fields.Add("SeoKeyword");
+            fields.Add("SeoDescription");
+            fields.Add("PayMode"); //支付方式
+            fields.Add("TotalActual"); //实际返现金额
+            fields.Add("TradeAmount"); //订单金额
+            fields.Add("TradeDate"); //日期
+            fields.Add("TradeMonth"); //月份
+            fields.Add("MerchantId"); //商户
+            fields.Add("TradeCount"); //交易笔数
+            fields.Add("IsAct"); //交易笔数
+            Dictionary<string, object> obj = new DbService(AppConfig.Base.mainTables, _conn).IndexData("MerchantLoginInfo", 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("Sort");
+            fields.Add("QueryCount");
+            fields.Add("Status");
+            fields.Add("CreateDate");
+            fields.Add("UpdateDate");
+            fields.Add("SeoTitle");
+            fields.Add("SeoKeyword");
+            fields.Add("SeoDescription");
+            fields.Add("PayMode"); //支付方式
+            fields.Add("TotalActual"); //实际返现金额
+            fields.Add("TradeAmount"); //订单金额
+            fields.Add("TradeDate"); //日期
+            fields.Add("TradeMonth"); //月份
+            fields.Add("MerchantId"); //商户
+            fields.Add("TradeCount"); //交易笔数
+            fields.Add("IsAct"); //交易笔数
+
+            Dictionary<string, object> obj = new DbService(AppConfig.Base.mainTables, _conn).IndexData("MerchantLoginInfo", 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 MerchantLoginInfo Query(int Id)
+        {
+            WebCMSEntities db = new WebCMSEntities();
+            MerchantLoginInfo editData = db.MerchantLoginInfo.FirstOrDefault(m => m.Id == Id) ?? new MerchantLoginInfo();
+            db.Dispose();
+            return editData;
+        }
+        public static MerchantLoginInfo Query(string condition, string fields = "*")
+        {
+            var merchantLoginInfo = new DbService(AppConfig.Base.mainTables, _conn).Query(fields, "MerchantLoginInfo", condition);
+            if (merchantLoginInfo.Count > 0)
+            {
+                return Newtonsoft.Json.JsonConvert.DeserializeObject<MerchantLoginInfo>(Newtonsoft.Json.JsonConvert.SerializeObject(merchantLoginInfo));
+            }
+            return new MerchantLoginInfo();
+        }
+
+        public static decimal Sum(string condition, string field)
+        {
+            var dt = new DbService(AppConfig.Base.mainTables, _conn).Query("Sum(" + field + ") " + field, "MerchantLoginInfo", 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, "MerchantLoginInfo", 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.MerchantLoginInfo.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)
+            {
+            }
+            int Id = new DbService(AppConfig.Base.mainTables, _conn).Add("MerchantLoginInfo", 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["NickName"].ToString()))
+                {
+                    return new AppResultJson() { Status = "-1", Info = "请填写昵称" };
+                }
+
+            }
+            new DbService(AppConfig.Base.mainTables, _conn).Edit("MerchantLoginInfo", 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("MerchantLoginInfo", fields, Id);
+        }
+
+        /// <summary>
+        /// 删除数据
+        /// </summary>
+        /// <param name="Id">主键Id</param>
+        public static void Delete(int Id)
+        {
+            new DbService(AppConfig.Base.mainTables, _conn).Delete("MerchantLoginInfo", 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("MerchantLoginInfo", 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.MerchantLoginInfo.Add(new MerchantLoginInfo()
+                {
+                    CreateDate = DateTime.Now,
+                    UpdateDate = DateTime.Now,
+
+                });
+                db.SaveChanges();
+            }
+            db.Dispose();
+        }
+
+        /// <summary>
+        /// 导出excel表格
+        /// </summary>
+        /// <param name="fields">查询条件(单个字段)</param>
+        /// <param name="condition">查询条件(sql语句)</param>
+        /// <returns></returns>
+        // public static void ExportExcel(List<RelationData> relationData, string condition)
+        // {
+
+        // }
+    }
+}

Service/Main/MerchantTradeSummaryService.cs

@@ -0,0 +1,240 @@
+/*
+ * 商户交易统计
+ */
+
+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 MerchantTradeSummaryService
+    {
+        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, string TradeTime, 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("Sort");
+            fields.Add("QueryCount");
+            fields.Add("Status");
+            fields.Add("CreateDate");
+            fields.Add("UpdateDate");
+            fields.Add("SeoTitle");
+            fields.Add("SeoKeyword");
+            fields.Add("SeoDescription");
+            fields.Add("OderCount"); // 订单数
+            fields.Add("PayMode"); //支付方式
+            fields.Add("TradeAmount"); //订单金额
+            fields.Add("InFactAmount"); //实收金额
+            fields.Add("WeChatInFactAmount"); //微信实收金额
+            fields.Add("AliPayInFactAmount"); //支付宝实收金额
+            fields.Add("TradeDate"); //日期
+            fields.Add("TradeMonth"); //月份
+            fields.Add("MerchantId"); //商户Id
+            Dictionary<string, object> obj = new DbService(AppConfig.Base.mainTables, _conn).IndexData("MerchantTradeSummary" + TradeTime, 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, string TradeTime, int page = 1, int limit = 30, string orderBy = "Sort desc,Id desc")
+        {
+            List<string> fields = new List<string>(); //要显示的列
+            fields.Add("Id");
+            fields.Add("Sort");
+            fields.Add("QueryCount");
+            fields.Add("Status");
+            fields.Add("CreateDate");
+            fields.Add("UpdateDate");
+            fields.Add("SeoTitle");
+            fields.Add("SeoKeyword");
+            fields.Add("SeoDescription");
+            fields.Add("OderCount"); // 订单数
+            fields.Add("PayMode"); //支付方式
+            fields.Add("TradeAmount"); //订单金额
+            fields.Add("InFactAmount"); //实收金额
+            fields.Add("WeChatInFactAmount"); //微信实收金额
+            fields.Add("AliPayInFactAmount"); //支付宝实收金额
+            fields.Add("TradeDate"); //日期
+            fields.Add("TradeMonth"); //月份
+            fields.Add("MerchantId"); //商户Id
+
+            Dictionary<string, object> obj = new DbService(AppConfig.Base.mainTables, _conn).IndexData("MerchantTradeSummary" + TradeTime, 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 MerchantTradeSummary Query(int Id, string TradeTime)
+        {
+            WebCMSEntities db = new WebCMSEntities();
+            MerchantTradeSummary editData = db.MerchantTradeSummary.FirstOrDefault(m => m.Id == Id) ?? new MerchantTradeSummary();
+            db.Dispose();
+            return editData;
+        }
+        public static MerchantTradeSummary Query(string condition, string TradeTime, string fields = "*")
+        {
+            var merchantTradeSummary = new DbService(AppConfig.Base.mainTables, _conn).Query(fields, "MerchantTradeSummary" + TradeTime, condition);
+            if (merchantTradeSummary.Count > 0)
+            {
+                return Newtonsoft.Json.JsonConvert.DeserializeObject<MerchantTradeSummary>(Newtonsoft.Json.JsonConvert.SerializeObject(merchantTradeSummary));
+            }
+            return new MerchantTradeSummary();
+        }
+
+        public static decimal Sum(string condition, string TradeTime, string field)
+        {
+            var dt = new DbService(AppConfig.Base.mainTables, _conn).Query("Sum(" + field + ") " + field, "MerchantTradeSummary" + TradeTime, 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 TradeTime, string condition = "", string field = "Id")
+        {
+            var dt = new DbService(AppConfig.Base.mainTables, _conn).Query("Count(" + field + ") " + field, "MerchantTradeSummary" + TradeTime, 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, string TradeTime)
+        {
+            WebCMSEntities db = new WebCMSEntities();
+            bool check = db.MerchantTradeSummary.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)
+            {
+            }
+            int Id = new DbService(AppConfig.Base.mainTables, _conn).Add("MerchantTradeSummary", 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["NickName"].ToString()))
+                {
+                    return new AppResultJson() { Status = "-1", Info = "请填写昵称" };
+                }
+
+            }
+            new DbService(AppConfig.Base.mainTables, _conn).Edit("MerchantTradeSummary", 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("MerchantTradeSummary", fields, Id);
+        }
+
+        /// <summary>
+        /// 删除数据
+        /// </summary>
+        /// <param name="Id">主键Id</param>
+        public static void Delete(int Id)
+        {
+            new DbService(AppConfig.Base.mainTables, _conn).Delete("MerchantTradeSummary", 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("MerchantTradeSummary", 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.MerchantTradeSummary.Add(new MerchantTradeSummary()
+                {
+                    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/Business/BusinessUtil.cs

@@ -0,0 +1,139 @@
+using MySystem.Models.Main;
+using Library;
+using MySystem.Service.Main;
+using System.Collections.Generic;
+using System;
+
+namespace MySystem
+{
+    /// <summary>
+    /// 经营数据工具类
+    /// </summary>
+    public class BusinessUtil
+    {
+        #region 经营数据记录(月)
+        /// <summary>
+        /// 经营数据记录
+        /// </summary>
+        /// <param name="MerchantId">商户Id</param>
+        /// <param name="TradeMonth">月份</param>
+        /// <param name="pageSize">条数</param>
+        /// <param name="pageNum">页数</param>
+        /// <returns></returns>
+        public static List<Dictionary<string, object>> BussinessRecordForMonth(int MerchantId, string TradeMonth, int pageSize, int pageNum)
+        {
+            List<RelationData> relationData = new List<RelationData>();
+            List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
+            List<Dictionary<string, object>> source = MerchantTradeSummaryService.List(relationData, " and MerchantId=" + MerchantId, TradeMonth, pageNum, pageSize);
+            foreach (Dictionary<string, object> subdata in source)
+            {
+                Dictionary<string, object> curData = new Dictionary<string, object>();
+                curData.Add("TradeDate", subdata["TradeDate"].ToString()); //日期
+                curData.Add("TotalAmount", subdata["TotalAmount"].ToString()); //营业总金额
+                curData.Add("InFactAmount", subdata["InFactAmount"].ToString()); //实收总金额
+                curData.Add("WeChatInFactAmount", subdata["WeChatInFactAmount"].ToString()); //微信实收
+                curData.Add("AliPayInFactAmount", subdata["AliPayInFactAmount"].ToString()); //支付宝实收
+                curData.Add("OrderCount", subdata["OrderCount"].ToString()); //订单数
+                dataList.Add(curData);
+            }
+            return dataList;
+        }
+        #endregion
+
+
+        #region 经营数据记录(半年)
+        /// <summary>
+        /// 经营数据记录(半年)
+        /// </summary>
+        /// <param name="MerchantId">商户Id</param>
+        /// <param name="pageSize">条数</param>
+        /// <param name="pageNum">页数</param>
+        /// <returns></returns>
+        public static List<Dictionary<string, object>> BussinessRecordForHalfYear(int MerchantId, int pageSize, int pageNum)
+        {
+            var TradeMonth = "";
+            List<RelationData> relationData = new List<RelationData>();
+            List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
+            List<Dictionary<string, object>> source = MerchantTradeSummaryService.List(relationData, " and MerchantId=" + MerchantId, TradeMonth, pageNum, pageSize);
+            foreach (Dictionary<string, object> subdata in source)
+            {
+                Dictionary<string, object> curData = new Dictionary<string, object>();
+                curData.Add("TradeDate", subdata["TradeDate"].ToString()); //日期
+                curData.Add("TotalAmount", subdata["TotalAmount"].ToString()); //营业总金额
+                curData.Add("InFactAmount", subdata["InFactAmount"].ToString()); //实收总金额
+                curData.Add("WeChatInFactAmount", subdata["WeChatInFactAmount"].ToString()); //微信实收
+                curData.Add("AliPayInFactAmount", subdata["AliPayInFactAmount"].ToString()); //支付宝实收
+                curData.Add("OrderCount", subdata["OrderCount"].ToString()); //订单数
+                dataList.Add(curData);
+            }
+            return dataList;
+        }
+        #endregion
+
+
+        #region 经营详情列表
+        /// <summary>
+        /// 经营详情列表
+        /// </summary>
+        /// <param name="condition">查询条件</param>
+        /// <param name="pageSize">条数</param>
+        /// <param name="pageNum">页数</param>
+        /// <returns></returns>
+        public static List<Dictionary<string, object>> DayDetailList(string condition, int pageSize, int pageNum)
+        {
+            List<RelationData> relationData = new List<RelationData>();
+            List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
+            List<Dictionary<string, object>> source = ConsumerOrdersService.List(relationData, condition, pageNum, pageSize);
+            foreach (Dictionary<string, object> subdata in source)
+            {
+                Dictionary<string, object> curData = new Dictionary<string, object>();
+                curData.Add("Id", subdata["Id"].ToString()); //订单Id
+                curData.Add("TradeDate", "支付时间" + " " + DateTime.Parse(subdata["CreateDate"].ToString()).ToString("HH:mm:ss")); //日期
+                curData.Add("PayMode", subdata["PayMode"].ToString()); //支付方式(1 支付宝 2 微信)
+                curData.Add("IsAct", subdata["IsAct"].ToString()); //是否活动(1 是 0 否)
+                curData.Add("PayMoney", "+" + subdata["PayMoney"].ToString()); //订单金额
+                dataList.Add(curData);
+            }
+            return dataList;
+        }
+        #endregion
+
+
+        #region 交易详情
+        /// <summary>
+        /// 交易详情
+        /// </summary>
+        /// <param name="condition">查询条件</param>
+        /// <returns></returns>
+        public static Dictionary<string, object> OrderDetail(string condition)
+        {
+            List<RelationData> relationData = new List<RelationData>();
+            Dictionary<string, object> obj = new Dictionary<string, object>();
+            List<Dictionary<string, object>> source = ConsumerOrdersService.List(relationData, condition, 1, 999);
+            foreach (Dictionary<string, object> subdata in source)
+            {
+                obj.Add("TradeDate", DateTime.Parse(subdata["CreateDate"].ToString()).ToString("yyyy-MM-dd HH:mm:ss")); //日期
+                obj.Add("PayMode", subdata["PayMode"].ToString()); //支付方式(1 微信 2 支付宝)
+                obj.Add("PayMoney", subdata["PayMoney"].ToString()); //是否活动(1 是 0 否)
+                obj.Add("IsAct", subdata["IsAct"].ToString()); //是否活动(1 是 0 否)
+                obj.Add("OrderNo", subdata["OrderNo"].ToString()); //订单号
+                Dictionary<string, object> cdata = new Dictionary<string, object>();
+                List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
+                List<Dictionary<string, object>> dics = ConsumerProfitService.List(relationData, " and OrderId=" + int.Parse(subdata["Id"].ToString()) + "", 1, 999);
+                foreach (Dictionary<string, object> dic in dics)
+                {
+                    var CreateDate = DateTime.Parse(subdata["CreateDate"].ToString());
+                    var TradeDate = CreateDate.Month + "月" + CreateDate.Day + "日" + " " + CreateDate.ToString("HH:mm");
+                    cdata.Add("ProfitDate", TradeDate); //分红时间
+                    cdata.Add("ProfitAmount", "+" + dic["GetMoney"].ToString()); //分红金额
+                    dataList.Add(cdata);
+                }
+                obj.Add("ProfitTotalAmount", ConsumerProfitService.Sum(" and OrderId=" + int.Parse(subdata["Id"].ToString()) + "", "GetMoney").ToString("f2") + "(元)"); //分红总金额
+                obj.Add("ProfitList", dataList); //订单分红记录列表
+            }
+            return obj;
+        }
+        #endregion
+
+    }
+}

Util/HaoDa/HaoDaHelper.cs

@@ -373,6 +373,70 @@ namespace MySystem
             return result;
         }
 
+        /// <summary>
+        /// 好哒到账记录查询
+        /// </summary>
+        /// <param name="mchtNo">商户号</param>
+        /// <param name="startTime">查询开始时间（yyyy-MM-dd）</param>
+        /// <param name="endTime">查询结束时间（yyyy-MM-dd），最大查询时间区间31天</param>
+        /// <param name="tradeMchtNo">收单商户号（15位）</param>
+        /// <param name="cardNo">结算卡号</param>
+        /// <param name="settleStatus">出款状态（0：入账成功、1：入账失败、2：结算超时、3：入账受理成功、4：已提交结算请求）</param>
+        /// <param name="page">当前页数，默认1</param>
+        /// <param name="rows">每页大小，默认10，最大500</param>
+        /// <returns></returns>
+        public string CardInComeRecord(string mchtNo, string startTime, string endTime, string tradeMchtNo, string cardNo, string settleStatus, string page, string rows)
+        {
+            function.WriteLog(DateTime.Now.ToString(), "好哒到账记录查询");
+            Dictionary<string, object> reqdic = new Dictionary<string, object>();
+            reqdic.Add("mchtNo", mchtNo); //商户号
+            reqdic.Add("startTime", startTime); //查询开始时间（yyyy-MM-dd）
+            reqdic.Add("endTime", endTime); //查询结束时间（yyyy-MM-dd），最大查询时间区间31天
+            reqdic.Add("tradeMchtNo", tradeMchtNo); //收单商户号（15位）
+            reqdic.Add("cardNo", cardNo); //结算卡号
+            reqdic.Add("settleStatus", settleStatus); //出款状态（0：入账成功、1：入账失败、2：结算超时、3：入账受理成功、4：已提交结算请求）
+            reqdic.Add("page", page); //当前页数，默认1
+            reqdic.Add("rows", rows); //每页大小，默认10，最大500
+
+            string req = Newtonsoft.Json.JsonConvert.SerializeObject(reqdic);
+            function.WriteLog(req, "好哒到账记录查询");
+            Dictionary<string, string> headdic = GetHeader(req);
+            string head = Newtonsoft.Json.JsonConvert.SerializeObject(headdic);
+            function.WriteLog("请求头\n" + head, "好哒到账记录查询");
+            function.WriteLog("请求参数\n" + req, "好哒到账记录查询");
+            function.WriteLog("请求地址：" + BoxRequestUrl + "/api/v3/hzg/accb/to_account/query", "好哒到账记录查询");
+            string result = PostWebRequest(BoxRequestUrl + "/api/v3/hzg/accb/to_account/query", req, headdic);
+            function.WriteLog("返回\n" + result + "\n\n", "好哒到账记录查询");
+
+            return result;
+        }
+
+        /// <summary>
+        /// 好哒到账记录详情
+        /// </summary>
+        /// <param name="mchtNo">商户号</param>
+        /// <param name="id">id</param>
+        /// <returns></returns>
+        public string CardInComeDetail(string mchtNo, string id)
+        {
+            function.WriteLog(DateTime.Now.ToString(), "好哒到账记录详情");
+            Dictionary<string, object> reqdic = new Dictionary<string, object>();
+            reqdic.Add("mchtNo", mchtNo); //商户号
+            reqdic.Add("id", id); //id
+
+            string req = Newtonsoft.Json.JsonConvert.SerializeObject(reqdic);
+            function.WriteLog(req, "好哒到账记录详情");
+            Dictionary<string, string> headdic = GetHeader(req);
+            string head = Newtonsoft.Json.JsonConvert.SerializeObject(headdic);
+            function.WriteLog("请求头\n" + head, "好哒到账记录详情");
+            function.WriteLog("请求参数\n" + req, "好哒到账记录详情");
+            function.WriteLog("请求地址：" + BoxRequestUrl + "/api/v3/hzg/accb/to_account/get", "好哒到账记录详情");
+            string result = PostWebRequest(BoxRequestUrl + "/api/v3/hzg/accb/to_account/get", req, headdic);
+            function.WriteLog("返回\n" + result + "\n\n", "好哒到账记录详情");
+
+            return result;
+        }
+
 
         public Dictionary<string, string> GetHeader(string req)
         {

Util/MySelf/MySelfUtil.cs

@@ -0,0 +1,103 @@
+using MySystem.Models.Main;
+using Library;
+using MySystem.Service.Main;
+using System.Collections.Generic;
+using System;
+using LitJson;
+
+namespace MySystem
+{
+    /// <summary>
+    /// 我的工具类
+    /// </summary>
+    public class MySelfUtil
+    {
+        #region 到账记录列表
+        /// <summary>
+        /// 到账记录列表
+        /// </summary>
+        /// <param name="condition">查询条件</param>
+        /// <param name="pageSize">条数</param>
+        /// <param name="pageNum">页数</param>
+        /// <returns></returns>
+        public static List<Dictionary<string, object>> CardInComeRecordList(int MerchantId, string TradeMonth, string pageSize, string pageNum)
+        {
+            DateTime start = new DateTime(int.Parse(TradeMonth.Substring(0, 4)), int.Parse(TradeMonth.Substring(TradeMonth.Length - 2, 2)), 1);
+            DateTime end = start.AddMonths(1).AddDays(-1);
+            var merchantInfo = MerchantAddInfoService.Query(MerchantId);
+            JsonData Info = JsonMapper.ToObject(HaoDaHelper.Instance.CardInComeRecord(merchantInfo.OutMchtNo, start.ToString("yyyy-MM-dd"), end.ToString("yyyy-MM-dd"), merchantInfo.MchtNo, "", "", pageNum, pageSize));
+            List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
+            if (Info["resultCode"].ToString() == "1")
+            {
+                var list = Info["list"];
+                for (int i = 0; i < list.Count; i++)
+                {
+                    Dictionary<string, object> curData = new Dictionary<string, object>();
+                    var item = list[i];
+                    curData.Add("Id", item["id"].ToString()); //订单Id
+                    curData.Add("SettleStatus", item["settleStatus"].ToString()); //结算状态(0：未结算；1：结算中；2：已结算)
+                    curData.Add("SettleDate", item["settleDate"].ToString().Substring(item["settleDate"].ToString().Length - 5, 5)); //结算日期
+                    curData.Add("SettleAmount", "+" + item["settleAmount"].ToString()); //结算金额
+                    curData.Add("TradeMchtName", item["tradeMchtName"].ToString()); //收单商户名称
+                    curData.Add("BankName", item["bankName"].ToString()); //开户行名称
+                    curData.Add("BankLogo", item["bankLogo"].ToString()); //银行卡logo
+                    dataList.Add(curData);
+                }
+            }
+            return dataList;
+        }
+        #endregion
+
+
+        #region 到账记录详情
+        /// <summary>
+        /// 到账记录详情
+        /// </summary>
+        /// <param name="condition">查询条件</param>
+        /// <param name="pageSize">条数</param>
+        /// <param name="pageNum">页数</param>
+        /// <returns></returns>
+        public static Dictionary<string, object> CardInComeRecordDetail(int MerchantId, string OrderId)
+        {
+            var merchantInfo = MerchantAddInfoService.Query(MerchantId);
+            JsonData Info = JsonMapper.ToObject(HaoDaHelper.Instance.CardInComeDetail(merchantInfo.OutMchtNo, OrderId));
+            Dictionary<string, object> obj = new Dictionary<string, object>();
+            if (Info["code"].ToString() == "1")
+            {
+                obj.Add("Id", Info["data"]["id"].ToString()); //订单Id
+                obj.Add("SettleStatus", Info["data"]["settleStatus"].ToString()); //结算状态(0：未结算；1：结算中；2：已结算)
+                obj.Add("SettleType", Info["data"]["settleType"].ToString()); //结算周期
+                obj.Add("SettleDate", Info["data"]["settleDate"].ToString().Substring(Info["data"]["settleDate"].ToString().Length - 5, 5)); //结算日期
+                obj.Add("ClearTime", Info["data"]["clearTime"].ToString().Substring(Info["data"]["clearTime"].ToString().Length - 5, 5)); //出款受理时间
+                obj.Add("RemitTime", Info["data"]["remitTime"].ToString().Substring(Info["data"]["remitTime"].ToString().Length - 5, 5)); //出款成功时间
+                obj.Add("SettleAmount", "+" + Info["data"]["settleAmount"].ToString()); //结算金额
+                obj.Add("TradeMchtName", Info["data"]["tradeMchtName"].ToString()); //收单商户名称
+                obj.Add("BankName", Info["data"]["bankName"].ToString() + Info["data"]["cardNo"].ToString().Substring(Info["data"]["cardNo"].ToString().Length - 4, 4)); //开户行名称
+                obj.Add("BankLogo", Info["data"]["bankLogo"].ToString()); //银行卡logo
+            }
+            return obj;
+        }
+        #endregion
+
+        #region 我的-设置-修改登录手机号(新手机验证)
+        /// <summary>
+        /// 我的-设置-修改登录手机号(新手机验证)
+        /// </summary>
+        /// <param name="LoginMobile">原手机号</param>
+        /// <param name="Mobile">新手机号</param>
+        /// <returns></returns>
+        public static string ChangeLoginMobile(string LoginMobile, string Mobile)
+        {
+            var info = MerchantLoginInfoService.Query(" and LoginMobile=" + LoginMobile + "");
+            if (info.Id > 0)
+            {
+                Dictionary<string, object> obj = new Dictionary<string, object>();
+                obj.Add("LoginMobile", Mobile);
+                MerchantLoginInfoService.Edit(obj, info.Id);
+            }
+            return "修改成功";
+        }
+        #endregion
+
+    }
+}

Util/WorkSpace/WorkSpaceUtil.cs

@@ -0,0 +1,47 @@
+using MySystem.Models.Main;
+using Library;
+using MySystem.Service.Main;
+using System.Collections.Generic;
+using System;
+using LitJson;
+
+namespace MySystem
+{
+    /// <summary>
+    /// 工作台工具类
+    /// </summary>
+    public class WorkSpaceUtil
+    {
+
+        // #region 到账记录详情
+        // /// <summary>
+        // /// 到账记录详情
+        // /// </summary>
+        // /// <param name="condition">查询条件</param>
+        // /// <param name="pageSize">条数</param>
+        // /// <param name="pageNum">页数</param>
+        // /// <returns></returns>
+        // public static Dictionary<string, object> CardInComeRecordDetail(int MerchantId, string OrderId)
+        // {
+        //     var merchantInfo = MerchantAddInfoService.Query(MerchantId);
+        //     JsonData Info = JsonMapper.ToObject(HaoDaHelper.Instance.CardInComeDetail(merchantInfo.OutMchtNo, OrderId));
+        //     Dictionary<string, object> obj = new Dictionary<string, object>();
+        //     if (Info["code"].ToString() == "1")
+        //     {
+        //         obj.Add("Id", Info["data"]["id"].ToString()); //订单Id
+        //         obj.Add("SettleStatus", Info["data"]["settleStatus"].ToString()); //结算状态(0：未结算；1：结算中；2：已结算)
+        //         obj.Add("SettleType", Info["data"]["settleType"].ToString()); //结算周期
+        //         obj.Add("SettleDate", Info["data"]["settleDate"].ToString().Substring(Info["data"]["settleDate"].ToString().Length - 5, 5)); //结算日期
+        //         obj.Add("ClearTime", Info["data"]["clearTime"].ToString().Substring(Info["data"]["clearTime"].ToString().Length - 5, 5)); //出款受理时间
+        //         obj.Add("RemitTime", Info["data"]["remitTime"].ToString().Substring(Info["data"]["remitTime"].ToString().Length - 5, 5)); //出款成功时间
+        //         obj.Add("SettleAmount", "+" + Info["data"]["settleAmount"].ToString()); //结算金额
+        //         obj.Add("TradeMchtName", Info["data"]["tradeMchtName"].ToString()); //收单商户名称
+        //         obj.Add("BankName", Info["data"]["bankName"].ToString() + Info["data"]["cardNo"].ToString().Substring(Info["data"]["cardNo"].ToString().Length - 4, 4)); //开户行名称
+        //         obj.Add("BankLogo", Info["data"]["bankLogo"].ToString()); //银行卡logo
+        //     }
+        //     return obj;
+        // }
+        // #endregion
+
+    }
+}