暂存

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

@@ -28,38 +28,85 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
         {
             value = PublicFunction.DesDecrypt(value); ;
             JsonData data = JsonMapper.ToObject(value);
-            List<Dictionary<string, object>> dataList = DirectConsumerOrdersListDo(value);
-            return Json(new AppResultJson() { Status = "1", Info = "", Data = dataList });
+            Dictionary<string, object> Other = new Dictionary<string, object>();
+            List<Dictionary<string, object>> dataList = DirectConsumerOrdersListDo(value, out Other);
+            return Json(new AppResultJson() { Status = "1", Info = "", Data = dataList, Other = Other });
         }
-        private List<Dictionary<string, object>> DirectConsumerOrdersListDo(string value)
+        private List<Dictionary<string, object>> DirectConsumerOrdersListDo(string value, out Dictionary<string, object> Other)
         {
             JsonData data = JsonMapper.ToObject(value);
             string MerchantName = data["MerchantName"].ToString(); //商户名称
             string MakerCode = data["MakerCode"].ToString(); //创客编号
+            string OrderNo = data["OrderNo"].ToString(); //交易号
             string CreateDate = data["CreateDate"].ToString(); //交易时间
             string PayMode = data["PayMode"].ToString(); //交易平台(1 支付宝 2 微信)
             string IsAct = data["IsAct"].ToString(); //是否参与分账(0 否 1 是)
-            string Status = data["Status"].ToString(); //交易状态
+            string Status = data["Status"].ToString(); //交易状态(0 未支付 1 已支付)
             string SubjectType = data["SubjectType"].ToString(); //主体类型(1 企业 2 个体)
             int pageSize = int.Parse(function.CheckInt(data["page_size"].ToString()));
             int pageNum = int.Parse(function.CheckInt(data["page_num"].ToString()));
             string condition = "";
+            if (!string.IsNullOrEmpty(data["MerchantName"].ToString()))
+            {
+                condition += " and MerchantName='" + MerchantName + "'";
+            }
+            if (!string.IsNullOrEmpty(data["MakerCode"].ToString()))
+            {
+                var Ids = MerchantInfoUtil.QueryMerchantIdByMakerCode(MakerCode);
+                condition += " and MerchantId in (" + Ids + ")";
+            }
+            if (!string.IsNullOrEmpty(data["OrderNo"].ToString()))
+            {
+                condition += " and OrderNo='" + OrderNo + "'";
+            }
+            if (!string.IsNullOrEmpty(data["CreateDate"].ToString()))
+            {
+                string[] datelist = CreateDate.Split(new string[] { " - " }, StringSplitOptions.None);
+                string start = datelist[0];
+                string end = datelist[1];
+                condition += " and CreateDate>='" + start + " 00:00:00' and CreateDate<='" + end + " 23:59:59'";
+            }
+            if (!string.IsNullOrEmpty(data["PayMode"].ToString()))
+            {
+                condition += " and PayMode='" + PayMode + "'";
+            }
+            if (!string.IsNullOrEmpty(data["IsAct"].ToString()))
+            {
+                condition += " and IsAct='" + IsAct + "'";
+            }
+            if (!string.IsNullOrEmpty(data["Status"].ToString()))
+            {
+                if (Status == "0")
+                {
+                    condition += " and Status=0";
+                }
+                else
+                {
+                    condition += " and Status>0";
+                }
+            }
+            if (!string.IsNullOrEmpty(data["SubjectType"].ToString()))
+            {
+                if (data["SubjectType"].ToString() == "1") SubjectType = "SUBJECT_TYPE_ENTERPRISE"; //企业公司
+                if (data["SubjectType"].ToString() == "2") SubjectType = "SUBJECT_TYPE_INDIVIDUAL"; //个体工商户
+                condition += " and SubjectType='" + SubjectType + "'";
+            }
             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);
+            Other = new Dictionary<string, object>();
+            int count = 0;
+            List<Dictionary<string, object>> source = ConsumerOrdersService.List(relationData, condition, out count, pageNum, pageSize);
             foreach (Dictionary<string, object> subdata in source)
             {
                 Dictionary<string, object> curData = new Dictionary<string, object>();
-                curData.Add("", subdata[""].ToString()); //
-                curData.Add("MerchantName", ""); //交易商户
-                curData.Add("PayMoney", ""); //交易金额
-                curData.Add("Status", ""); //交易状态
-                curData.Add("PayMode", ""); //交易平台(1 支付宝 2 微信)
-                curData.Add("OrderNo", ""); //交易号
-                curData.Add("CreateDate", ""); //交易时间
-                curData.Add("MaxDivi", ""); //分账金额
-                curData.Add("SubjectType", ""); //主体类型(1 企业 2 个体)
-
+                curData.Add("MerchantName", subdata["MerchantName"].ToString()); //交易商户
+                curData.Add("PayMoney", subdata["PayMoney"].ToString()); //交易金额
+                curData.Add("Status", subdata["Status"].ToString()); //交易状态(0 未支付 1 已支付)
+                curData.Add("PayMode", subdata["PayMode"].ToString()); //交易平台(1 支付宝 2 微信)
+                curData.Add("OrderNo", subdata["OrderNo"].ToString()); //交易号
+                curData.Add("CreateDate", subdata["CreateDate"].ToString() == null ? "" : DateTime.Parse(subdata["CreateDate"].ToString()).ToString("yyyy-MM-dd HH:mm:ss")); //交易时间
+                curData.Add("MaxDivi", subdata["MaxDivi"].ToString()); //分账金额
+                curData.Add("SubjectType", subdata["SubjectType"].ToString()); //主体类型(1 企业 2 个体)
                 dataList.Add(curData);
             }
             return dataList;

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

@@ -11,6 +11,7 @@ using MySystem.Models.Main1;
 using MySystem.Service.Main1;
 using LitJson;
 using Library;
+using MySystem.Service.KxsMain;
 
 namespace MySystem.Areas.Api.Controllers.v1.Main1
 {
@@ -28,17 +29,18 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
         {
             value = PublicFunction.DesDecrypt(value); ;
             JsonData data = JsonMapper.ToObject(value);
-            List<Dictionary<string, object>> dataList = DirectListDo(value);
-            return Json(new AppResultJson() { Status = "1", Info = "", Data = dataList });
+            Dictionary<string, object> Other = new Dictionary<string, object>();
+            List<Dictionary<string, object>> dataList = DirectListDo(value, out Other);
+            return Json(new AppResultJson() { Status = "1", Info = "", Data = dataList, Other = Other });
         }
-        private List<Dictionary<string, object>> DirectListDo(string value)
+        private List<Dictionary<string, object>> DirectListDo(string value, out Dictionary<string, object> Other)
         {
             JsonData data = JsonMapper.ToObject(value);
-            string SubjectType = data["SubjectType"].ToString(); //主体类型
+            string SubjectType = data["SubjectType"].ToString(); //主体类型(1 企业 2 个体)
             string CertMerchantName = data["CertMerchantName"].ToString(); //商户名称
             string ServicePhone = data["ServicePhone"].ToString(); //客服电话
             string MakerCode = data["MakerCode"].ToString(); //所属创客编号
-            string Status = data["Status"].ToString(); //商户状态
+            string Status = data["Status"].ToString(); //商户状态(0 审核中 1 已通过 -1 审核失败 20 微信待签约 21 微信已签约 10 支付宝待签约 11 支付宝已签约)
             int pageSize = int.Parse(function.CheckInt(data["page_size"].ToString()));
             int pageNum = int.Parse(function.CheckInt(data["page_num"].ToString()));
             string condition = "";
@@ -46,7 +48,6 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
             {
                 if (data["SubjectType"].ToString() == "1") SubjectType = "SUBJECT_TYPE_ENTERPRISE"; //企业公司
                 if (data["SubjectType"].ToString() == "2") SubjectType = "SUBJECT_TYPE_INDIVIDUAL"; //个体工商户
-                if (data["SubjectType"].ToString() == "3") SubjectType = "SUBJECT_TYPE_SMALL"; //小微商户
                 condition += " and SubjectType='" + SubjectType + "'";
             }
             if (!string.IsNullOrEmpty(data["CertMerchantName"].ToString()))
@@ -57,28 +58,53 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
             {
                 condition += " and ServicePhone='" + ServicePhone + "'";
             }
+            if (!string.IsNullOrEmpty(data["MakerCode"].ToString()))
+            {
+                var Ids = MerchantInfoUtil.QueryMerchantIdByMakerCode(MakerCode);
+                condition += " and Id in (" + Ids + ")";
+            }
+            if (!string.IsNullOrEmpty(data["Status"].ToString()))
+            {
+                if (Status == "0") condition += " and Status=0"; //审核中
+                if (Status == "1") condition += " and Status=2 and QueryCount=2"; //已通过
+                if (Status == "-1") condition += " and Status=-1"; //审核失败
+                if (Status == "20") condition += " and Status=1"; //微信待签约
+                if (Status == "21") condition += " and Status=2"; //微信已签约
+                if (Status == "10") condition += " and Status=1"; //支付宝待签约
+                if (Status == "11") condition += " and Status=2"; //支付宝已签约
+                condition += "";
+            }
             List<RelationData> relationData = new List<RelationData>();
             List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
-            List<Dictionary<string, object>> source = MerchantAddInfoService.List(relationData, condition, pageNum, pageSize);
+            Other = new Dictionary<string, object>();
+            int count = 0;
+            List<Dictionary<string, object>> source = MerchantAddInfoService.List(relationData, condition, out count, pageNum, pageSize);
             foreach (Dictionary<string, object> subdata in source)
             {
                 Dictionary<string, object> curData = new Dictionary<string, object>();
+                var status = int.Parse(subdata["Status"].ToString());
+                var queryCount = int.Parse(subdata["QueryCount"].ToString());
+
                 //商户Id
                 var MerchantId = int.Parse(subdata["Id"].ToString());
                 //主体类型
                 var subjectType = 0;
                 if (subdata["SubjectType"].ToString() == "SUBJECT_TYPE_ENTERPRISE") subjectType = 1; //企业公司
                 if (subdata["SubjectType"].ToString() == "SUBJECT_TYPE_INDIVIDUAL") subjectType = 2; //个体工商户
-                if (subdata["SubjectType"].ToString() == "SUBJECT_TYPE_SMALL") subjectType = 3; //小微商户
-                curData.Add("SubjectType", subjectType); //主体类型(1 企业 2 个体 3 小微)
+
+                curData.Add("SubjectType", subjectType); //主体类型(1 企业 2 个体)
                 curData.Add("CertMerchantName", subdata["CertMerchantName"].ToString()); //商户名称
                 curData.Add("ServicePhone", subdata["ServicePhone"].ToString()); //客服电话
                 curData.Add("BizStoreAddress", subdata["CreateDate"].ToString()); //门店地址
                 curData.Add("CreateDate", subdata["CreateDate"].ToString() == null ? "" : DateTime.Parse(subdata["CreateDate"].ToString()).ToString("yyyy-MM-dd HH:mm:ss")); //进件时间
-                
-                curData.Add("MakerCode", ""); //所属创客编号
-                curData.Add("RealName", ""); //所属创客姓名
-                curData.Add("AuditInfo", ""); //审核平台(0 审核中 1 已通过 -1 审核失败 20 微信待签约、21 微信已签约、10 支付宝待签约、11 支付宝已签约)
+                var userInfo = UsersService.Query(MerchantId);
+                curData.Add("MakerCode", userInfo.MakerCode); //所属创客编号
+                curData.Add("RealName", userInfo.RealName); //所属创客姓名
+                //审核平台
+                var AuditInfo = 0;
+                if (status < 0 && queryCount >= 1) AuditInfo = 2;
+                if (status >= 1 && queryCount < 0) AuditInfo = 1;
+                curData.Add("AuditInfo", AuditInfo); //审核平台(1 支付宝 2 微信)
 
                 dataList.Add(curData);
             }
@@ -103,8 +129,17 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
             string MerchantId = data["MerchantId"].ToString(); //商户Id
             Dictionary<string, object> Obj = new Dictionary<string, object>();
             MerchantAddInfo query = new MerchantAddInfo();
-            // query = MerchantAddInfoService.Query(id);
-            Obj.Add("Info", ""); //失败原因
+            query = MerchantAddInfoService.Query(int.Parse(MerchantId));
+            var info = "";
+            if (query.Status == -1)
+            {
+                info += query.WeChatRemark + "\n";
+            }
+            if (query.QueryCount == -1)
+            {
+                info += query.AlipayRemark + "\n";
+            }
+            Obj.Add("Info", info); //失败原因
 
             return Obj;
         }
@@ -126,94 +161,7 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
             JsonData data = JsonMapper.ToObject(value);
             string MerchantId = data["MerchantId"].ToString(); //商户Id
             Dictionary<string, object> Obj = new Dictionary<string, object>();
-            MerchantAddInfo query = new MerchantAddInfo();
-            // query = MerchantAddInfoService.Query(id);
-            Obj.Add("ContactName", ""); //管理员姓名
-            Obj.Add("ContactIdNumber", ""); //管理员身份证件号码
-            Obj.Add("OpenId", ""); //管理员微信openid
-            Obj.Add("MobilePhone", ""); //联系手机
-            Obj.Add("ContactEmail", ""); //联系邮箱
-            Obj.Add("SubjectType", ""); //主体类型
-            Obj.Add("SubjectTypeName", ""); //主体类型名称
-            Obj.Add("LicenseCopy", ""); //营业执照照片
-            Obj.Add("LicenseNumber", ""); //统一社会信用代码
-            Obj.Add("LegalPerson", ""); //个体户经营者/法人姓名
-            Obj.Add("CertCopy", ""); //登记证书照片
-            Obj.Add("CertType", ""); //登记证书类型
-            Obj.Add("CertNumber", ""); //证书号
-            Obj.Add("CertMerchantName", ""); //商户名称
-            Obj.Add("CompanyAddress", ""); //注册地址
-            Obj.Add("CertLegalPerson", ""); //法人姓名
-            Obj.Add("PeriodBegin", ""); //有效期限开始日期
-            Obj.Add("PeriodEnd", ""); //有效期限结束日期
-            Obj.Add("OrganizationCopy", ""); //组织机构代码证照片
-            Obj.Add("OrganizationCode", ""); //组织机构代码
-            Obj.Add("OrgPeriodBegin", ""); //组织机构代码证有效期开始日期
-            Obj.Add("OrgPeriodEnd", ""); //组织机构代码证有效期结束日期
-            Obj.Add("CertificateLetterCopy", ""); //单位证明函照片
-            Obj.Add("IdDocType", ""); //证件类型
-            Obj.Add("Owner", ""); //经营者/法人是否为受益人
-            Obj.Add("UboInfoIdType", ""); //最终受益人证件类型
-            Obj.Add("UboInfoIdCardCopy", ""); //最终受益人身份证人像面照片
-            Obj.Add("UboInfoIdCardNational", ""); //身份证国徽面照片
-            Obj.Add("UboInfoIdDocCopy", ""); //最终受益人证件照片
-            Obj.Add("UboInfoName", ""); //受益人姓名
-            Obj.Add("UboInfoIdNumber", ""); //最终受益人证件号码
-            Obj.Add("UboInfoIdPeriodBegin", ""); //证件有效期开始时间
-            Obj.Add("UboInfoIdPeriodEnd", ""); //证件有效期结束时间
-            Obj.Add("MerchantShortname", ""); //商户简称
-            Obj.Add("ServicePhone", ""); //客服电话
-            Obj.Add("SalesScenesType", ""); //经营场景类型
-            Obj.Add("BizStoreName", ""); //门店名称
-            Obj.Add("BizAddressCode", ""); //门店省市编码
-            Obj.Add("BizStoreAddress", ""); //门店地址
-            Obj.Add("StoreEntrancePic", ""); //门店门头照片
-            Obj.Add("IndoorPic", ""); //店内环境照片
-            Obj.Add("BizSubAppid", ""); //线下场所对应的商家APPID
-            Obj.Add("MpAppid", ""); //服务商公众号APPID
-            Obj.Add("MpSubAppid", ""); //商家公众号APPID
-            Obj.Add("MpPics", ""); //公众号页面截图
-            Obj.Add("MiniProgramAppid", ""); //服务商小程序APPID
-            Obj.Add("MiniProgramSubAppid", ""); //商家小程序APPID
-            Obj.Add("MiniProgramPics", ""); //小程序截图
-            Obj.Add("AppAppid", ""); //服务商应用APPID
-            Obj.Add("AppSubAppid", ""); //商家应用APPID
-            Obj.Add("AppPics", ""); //APP截图
-            Obj.Add("WebDomain", ""); //互联网网站域名
-            Obj.Add("WebAuthorisation", ""); //网站授权函
-            Obj.Add("WebAppId", ""); //互联网网站对应的商家APPID
-            Obj.Add("SubCorpId", ""); //商家企业微信CorpID
-            Obj.Add("WeworkPics", ""); //企业微信页面截图
-            Obj.Add("SettlementId", ""); //入驻结算规则ID
-            Obj.Add("QualificationType", ""); //所属行业
-            Obj.Add("QualificationTypeName", ""); //所属行业名称
-            Obj.Add("Qualifications", ""); //特殊资质图片
-            Obj.Add("ActivitiesId", ""); //优惠费率活动ID
-            Obj.Add("ActivitiesRate", ""); //优惠费率活动值
-            Obj.Add("BankAccountType", ""); //账户类型
-            Obj.Add("BankAccountTypeName", ""); //账户类型名称
-            Obj.Add("AccountName", ""); //开户名称
-            Obj.Add("AccountBank", ""); //开户银行
-            Obj.Add("BankAddressCode", ""); //开户银行省市编码
-            Obj.Add("BankBranchId", ""); //开户银行联行号
-            Obj.Add("BankName", ""); //开户银行全称
-            Obj.Add("AccountNumber", ""); //银行账号
-            Obj.Add("ApplymentId", ""); //微信支付申请单号
-            Obj.Add("SubMchid", ""); //特约商户号
-            Obj.Add("SignUrl", ""); //超级管理员签约链接
-            Obj.Add("ApplymentState", ""); //申请单状态
-            Obj.Add("AuditDetail", ""); //驳回原因详情
-            Obj.Add("IdCardCopy", ""); //身份证人像面照片
-            Obj.Add("IdCardNational", ""); //身份证国徽面照片
-            Obj.Add("IdCardName", ""); //身份证姓名
-            Obj.Add("IdCardNumber", ""); //身份证号码
-            Obj.Add("IdCardAddress", ""); //身份证居住地址
-            Obj.Add("CardPeriodBegin", ""); //身份证有效期开始时间
-            Obj.Add("CardPeriodEnd", ""); //身份证有效期结束时间
-            Obj.Add("Status", ""); //状态
-            Obj.Add("CreateDate", ""); //创建时间
-            Obj.Add("AlipayAccount", ""); //支付宝账号
-
+            Obj = MerchantAddInfoUtil.MerchantAddInfoDetail(int.Parse(MerchantId));
             return Obj;
         }
         #endregion
@@ -233,14 +181,15 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
         {
             JsonData data = JsonMapper.ToObject(value);
             string MerchantId = data["MerchantId"].ToString(); //商户Id
-            Dictionary<string, object> Obj = new Dictionary<string, object>();
-            MerchantAddInfo query = new MerchantAddInfo();
-            Dictionary<string, object> fields = new Dictionary<string, object>();
-            fields.Add("create_date", DateTime.Now); //创建时间
-            fields.Add("update_date", DateTime.Now); //修改时间
-            AppResultJson resultJson = MerchantAddInfoService.Add(fields, false);
-
-            return new AppResultJson() { Status = "1", Info = "", Data = Obj };
+            var info = MerchantAddInfoUtil.DirectSubmitDo(int.Parse(MerchantId));
+            if (info == "success")
+            {
+                return new AppResultJson() { Status = "1", Info = "成功", Data = info };
+            }
+            else
+            {
+                return new AppResultJson() { Status = "-1", Info = "失败", Data = info };
+            }
         }
         #endregion
 
@@ -262,19 +211,11 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
             string Mobile = data["Mobile"].ToString(); //手机号码
             string MakerCode = data["MakerCode"].ToString(); //所属创客
             string MatchNo = data["MatchNo"].ToString(); //商户号
-            string SubjectType = data["SubjectType"].ToString(); //主体类型(1 个体 2 企业 3 小微)
+            string AliPID = data["AliPID"].ToString(); //支付宝PID
+            string WeChatNo = data["WeChatNo"].ToString(); //微信商户号
+            string SubjectType = data["SubjectType"].ToString(); //主体类型(1 个体 2 企业)
             Dictionary<string, object> Obj = new Dictionary<string, object>();
-            MerchantAddInfo query = new MerchantAddInfo();
-            // query = MerchantAddInfoService.Query(id);
-            Obj.Add("MerchantName", ""); //商户名称
-            Obj.Add("Mobile", ""); //手机号码
-            Obj.Add("MakerCode", ""); //所属创客
-            Obj.Add("SubjectType", ""); //主体类型(1 个体 2 企业 3 小微)
-            Obj.Add("MatchNo", ""); //商户号
-            Obj.Add("OrderCount", ""); //订单总数
-            Obj.Add("TradeAmount", ""); //营业总金额
-            Obj.Add("InComeAmount", ""); //实收总金额
-
+            Obj = MerchantAddInfoUtil.DirectQueryMerchantTradeInfoDo(MerchantName, Mobile, MakerCode, MatchNo, AliPID, WeChatNo, SubjectType);
             return Obj;
         }
         #endregion
@@ -307,7 +248,5 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
         }
         #endregion
 
-
-
     }
 }

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

@@ -12,7 +12,7 @@ using MySystem.Service.Main2;
 using LitJson;
 using Library;
 
-namespace MySystem.Areas.Api.Controllers.v1
+namespace MySystem.Areas.Api.Controllers.v1.Main2
 {
     [Area("Api")]
     [Route("/v1/QrCodePlateMain/[controller]/[action]")]
@@ -28,38 +28,86 @@ namespace MySystem.Areas.Api.Controllers.v1
         {
             value = PublicFunction.DesDecrypt(value); ;
             JsonData data = JsonMapper.ToObject(value);
-            List<Dictionary<string, object>> dataList = UnionPayConsumerOrdersListDo(value);
-            return Json(new AppResultJson() { Status = "1", Info = "", Data = dataList });
+            Dictionary<string, object> Other = new Dictionary<string, object>();
+            List<Dictionary<string, object>> dataList = UnionPayConsumerOrdersListDo(value, out Other);
+            return Json(new AppResultJson() { Status = "1", Info = "", Data = dataList, Other = Other });
         }
-        private List<Dictionary<string, object>> UnionPayConsumerOrdersListDo(string value)
+        private List<Dictionary<string, object>> UnionPayConsumerOrdersListDo(string value, out Dictionary<string, object> Other)
         {
             JsonData data = JsonMapper.ToObject(value);
             string MerchantName = data["MerchantName"].ToString(); //商户名称
             string MakerCode = data["MakerCode"].ToString(); //创客编号
+            string OrderNo = data["OrderNo"].ToString(); //交易号
             string CreateDate = data["CreateDate"].ToString(); //交易时间
             string PayMode = data["PayMode"].ToString(); //交易平台(1 支付宝 2 微信)
             string IsAct = data["IsAct"].ToString(); //是否参与分账(0 否 1 是)
-            string Status = data["Status"].ToString(); //交易状态
+            string Status = data["Status"].ToString(); //交易状态(0 未支付 1 已支付)
             string SubjectType = data["SubjectType"].ToString(); //主体类型(1 企业 2 个体 3 小微)
             int pageSize = int.Parse(function.CheckInt(data["page_size"].ToString()));
             int pageNum = int.Parse(function.CheckInt(data["page_num"].ToString()));
             string condition = "";
+            if (!string.IsNullOrEmpty(data["MerchantName"].ToString()))
+            {
+                condition += " and MerchantName='" + MerchantName + "'";
+            }
+            if (!string.IsNullOrEmpty(data["MakerCode"].ToString()))
+            {
+                var Ids = MerchantInfoUtil.QueryMerchantIdByMakerCode(MakerCode);
+                condition += " and MerchantId in (" + Ids + ")";
+            }
+            if (!string.IsNullOrEmpty(data["OrderNo"].ToString()))
+            {
+                condition += " and OrderNo='" + OrderNo + "'";
+            }
+            if (!string.IsNullOrEmpty(data["CreateDate"].ToString()))
+            {
+                string[] datelist = CreateDate.Split(new string[] { " - " }, StringSplitOptions.None);
+                string start = datelist[0];
+                string end = datelist[1];
+                condition += " and CreateDate>='" + start + " 00:00:00' and CreateDate<='" + end + " 23:59:59'";
+            }
+            if (!string.IsNullOrEmpty(data["PayMode"].ToString()))
+            {
+                condition += " and PayMode='" + PayMode + "'";
+            }
+            if (!string.IsNullOrEmpty(data["IsAct"].ToString()))
+            {
+                condition += " and IsAct='" + IsAct + "'";
+            }
+            if (!string.IsNullOrEmpty(data["Status"].ToString()))
+            {
+                if (Status == "0")
+                {
+                    condition += " and Status=0";
+                }
+                else
+                {
+                    condition += " and Status>0";
+                }
+            }
+            if (!string.IsNullOrEmpty(data["SubjectType"].ToString()))
+            {
+                if (data["SubjectType"].ToString() == "1") SubjectType = "SUBJECT_TYPE_ENTERPRISE"; //企业公司
+                if (data["SubjectType"].ToString() == "2") SubjectType = "SUBJECT_TYPE_INDIVIDUAL"; //个体工商户
+                if (data["SubjectType"].ToString() == "3") SubjectType = "SUBJECT_TYPE_SMALL"; //小微
+                condition += " and SubjectType='" + SubjectType + "'";
+            }
             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);
+            Other = new Dictionary<string, object>();
+            int count = 0;
+            List<Dictionary<string, object>> source = ConsumerOrdersService.List(relationData, condition, out count, pageNum, pageSize);
             foreach (Dictionary<string, object> subdata in source)
             {
                 Dictionary<string, object> curData = new Dictionary<string, object>();
-                curData.Add("MerchantName", ""); //交易商户
-                curData.Add("PayMoney", ""); //交易金额
-                curData.Add("Status", ""); //交易状态
-                curData.Add("PayMode", ""); //交易平台(1 支付宝 2 微信)
-                curData.Add("OrderNo", ""); //交易号
-                curData.Add("CreateDate", ""); //交易时间
-                curData.Add("MaxDivi", ""); //分账金额
-                curData.Add("SubjectType", ""); //主体类型(1 企业 2 个体 3 小微)
-
-                dataList.Add(curData);
+                curData.Add("MerchantName", subdata["MerchantName"].ToString()); //交易商户
+                curData.Add("PayMoney", subdata["PayMoney"].ToString()); //交易金额
+                curData.Add("Status", subdata["Status"].ToString()); //交易状态(0 未支付 1 已支付)
+                curData.Add("PayMode", subdata["PayMode"].ToString()); //交易平台(1 支付宝 2 微信)
+                curData.Add("OrderNo", subdata["OrderNo"].ToString()); //交易号
+                curData.Add("CreateDate", subdata["CreateDate"].ToString() == null ? "" : DateTime.Parse(subdata["CreateDate"].ToString()).ToString("yyyy-MM-dd HH:mm:ss")); //交易时间
+                curData.Add("MaxDivi", subdata["MaxDivi"].ToString()); //分账金额
+                curData.Add("SubjectType", subdata["SubjectType"].ToString()); //主体类型(1 企业 2 个体 3 小微)
             }
             return dataList;
         }

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

@@ -11,8 +11,9 @@ using MySystem.Models.Main2;
 using MySystem.Service.Main2;
 using LitJson;
 using Library;
+using MySystem.Service.KxsMain;
 
-namespace MySystem.Areas.Api.Controllers.v1
+namespace MySystem.Areas.Api.Controllers.v1.Main2
 {
     [Area("Api")]
     [Route("/v1/QrCodePlateMain/[controller]/[action]")]
@@ -28,22 +29,26 @@ namespace MySystem.Areas.Api.Controllers.v1
         {
             value = PublicFunction.DesDecrypt(value); ;
             JsonData data = JsonMapper.ToObject(value);
-            List<Dictionary<string, object>> dataList = UnionPayListDo(value);
-            return Json(new AppResultJson() { Status = "1", Info = "", Data = dataList });
+            Dictionary<string, object> Other = new Dictionary<string, object>();
+            List<Dictionary<string, object>> dataList = UnionPayListDo(value, out Other);
+            return Json(new AppResultJson() { Status = "1", Info = "", Data = dataList, Other = Other });
         }
-        private List<Dictionary<string, object>> UnionPayListDo(string value)
+        private List<Dictionary<string, object>> UnionPayListDo(string value, out Dictionary<string, object> Other)
         {
             JsonData data = JsonMapper.ToObject(value);
-            string SubjectType = data["SubjectType"].ToString(); //主体类型
+            string SubjectType = data["SubjectType"].ToString(); //主体类型(1 企业 2 个体)
             string CertMerchantName = data["CertMerchantName"].ToString(); //商户名称
             string ServicePhone = data["ServicePhone"].ToString(); //客服电话
             string MakerCode = data["MakerCode"].ToString(); //所属创客编号
-            string Status = data["Status"].ToString(); //商户状态
+            string Status = data["Status"].ToString(); //商户状态(0 审核中 1 已通过 -1 审核失败 20 微信待签约 21 微信已签约 10 支付宝待签约 11 支付宝已签约)
             int pageSize = int.Parse(function.CheckInt(data["page_size"].ToString()));
             int pageNum = int.Parse(function.CheckInt(data["page_num"].ToString()));
             string condition = "";
             if (!string.IsNullOrEmpty(data["SubjectType"].ToString()))
             {
+                if (data["SubjectType"].ToString() == "1") SubjectType = "SUBJECT_TYPE_ENTERPRISE"; //企业公司
+                if (data["SubjectType"].ToString() == "2") SubjectType = "SUBJECT_TYPE_INDIVIDUAL"; //个体工商户
+                if (data["SubjectType"].ToString() == "3") SubjectType = "SUBJECT_TYPE_SMALL"; //小微商户
                 condition += " and SubjectType='" + SubjectType + "'";
             }
             if (!string.IsNullOrEmpty(data["CertMerchantName"].ToString()))
@@ -54,20 +59,55 @@ namespace MySystem.Areas.Api.Controllers.v1
             {
                 condition += " and ServicePhone='" + ServicePhone + "'";
             }
+            if (!string.IsNullOrEmpty(data["MakerCode"].ToString()))
+            {
+                var Ids = MerchantInfoUtil.QueryMerchantIdByMakerCode(MakerCode);
+                condition += " and Id in (" + Ids + ")";
+            }
+            if (!string.IsNullOrEmpty(data["Status"].ToString()))
+            {
+                if (Status == "0") condition += " and Status=0"; //审核中
+                if (Status == "1") condition += " and Status=2 and QueryCount=2"; //已通过
+                if (Status == "-1") condition += " and Status=-1"; //审核失败
+                if (Status == "20") condition += " and Status=1"; //微信待签约
+                if (Status == "21") condition += " and Status=2"; //微信已签约
+                if (Status == "10") condition += " and Status=1"; //支付宝待签约
+                if (Status == "11") condition += " and Status=2"; //支付宝已签约
+                condition += "";
+            }
             List<RelationData> relationData = new List<RelationData>();
             List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
-            List<Dictionary<string, object>> source = MerchantAddInfoService.List(relationData, condition, pageNum, pageSize);
+            Other = new Dictionary<string, object>();
+            int count = 0;
+            List<Dictionary<string, object>> source = MerchantAddInfoService.List(relationData, condition, out count, pageNum, pageSize);
             foreach (Dictionary<string, object> subdata in source)
             {
                 Dictionary<string, object> curData = new Dictionary<string, object>();
-                curData.Add("SubjectType", subdata["SubjectType"].ToString()); //主体类型
+                var status = int.Parse(subdata["Status"].ToString());
+                var queryCount = int.Parse(subdata["QueryCount"].ToString());
+
+                //商户Id
+                var MerchantId = int.Parse(subdata["Id"].ToString());
+                //主体类型
+                var subjectType = 0;
+                if (subdata["SubjectType"].ToString() == "SUBJECT_TYPE_ENTERPRISE") subjectType = 1; //企业公司
+                if (subdata["SubjectType"].ToString() == "SUBJECT_TYPE_INDIVIDUAL") subjectType = 2; //个体工商户
+                if (subdata["SubjectType"].ToString() == "SUBJECT_TYPE_SMALL") subjectType = 3; //小微商户
+
+                curData.Add("SubjectType", subjectType); //主体类型(1 企业 2 个体 3 小微)
                 curData.Add("CertMerchantName", subdata["CertMerchantName"].ToString()); //商户名称
                 curData.Add("ServicePhone", subdata["ServicePhone"].ToString()); //客服电话
-                curData.Add("BizStoreAddress", subdata["BizStoreAddress"].ToString()); //门店地址
-                curData.Add("CreateDate", ""); //进件时间
-                curData.Add("MakerCode", ""); //所属创客编号
-                curData.Add("RealName", ""); //所属创客姓名
-                curData.Add("AuditInfo", ""); //审核平台
+                curData.Add("BizStoreAddress", subdata["CreateDate"].ToString()); //门店地址
+                curData.Add("CreateDate", subdata["CreateDate"].ToString() == null ? "" : DateTime.Parse(subdata["CreateDate"].ToString()).ToString("yyyy-MM-dd HH:mm:ss")); //进件时间
+                var userInfo = UsersService.Query(MerchantId);
+                curData.Add("MakerCode", userInfo.MakerCode); //所属创客编号
+                curData.Add("RealName", userInfo.RealName); //所属创客姓名
+                //审核平台
+                var AuditInfo = 0;
+                if (status < 0 && queryCount >= 1) AuditInfo = 2;
+                if (status >= 1 && queryCount < 0) AuditInfo = 1;
+                if (status < 0 && queryCount == 0) AuditInfo = 3;
+                curData.Add("AuditInfo", AuditInfo); //审核平台(1 支付宝 2 微信 3 好哒)
 
                 dataList.Add(curData);
             }
@@ -92,8 +132,17 @@ namespace MySystem.Areas.Api.Controllers.v1
             string MerchantId = data["MerchantId"].ToString(); //商户Id
             Dictionary<string, object> Obj = new Dictionary<string, object>();
             MerchantAddInfo query = new MerchantAddInfo();
-            // query = MerchantAddInfoService.Query(id);
-            Obj.Add("Info", ""); //失败原因
+            query = MerchantAddInfoService.Query(int.Parse(MerchantId));
+            var info = "";
+            if (query.Status == -1)
+            {
+                info += query.WeChatRemark + "\n";
+            }
+            if (query.QueryCount == -1)
+            {
+                info += query.AlipayRemark + "\n";
+            }
+            Obj.Add("Info", info); //失败原因
 
             return Obj;
         }
@@ -115,106 +164,7 @@ namespace MySystem.Areas.Api.Controllers.v1
             JsonData data = JsonMapper.ToObject(value);
             string MerchantId = data["MerchantId"].ToString(); //商户Id
             Dictionary<string, object> Obj = new Dictionary<string, object>();
-            MerchantAddInfo query = new MerchantAddInfo();
-            // query = MerchantAddInfoService.Query(id);
-            Obj.Add("ContactName", ""); //管理员姓名
-            Obj.Add("ContactIdNumber", ""); //管理员身份证件号码
-            Obj.Add("OpenId", ""); //管理员微信openid
-            Obj.Add("MobilePhone", ""); //联系手机
-            Obj.Add("ContactEmail", ""); //联系邮箱
-            Obj.Add("SubjectType", ""); //主体类型
-            Obj.Add("SubjectTypeName", ""); //主体类型名称
-            Obj.Add("LicenseCopy", ""); //营业执照照片
-            Obj.Add("LicenseNumber", ""); //统一社会信用代码
-            Obj.Add("LegalPerson", ""); //个体户经营者/法人姓名
-            Obj.Add("CertCopy", ""); //登记证书照片
-            Obj.Add("CertType", ""); //登记证书类型
-            Obj.Add("CertNumber", ""); //证书号
-            Obj.Add("CertMerchantName", ""); //商户名称
-            Obj.Add("CompanyAddress", ""); //注册地址
-            Obj.Add("CertLegalPerson", ""); //法人姓名
-            Obj.Add("PeriodBegin", ""); //有效期限开始日期
-            Obj.Add("PeriodEnd", ""); //有效期限结束日期
-            Obj.Add("OrganizationCopy", ""); //组织机构代码证照片
-            Obj.Add("OrganizationCode", ""); //组织机构代码
-            Obj.Add("OrgPeriodBegin", ""); //组织机构代码证有效期开始日期
-            Obj.Add("OrgPeriodEnd", ""); //组织机构代码证有效期结束日期
-            Obj.Add("CertificateLetterCopy", ""); //单位证明函照片
-            Obj.Add("IdDocType", ""); //证件类型
-            Obj.Add("Owner", ""); //经营者/法人是否为受益人
-            Obj.Add("UboInfoIdType", ""); //最终受益人证件类型
-            Obj.Add("UboInfoIdCardCopy", ""); //最终受益人身份证人像面照片
-            Obj.Add("UboInfoIdCardNational", ""); //身份证国徽面照片
-            Obj.Add("UboInfoIdDocCopy", ""); //最终受益人证件照片
-            Obj.Add("UboInfoName", ""); //受益人姓名
-            Obj.Add("UboInfoIdNumber", ""); //最终受益人证件号码
-            Obj.Add("UboInfoIdPeriodBegin", ""); //证件有效期开始时间
-            Obj.Add("UboInfoIdPeriodEnd", ""); //证件有效期结束时间
-            Obj.Add("MerchantShortname", ""); //商户简称
-            Obj.Add("ServicePhone", ""); //客服电话
-            Obj.Add("BizStoreName", ""); //门店名称
-            Obj.Add("BizAddressCode", ""); //门店省市编码
-            Obj.Add("BizStoreAddress", ""); //门店地址
-            Obj.Add("StoreEntrancePic", ""); //门店门头照片
-            Obj.Add("IndoorPic", ""); //店内环境照片
-            Obj.Add("BizSubAppid", ""); //线下场所对应的商家APPID
-            Obj.Add("MpAppid", ""); //服务商公众号APPID
-            Obj.Add("MpSubAppid", ""); //商家公众号APPID
-            Obj.Add("MpPics", ""); //公众号页面截图
-            Obj.Add("MiniProgramAppid", ""); //服务商小程序APPID
-            Obj.Add("MiniProgramSubAppid", ""); //商家小程序APPID
-            Obj.Add("MiniProgramPics", ""); //小程序截图
-            Obj.Add("AppAppid", ""); //服务商应用APPID
-            Obj.Add("AppSubAppid", ""); //商家应用APPID
-            Obj.Add("AppPics", ""); //APP截图
-            Obj.Add("WebDomain", ""); //互联网网站域名
-            Obj.Add("WebAuthorisation", ""); //网站授权函
-            Obj.Add("WebAppId", ""); //互联网网站对应的商家APPID
-            Obj.Add("SubCorpId", ""); //商家企业微信CorpID
-            Obj.Add("WeworkPics", ""); //企业微信页面截图
-            Obj.Add("SettlementId", ""); //入驻结算规则ID
-            Obj.Add("QualificationType", ""); //所属行业
-            Obj.Add("Qualifications", ""); //特殊资质图片
-            Obj.Add("ActivitiesId", ""); //优惠费率活动ID
-            Obj.Add("ActivitiesRate", ""); //优惠费率活动值
-            Obj.Add("BankAccountType", ""); //账户类型
-            Obj.Add("BankAccountTypeName", ""); //账户类型名称
-            Obj.Add("AccountName", ""); //开户名称
-            Obj.Add("AccountBank", ""); //开户银行
-            Obj.Add("BankAddressCode", ""); //开户银行省市编码
-            Obj.Add("BankBranchId", ""); //开户银行联行号
-            Obj.Add("BankName", ""); //开户银行全称
-            Obj.Add("AccountNumber", ""); //银行账号
-            Obj.Add("ApplymentId", ""); //微信支付申请单号
-            Obj.Add("SubMchid", ""); //特约商户号
-            Obj.Add("SignUrl", ""); //超级管理员签约链接
-            Obj.Add("ApplymentState", ""); //申请单状态
-            Obj.Add("AuditDetail", ""); //驳回原因详情
-            Obj.Add("IdCardCopy", ""); //身份证人像面照片
-            Obj.Add("IdCardNational", ""); //身份证国徽面照片
-            Obj.Add("IdCardName", ""); //身份证姓名
-            Obj.Add("IdCardNumber", ""); //身份证号码
-            Obj.Add("IdCardAddress", ""); //身份证居住地址
-            Obj.Add("CardPeriodBegin", ""); //身份证有效期开始时间
-            Obj.Add("CardPeriodEnd", ""); //身份证有效期结束时间
-            Obj.Add("Status", ""); //状态
-            Obj.Add("CreateDate", ""); //创建时间
-            Obj.Add("AlipayAccount", ""); //支付宝账号
-            Obj.Add("MchtNo", ""); //好哒商户号
-            Obj.Add("BankCard", ""); //收款人银行卡照片
-            Obj.Add("PersonWithIdCard", ""); //法人手持身份证正面
-            Obj.Add("IndustryLicense1", ""); //行业许可证
-            Obj.Add("Extra1", ""); //补充资料
-            Obj.Add("CheckstandImg", ""); //收银台
-            Obj.Add("SalesScenesType", ""); //经营场景类型
-            Obj.Add("OpenAccountLicenses", ""); //开户许可证
-            Obj.Add("ResserveMobile", ""); //银行预留手机号
-            Obj.Add("ChannelKind", ""); //商户类型
-            Obj.Add("OpenBankAccout", ""); //开户许可证-银行卡号
-            Obj.Add("OpenBankAccName", ""); //开户许可证-开户名
-            Obj.Add("OpenBankName", ""); //开户许可证-开户行全称
-            Obj.Add("OpenBankRegionCode", ""); //开户银行支行区域码
-
+            Obj = MerchantAddInfoUtil.MerchantAddInfoDetail(int.Parse(MerchantId));
             return Obj;
         }
         #endregion
@@ -234,14 +184,15 @@ namespace MySystem.Areas.Api.Controllers.v1
         {
             JsonData data = JsonMapper.ToObject(value);
             string MerchantId = data["MerchantId"].ToString(); //商户Id
-            Dictionary<string, object> Obj = new Dictionary<string, object>();
-            MerchantAddInfo query = new MerchantAddInfo();
-            Dictionary<string, object> fields = new Dictionary<string, object>();
-            fields.Add("create_date", DateTime.Now); //创建时间
-            fields.Add("update_date", DateTime.Now); //修改时间
-            AppResultJson resultJson = MerchantAddInfoService.Add(fields, false);
-
-            return new AppResultJson() { Status = "1", Info = "", Data = Obj };
+            var info = MerchantAddInfoUtil.DirectSubmitDo(int.Parse(MerchantId));
+            if (info == "success")
+            {
+                return new AppResultJson() { Status = "1", Info = "成功", Data = info };
+            }
+            else
+            {
+                return new AppResultJson() { Status = "-1", Info = "失败", Data = info };
+            }
         }
         #endregion
 
@@ -263,22 +214,9 @@ namespace MySystem.Areas.Api.Controllers.v1
             string Mobile = data["Mobile"].ToString(); //手机号码
             string MakerCode = data["MakerCode"].ToString(); //所属创客
             string MatchNo = data["MatchNo"].ToString(); //商户号
-            string AliPID = data["AliPID"].ToString(); //支付宝PID
-            string WeChatNo = data["WeChatNo"].ToString(); //微信商户号
-            string SubjectType = data["SubjectType"].ToString(); //主体类型(1 个体 2 企业)
+            string SubjectType = data["SubjectType"].ToString(); //主体类型(1 个体 2 企业 3 小微)
             Dictionary<string, object> Obj = new Dictionary<string, object>();
-            MerchantAddInfo query = new MerchantAddInfo();
-            // query = MerchantAddInfoService.Query(id);
-            Obj.Add("MerchantName", ""); //商户名称
-            Obj.Add("Mobile", ""); //手机号码
-            Obj.Add("MakerCode", ""); //所属创客
-            Obj.Add("SubjectType", ""); //主体类型(1 个体 2 企业)
-            Obj.Add("AliPID", ""); //支付宝PID
-            Obj.Add("WeChatNo", ""); //微信商户号
-            Obj.Add("OrderCount", ""); //订单总数
-            Obj.Add("TradeAmount", ""); //营业总金额
-            Obj.Add("InComeAmount", ""); //实收总金额
-
+            Obj = MerchantAddInfoUtil.DirectQueryMerchantTradeInfoDo(MerchantName, Mobile, MakerCode, MatchNo, SubjectType);
             return Obj;
         }
         #endregion

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

@@ -12,7 +12,7 @@ using MySystem.Service.Main2;
 using LitJson;
 using Library;
 
-namespace MySystem.Areas.Api.Controllers.v1
+namespace MySystem.Areas.Api.Controllers.v1.Main2
 {
     [Area("Api")]
     [Route("/v1/QrCodePlateMain/[controller]/[action]")]

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

@@ -12,7 +12,7 @@ using MySystem.Service.Main2;
 using LitJson;
 using Library;
 
-namespace MySystem.Areas.Api.Controllers.v1
+namespace MySystem.Areas.Api.Controllers.v1.Main2
 {
     [Area("Api")]
     [Route("/v1/QrCodePlateMain/[controller]/[action]")]

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

@@ -12,7 +12,7 @@ using MySystem.Service.Main2;
 using LitJson;
 using Library;
 
-namespace MySystem.Areas.Api.Controllers.v1
+namespace MySystem.Areas.Api.Controllers.v1.Main2
 {
     [Area("Api")]
     [Route("/v1/QrCodePlateMain/[controller]/[action]")]

Config/Base.cs

@@ -6,10 +6,8 @@ namespace AppConfig
     public class Base
     {
         public static string ApiKey = "G6H7@J8%";
-        public static string ConfigSqlConnStr = ConfigurationManager.AppSettings["ConfigSqlConnStr"].ToString();
         public static string BsSqlConnStr = ConfigurationManager.AppSettings["BsSqlConnStr"].ToString();
         public static string KxsSqlConnStr = ConfigurationManager.AppSettings["KxsSqlConnStr"].ToString();
-        public static string SqlConnStr = ConfigurationManager.AppSettings["SqlConnStr"].ToString();
         public static string SqlConnStr1 = ConfigurationManager.AppSettings["SqlConnStr1"].ToString();
         public static string SqlConnStr2 = ConfigurationManager.AppSettings["SqlConnStr2"].ToString();
         public static string Host = Library.ConfigurationManager.AppSettings["Host"].ToString();
@@ -22,7 +20,6 @@ namespace AppConfig
         public static Dictionary<string, Dictionary<string, string>> kxsMainTables = new Dictionary<string, Dictionary<string, string>>();
         public static Dictionary<string, Dictionary<string, string>> main1Tables = new Dictionary<string, Dictionary<string, string>>();
         public static Dictionary<string, Dictionary<string, string>> main2Tables = new Dictionary<string, Dictionary<string, string>>();
-        public static Dictionary<string, Dictionary<string, string>> configTables = new Dictionary<string, Dictionary<string, string>>();
 
         #endregion
     }

Entity/SettleItem.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+namespace MySystem
+{
+    public class SettleItem
+    {
+        public string value { get; set; }
+        public string text { get; set; }
+        public int special { get; set; }
+        public List<SettleItem> children { get; set; }
+    }
+
+    public class SettleData
+    { 
+        public string value { get; set; }
+        public string code { get; set; }
+        public string ptext { get; set; }
+        public string text { get; set; }
+        public int special { get; set; }
+    }
+}

Service/KxsMain/UsersService.cs

@@ -10,7 +10,7 @@ using MySystem.Models.KxsMain;
 using Library;
 using LitJson;
 
-namespace MySystem.Service.Main
+namespace MySystem.Service.KxsMain
 {
     public class UsersService
     {

Service/Main2/HaoDaAreaCodeService.cs

@@ -0,0 +1,239 @@
+/*
+ * 好哒地区编码
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Data;
+using MySystem.Models.Main2;
+using Library;
+using LitJson;
+
+namespace MySystem.Service.Main2
+{
+    public class HaoDaAreaCodeService
+    {
+        static string _conn = ConfigurationManager.AppSettings["SqlConnStr2"].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>(); //要显示的列，不设置则返回全部字段
+            Dictionary<string, object> obj = new DbServiceNew(AppConfig.Base.main2Tables, _conn).IndexData("HaoDaAreaCode", 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>(); //要显示的列，不设置则返回全部字段
+            Dictionary<string, object> obj = new DbServiceNew(AppConfig.Base.main2Tables, _conn).IndexData("HaoDaAreaCode", relationData, orderBy, page, limit, condition, fields);
+            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
+            return diclist;
+        }
+
+        /// <summary>
+        /// 查询列表(单表)
+        /// </summary>
+        /// <param name="fieldList">返回的字段</param>
+        /// <param name="condition">查询条件</param>
+        /// <param name="page">页码</param>
+        /// <param name="limit">每页条数</param>
+        /// <param name="orderBy">排序</param>
+        /// <returns></returns>
+        public static List<Dictionary<string, object>> List(string fieldList, string condition, int page = 1, int limit = 30, string orderBy = "Sort desc,Id desc")
+        {
+            List<string> fields = fieldList.Split(',').ToList(); //要显示的列
+            Dictionary<string, object> obj = new DbServiceNew(AppConfig.Base.main2Tables, _conn).IndexData("HaoDaAreaCode", new List<RelationData>(), orderBy, page, limit, condition, fields);
+            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
+            return diclist;
+        }
+
+        /// <summary>
+        /// 查询一条记录
+        /// </summary>
+        /// <param name="Id">主键Id</param>
+        /// <returns></returns>
+        public static HaoDaAreaCode Query(int Id)
+        {
+            Dictionary<string, object> obj = new DbServiceNew(AppConfig.Base.main2Tables, _conn).Query("*", "HaoDaAreaCode", Id);
+            if(obj.Keys.Count > 0)
+            {
+                return Newtonsoft.Json.JsonConvert.DeserializeObject<HaoDaAreaCode>(Newtonsoft.Json.JsonConvert.SerializeObject(obj));
+            }
+            return new HaoDaAreaCode();
+        }
+
+        /// <summary>
+        /// 查询一条记录
+        /// </summary>
+        /// <param name="condition">查询条件(sql语句)</param>
+        /// <returns></returns>
+        public static HaoDaAreaCode Query(string condition)
+        {
+            Dictionary<string, object> obj = new DbServiceNew(AppConfig.Base.main2Tables, _conn).Query("*", "HaoDaAreaCode", condition);
+            if(obj.Keys.Count > 0)
+            {
+                return Newtonsoft.Json.JsonConvert.DeserializeObject<HaoDaAreaCode>(Newtonsoft.Json.JsonConvert.SerializeObject(obj));
+            }
+            return new HaoDaAreaCode();
+        }
+
+        /// <summary>
+        /// 查询一条记录
+        /// </summary>
+        /// <param name="condition">查询条件(sql语句)</param>
+        /// <param name="fields">返回的字段</param>
+        /// <returns></returns>
+        public static Dictionary<string, object> Query(string condition, string fields)
+        {
+            Dictionary<string, object> obj = new DbServiceNew(AppConfig.Base.main2Tables, _conn).Query(fields, "HaoDaAreaCode", condition);
+            return obj;
+        }
+        
+        public static decimal Sum(string condition, string field)
+        {
+            decimal amount = 0;
+            Dictionary<string, object> obj = new DbServiceNew(AppConfig.Base.main2Tables, _conn).Query("Sum(" + field + ") " + field + "", "HaoDaAreaCode", condition);
+            if(obj.Keys.Count > 0)
+            {
+                amount = decimal.Parse(obj[field].ToString());
+            }
+            return amount;
+        }
+
+        /// <summary>
+        /// 查询记录数
+        /// </summary>
+        /// <param name="Id">主键Id</param>
+        /// <returns></returns>
+        public static int Count(string condition = "", string field = "Id")
+        {
+            int result = 0;
+            Dictionary<string, object> obj = new DbServiceNew(AppConfig.Base.main2Tables, _conn).Query("count(" + field + ") " + field + "", "HaoDaAreaCode", condition);
+            if(obj.Keys.Count > 0)
+            {
+                result = int.Parse(function.CheckInt(obj[field].ToString()));
+            }
+            return result;
+        }
+
+        /// <summary>
+        /// 查询是否存在
+        /// </summary>
+        /// <param name="Id">主键Id</param>
+        /// <returns></returns>
+        public static bool Exist(string condition)
+        {
+            Dictionary<string, object> obj = new DbServiceNew(AppConfig.Base.main2Tables, _conn).Query("1", "HaoDaAreaCode", condition);
+            if(obj.Keys.Count > 0)
+            {
+                return true;
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// 添加数据
+        /// </summary>
+        /// <param name="Fields">要设置的字段</param>
+        /// <returns></returns>
+        public static AppResultJson Add(Dictionary<string, object> fields, bool check = true)
+        {
+            if(check)
+            {
+                
+            }
+            int Id = new DbServiceNew(AppConfig.Base.main2Tables, _conn).Add("HaoDaAreaCode", fields, 0);
+            return new AppResultJson(){ Status = "1", Data = Id };
+        }
+
+        /// <summary>
+        /// 修改数据
+        /// </summary>
+        /// <param name="Fields">要设置的字段</param>
+        /// <param name="Id">主键Id</param>
+        public static AppResultJson Edit(Dictionary<string, object> fields, int Id, bool check = true)
+        {
+            if(check)
+            {
+                
+            }
+            new DbServiceNew(AppConfig.Base.main2Tables, _conn).Edit("HaoDaAreaCode", 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 DbServiceNew(AppConfig.Base.main2Tables, _conn).Edit("HaoDaAreaCode", fields, Id);
+        }
+
+        /// <summary>
+        /// 删除数据
+        /// </summary>
+        /// <param name="Id">主键Id</param>
+        public static void Delete(int Id)
+        {
+            new DbServiceNew(AppConfig.Base.main2Tables, _conn).Delete("HaoDaAreaCode", Id);
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="Id">主键Id</param>
+        /// <param name="Sort">排序序号</param>
+        public static void Sort(int Id, int Sort)
+        {
+            new DbServiceNew(AppConfig.Base.main2Tables, _conn).Sort("HaoDaAreaCode", 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.HaoDaAreaCode.Add(new HaoDaAreaCode()
+            //     {
+            //         CreateDate = DateTime.Now,
+            //         UpdateDate = DateTime.Now,
+                    
+            //     });
+            //     db.SaveChanges();
+            // }
+            // db.Dispose();
+        }
+
+        /// <summary>
+        /// 导出excel表格
+        /// </summary>
+        /// <param name="fields">查询条件(单个字段)</param>
+        /// <param name="condition">查询条件(sql语句)</param>
+        /// <returns></returns>
+        // public static void ExportExcel(List<RelationData> relationData, string condition)
+        // {
+            
+        // }
+    }
+}

Service/Main2/OpenBankAllService.cs

@@ -0,0 +1,239 @@
+/*
+ * 银行行号表
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Data;
+using MySystem.Models.Main2;
+using Library;
+using LitJson;
+
+namespace MySystem.Service.Main2
+{
+    public class OpenBankAllService
+    {
+        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>(); //要显示的列，不设置则返回全部字段
+            Dictionary<string, object> obj = new DbServiceNew(AppConfig.Base.main2Tables, _conn).IndexData("OpenBankAll", 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>(); //要显示的列，不设置则返回全部字段
+            Dictionary<string, object> obj = new DbServiceNew(AppConfig.Base.main2Tables, _conn).IndexData("OpenBankAll", relationData, orderBy, page, limit, condition, fields);
+            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
+            return diclist;
+        }
+
+        /// <summary>
+        /// 查询列表(单表)
+        /// </summary>
+        /// <param name="fieldList">返回的字段</param>
+        /// <param name="condition">查询条件</param>
+        /// <param name="page">页码</param>
+        /// <param name="limit">每页条数</param>
+        /// <param name="orderBy">排序</param>
+        /// <returns></returns>
+        public static List<Dictionary<string, object>> List(string fieldList, string condition, int page = 1, int limit = 30, string orderBy = "Sort desc,Id desc")
+        {
+            List<string> fields = fieldList.Split(',').ToList(); //要显示的列
+            Dictionary<string, object> obj = new DbServiceNew(AppConfig.Base.main2Tables, _conn).IndexData("OpenBankAll", new List<RelationData>(), orderBy, page, limit, condition, fields);
+            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
+            return diclist;
+        }
+
+        /// <summary>
+        /// 查询一条记录
+        /// </summary>
+        /// <param name="Id">主键Id</param>
+        /// <returns></returns>
+        public static OpenBankAll Query(int Id)
+        {
+            Dictionary<string, object> obj = new DbServiceNew(AppConfig.Base.main2Tables, _conn).Query("*", "OpenBankAll", Id);
+            if(obj.Keys.Count > 0)
+            {
+                return Newtonsoft.Json.JsonConvert.DeserializeObject<OpenBankAll>(Newtonsoft.Json.JsonConvert.SerializeObject(obj));
+            }
+            return new OpenBankAll();
+        }
+
+        /// <summary>
+        /// 查询一条记录
+        /// </summary>
+        /// <param name="condition">查询条件(sql语句)</param>
+        /// <returns></returns>
+        public static OpenBankAll Query(string condition)
+        {
+            Dictionary<string, object> obj = new DbServiceNew(AppConfig.Base.main2Tables, _conn).Query("*", "OpenBankAll", condition);
+            if(obj.Keys.Count > 0)
+            {
+                return Newtonsoft.Json.JsonConvert.DeserializeObject<OpenBankAll>(Newtonsoft.Json.JsonConvert.SerializeObject(obj));
+            }
+            return new OpenBankAll();
+        }
+
+        /// <summary>
+        /// 查询一条记录
+        /// </summary>
+        /// <param name="condition">查询条件(sql语句)</param>
+        /// <param name="fields">返回的字段</param>
+        /// <returns></returns>
+        public static Dictionary<string, object> Query(string condition, string fields)
+        {
+            Dictionary<string, object> obj = new DbServiceNew(AppConfig.Base.main2Tables, _conn).Query(fields, "OpenBankAll", condition);
+            return obj;
+        }
+        
+        public static decimal Sum(string condition, string field)
+        {
+            decimal amount = 0;
+            Dictionary<string, object> obj = new DbServiceNew(AppConfig.Base.main2Tables, _conn).Query("Sum(" + field + ") " + field + "", "OpenBankAll", condition);
+            if(obj.Keys.Count > 0)
+            {
+                amount = decimal.Parse(obj[field].ToString());
+            }
+            return amount;
+        }
+
+        /// <summary>
+        /// 查询记录数
+        /// </summary>
+        /// <param name="Id">主键Id</param>
+        /// <returns></returns>
+        public static int Count(string condition = "", string field = "Id")
+        {
+            int result = 0;
+            Dictionary<string, object> obj = new DbServiceNew(AppConfig.Base.main2Tables, _conn).Query("count(" + field + ") " + field + "", "OpenBankAll", condition);
+            if(obj.Keys.Count > 0)
+            {
+                result = int.Parse(function.CheckInt(obj[field].ToString()));
+            }
+            return result;
+        }
+
+        /// <summary>
+        /// 查询是否存在
+        /// </summary>
+        /// <param name="Id">主键Id</param>
+        /// <returns></returns>
+        public static bool Exist(string condition)
+        {
+            Dictionary<string, object> obj = new DbServiceNew(AppConfig.Base.main2Tables, _conn).Query("1", "OpenBankAll", condition);
+            if(obj.Keys.Count > 0)
+            {
+                return true;
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// 添加数据
+        /// </summary>
+        /// <param name="Fields">要设置的字段</param>
+        /// <returns></returns>
+        public static AppResultJson Add(Dictionary<string, object> fields, bool check = true)
+        {
+            if(check)
+            {
+                
+            }
+            int Id = new DbServiceNew(AppConfig.Base.main2Tables, _conn).Add("OpenBankAll", fields, 0);
+            return new AppResultJson(){ Status = "1", Data = Id };
+        }
+
+        /// <summary>
+        /// 修改数据
+        /// </summary>
+        /// <param name="Fields">要设置的字段</param>
+        /// <param name="Id">主键Id</param>
+        public static AppResultJson Edit(Dictionary<string, object> fields, int Id, bool check = true)
+        {
+            if(check)
+            {
+                
+            }
+            new DbServiceNew(AppConfig.Base.main2Tables, _conn).Edit("OpenBankAll", 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 DbServiceNew(AppConfig.Base.main2Tables, _conn).Edit("OpenBankAll", fields, Id);
+        }
+
+        /// <summary>
+        /// 删除数据
+        /// </summary>
+        /// <param name="Id">主键Id</param>
+        public static void Delete(int Id)
+        {
+            new DbServiceNew(AppConfig.Base.main2Tables, _conn).Delete("OpenBankAll", Id);
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="Id">主键Id</param>
+        /// <param name="Sort">排序序号</param>
+        public static void Sort(int Id, int Sort)
+        {
+            new DbServiceNew(AppConfig.Base.main2Tables, _conn).Sort("OpenBankAll", 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.OpenBankAll.Add(new OpenBankAll()
+            //     {
+            //         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)
+        // {
+            
+        // }
+    }
+}

Startup.cs

@@ -133,14 +133,13 @@ namespace MySystem
             initMain2Server();//银联
             initBsServer();//bs
             initKxsMainServer();//客小爽主库
-            initYbfServer();
         }
 
         //初始化数据结构
         private void initKxsMainServer()
         {
             Dictionary<string, Dictionary<string, string>> tables = new Dictionary<string, Dictionary<string, string>>();
-            string connstr = Configuration["Setting:ConfigSqlConnStr"];
+            string connstr = Configuration["Setting:KxsSqlConnStr"];
             System.Data.DataTable tablecollection = Library.CustomerSqlConn.dtable("select DISTINCT TABLE_NAME from information_schema.columns where table_schema = 'KxsSqlConnStr'", connstr);
             foreach (System.Data.DataRow subtable in tablecollection.Rows)
             {
@@ -162,12 +161,12 @@ namespace MySystem
         private void initBsServer()
         {
             Dictionary<string, Dictionary<string, string>> tables = new Dictionary<string, Dictionary<string, string>>();
-            string connstr = Configuration["Setting:ConfigSqlConnStr"];
-            System.Data.DataTable tablecollection = Library.CustomerSqlConn.dtable("select DISTINCT TABLE_NAME from information_schema.columns where table_schema = 'BsSqlConnStr'", connstr);
+            string connstr = Configuration["Setting:BsSqlConnStr"];
+            System.Data.DataTable tablecollection = Library.CustomerSqlConn.dtable("select DISTINCT TABLE_NAME from information_schema.columns where table_schema = 'QrCodePlateBsServer'", connstr);
             foreach (System.Data.DataRow subtable in tablecollection.Rows)
             {
                 Dictionary<string, string> Columns = new Dictionary<string, string>();
-                System.Data.DataTable columncollection = Library.CustomerSqlConn.dtable("select COLUMN_NAME,DATA_TYPE from information_schema.columns where table_schema = 'BsSqlConnStr' and TABLE_NAME='" + subtable["TABLE_NAME"].ToString() + "'", connstr);
+                System.Data.DataTable columncollection = Library.CustomerSqlConn.dtable("select COLUMN_NAME,DATA_TYPE from information_schema.columns where table_schema = 'QrCodePlateBsServer' and TABLE_NAME='" + subtable["TABLE_NAME"].ToString() + "'", connstr);
                 foreach (System.Data.DataRow column in columncollection.Rows)
                 {
                     string datatype = column["DATA_TYPE"].ToString();
@@ -184,7 +183,7 @@ namespace MySystem
         private void initMain1Server()
         {
             Dictionary<string, Dictionary<string, string>> tables = new Dictionary<string, Dictionary<string, string>>();
-            string connstr = Configuration["Setting:SqlConnStr"];
+            string connstr = Configuration["Setting:SqlConnStr1"];
             System.Data.DataTable tablecollection = Library.CustomerSqlConn.dtable("select DISTINCT TABLE_NAME from information_schema.columns where table_schema = 'QrCodePlateMainServer'", connstr);
             foreach (System.Data.DataRow subtable in tablecollection.Rows)
             {
@@ -206,7 +205,7 @@ namespace MySystem
         private void initMain2Server()
         {
             Dictionary<string, Dictionary<string, string>> tables = new Dictionary<string, Dictionary<string, string>>();
-            string connstr = Configuration["Setting:SqlConnStr"];
+            string connstr = Configuration["Setting:SqlConnStr2"];
             System.Data.DataTable tablecollection = Library.CustomerSqlConn.dtable("select DISTINCT TABLE_NAME from information_schema.columns where table_schema = 'QrCodePlateMainServer2'", connstr);
             foreach (System.Data.DataRow subtable in tablecollection.Rows)
             {
@@ -225,27 +224,5 @@ namespace MySystem
             }
             AppConfig.Base.main2Tables = tables;
         }
-        private void initYbfServer()
-        {
-            Dictionary<string, Dictionary<string, string>> tables = new Dictionary<string, Dictionary<string, string>>();
-            string connstr = Configuration["Setting:ConfigSqlConnStr"];
-            System.Data.DataTable tablecollection = Library.CustomerSqlConn.dtable("select DISTINCT TABLE_NAME from information_schema.columns where table_schema = 'YbfConfigServer'", connstr);
-            foreach (System.Data.DataRow subtable in tablecollection.Rows)
-            {
-                Dictionary<string, string> Columns = new Dictionary<string, string>();
-                System.Data.DataTable columncollection = Library.CustomerSqlConn.dtable("select COLUMN_NAME,DATA_TYPE from information_schema.columns where table_schema = 'YbfConfigServer' and TABLE_NAME='" + subtable["TABLE_NAME"].ToString() + "'", connstr);
-                foreach (System.Data.DataRow column in columncollection.Rows)
-                {
-                    string datatype = column["DATA_TYPE"].ToString();
-                    if (datatype == "decimal")
-                    {
-                        datatype = "numeric";
-                    }
-                    Columns.Add(column["COLUMN_NAME"].ToString(), datatype);
-                }
-                tables.Add(subtable["TABLE_NAME"].ToString(), Columns);
-            }
-            AppConfig.Base.configTables = tables;
-        }
     }
 }

Util/Main1/MerchantAddInfoUtil.cs

@@ -0,0 +1,221 @@
+using Library;
+using MySystem.Service.Main1;
+using System.Collections.Generic;
+using MySystem.Service.KxsMain;
+using System.Linq;
+namespace MySystem.Service.Main1
+{
+    /// <summary>
+    /// 直连商户进件表工具类
+    /// </summary>
+    public class MerchantAddInfoUtil
+    {
+        #region 进件管理-直连进件详情
+        /// <summary>
+        /// 进件管理-直连进件详情
+        /// </summary>
+        /// <param name="MerchantId">商户Id</param>
+        /// <returns></returns>
+        public static Dictionary<string, object> MerchantAddInfoDetail(int MerchantId)
+        {
+            Dictionary<string, object> Obj = new Dictionary<string, object>();
+            var query = MerchantAddInfoService.Query(MerchantId);
+            Dictionary<string, string> Subjects = MerchantInfoUtil.GetSubjects();
+            Dictionary<string, string> AccountTypes = MerchantInfoUtil.GetAccountTypes();
+            List<SettleData> Settles = MerchantInfoUtil.GetSettles(query.SubjectType);
+            Obj.Add("ContactName", query.ContactName); //管理员姓名
+            Obj.Add("ContactIdNumber", query.ContactIdNumber); //管理员身份证件号码
+            Obj.Add("OpenId", query.OpenId); //管理员微信openid
+            Obj.Add("MobilePhone", query.MobilePhone); //联系手机
+            Obj.Add("ContactEmail", query.ContactEmail); //联系邮箱
+            Obj.Add("SubjectType", query.SubjectType); //主体类型
+                                                       //主体类型名称
+            if (Subjects.ContainsKey(function.CheckNull(query.SubjectType)))
+            {
+                Obj.Add("SubjectTypeName", Subjects[function.CheckNull(query.SubjectType)]);
+            }
+            else
+            {
+                Obj.Add("SubjectTypeName", "");
+            }
+            Obj.Add("LicenseCopy", query.LicenseCopy); //营业执照照片
+            Obj.Add("LicenseNumber", query.LicenseNumber); //统一社会信用代码
+            Obj.Add("LegalPerson", query.LegalPerson); //个体户经营者/法人姓名
+            Obj.Add("CertCopy", query.CertCopy); //登记证书照片
+            Obj.Add("CertType", query.CertType); //登记证书类型
+            Obj.Add("CertNumber", query.CertNumber); //证书号
+            Obj.Add("CertMerchantName", query.CertMerchantName); //商户名称
+            Obj.Add("CompanyAddress", query.CompanyAddress); //注册地址
+            Obj.Add("CertLegalPerson", query.CertLegalPerson); //法人姓名
+            Obj.Add("PeriodBegin", query.PeriodBegin == null ? "" : query.PeriodBegin.Value.ToString("yyyy-MM-dd HH:mm:ss")); //有效期限开始日期
+            Obj.Add("PeriodEnd", query.PeriodEnd == null ? "" : query.PeriodEnd.Value.ToString("yyyy-MM-dd HH:mm:ss")); //有效期限结束日期
+            Obj.Add("OrganizationCopy", query.OrganizationCopy); //组织机构代码证照片
+            Obj.Add("OrganizationCode", query.OrganizationCode); //组织机构代码
+            Obj.Add("OrgPeriodBegin", query.OrgPeriodBegin == null ? "" : query.OrgPeriodBegin.Value.ToString("yyyy-MM-dd HH:mm:ss")); //组织机构代码证有效期开始日期
+            Obj.Add("OrgPeriodEnd", query.OrgPeriodEnd == null ? "" : query.OrgPeriodEnd.Value.ToString("yyyy-MM-dd HH:mm:ss")); //组织机构代码证有效期结束日期
+            Obj.Add("CertificateLetterCopy", query.CertificateLetterCopy); //单位证明函照片
+            Obj.Add("IdDocType", query.IdDocType); //证件类型
+            Obj.Add("Owner", query.Owner); //经营者/法人是否为受益人
+            Obj.Add("UboInfoIdType", query.UboInfoIdType); //最终受益人证件类型
+            Obj.Add("UboInfoIdCardCopy", query.UboInfoIdCardCopy); //最终受益人身份证人像面照片
+            Obj.Add("UboInfoIdCardNational", query.UboInfoIdCardNational); //身份证国徽面照片
+            Obj.Add("UboInfoIdDocCopy", query.UboInfoIdDocCopy); //最终受益人证件照片
+            Obj.Add("UboInfoName", query.UboInfoName); //受益人姓名
+            Obj.Add("UboInfoIdNumber", query.UboInfoIdNumber); //最终受益人证件号码
+            Obj.Add("UboInfoIdPeriodBegin", query.UboInfoIdPeriodBegin == null ? "" : query.UboInfoIdPeriodBegin.Value.ToString("yyyy-MM-dd HH:mm:ss")); //证件有效期开始时间
+            Obj.Add("UboInfoIdPeriodEnd", query.UboInfoIdPeriodEnd == null ? "" : query.UboInfoIdPeriodEnd.Value.ToString("yyyy-MM-dd HH:mm:ss")); //证件有效期结束时间
+            Obj.Add("MerchantShortname", query.MerchantShortname); //商户简称
+            Obj.Add("ServicePhone", query.ServicePhone); //客服电话
+            Obj.Add("SalesScenesType", query.SalesScenesType); //经营场景类型
+            Obj.Add("BizStoreName", query.BizStoreName); //门店名称
+            Obj.Add("BizAddressCode", query.BizAddressCode); //门店省市编码
+            Obj.Add("BizStoreAddress", query.BizStoreAddress); //门店地址
+            Obj.Add("StoreEntrancePic", query.StoreEntrancePic); //门店门头照片
+            Obj.Add("IndoorPic", query.IndoorPic); //店内环境照片
+            Obj.Add("BizSubAppid", query.BizSubAppid); //线下场所对应的商家APPID
+            Obj.Add("MpAppid", query.MpAppid); //服务商公众号APPID
+            Obj.Add("MpSubAppid", query.MpSubAppid); //商家公众号APPID
+            Obj.Add("MpPics", query.MpPics); //公众号页面截图
+            Obj.Add("MiniProgramAppid", query.MiniProgramAppid); //服务商小程序APPID
+            Obj.Add("MiniProgramSubAppid", query.MiniProgramSubAppid); //商家小程序APPID
+            Obj.Add("MiniProgramPics", query.MiniProgramPics); //小程序截图
+            Obj.Add("AppAppid", query.AppAppid); //服务商应用APPID
+            Obj.Add("AppSubAppid", query.AppSubAppid); //商家应用APPID
+            Obj.Add("AppPics", query.AppPics); //APP截图
+            Obj.Add("WebDomain", query.WebDomain); //互联网网站域名
+            Obj.Add("WebAuthorisation", query.WebAuthorisation); //网站授权函
+            Obj.Add("WebAppId", query.WebAppId); //互联网网站对应的商家APPID
+            Obj.Add("SubCorpId", query.SubCorpId); //商家企业微信CorpID
+            Obj.Add("WeworkPics", query.WeworkPics); //企业微信页面截图
+            Obj.Add("SettlementId", query.SettlementId + "_" + query.UpdateMan); //入驻结算规则ID
+            Obj.Add("QualificationType", query.QualificationType); //所属行业
+            //所属行业名称
+            SettleData item = Settles.FirstOrDefault(m => m.value == query.QualificationType);
+            if (item != null)
+            {
+                Obj.Add("QualificationTypeName", item.ptext + "," + item.text);
+            }
+            else
+            {
+                Obj.Add("QualificationTypeName", "");
+            }
+            Obj.Add("Qualifications", query.Qualifications); //特殊资质图片
+            Obj.Add("ActivitiesId", query.ActivitiesId); //优惠费率活动ID
+            Obj.Add("ActivitiesRate", query.ActivitiesRate); //优惠费率活动值
+            Obj.Add("BankAccountType", query.BankAccountType); //账户类型
+            //账户类型名称
+            if (AccountTypes.ContainsKey(function.CheckNull(query.BankAccountType)))
+            {
+                Obj.Add("BankAccountTypeName", AccountTypes[function.CheckNull(query.BankAccountType)]);
+            }
+            else
+            {
+                Obj.Add("BankAccountTypeName", "");
+            }
+            Obj.Add("AccountName", query.AccountName); //开户名称
+            Obj.Add("AccountBank", query.AccountBank); //开户银行
+            Obj.Add("BankAddressCode", query.BankAddressCode); //开户银行省市编码
+            Obj.Add("BankBranchId", query.BankBranchId); //开户银行联行号
+            Obj.Add("BankName", query.BankName); //开户银行全称
+            Obj.Add("AccountNumber", query.AccountNumber); //银行账号
+            Obj.Add("ApplymentId", query.ApplymentId); //微信支付申请单号
+            Obj.Add("SubMchid", query.SubMchid); //特约商户号
+            Obj.Add("SignUrl", query.SignUrl); //超级管理员签约链接
+            Obj.Add("ApplymentState", query.ApplymentState); //申请单状态
+            Obj.Add("AuditDetail", query.AuditDetail); //驳回原因详情
+            Obj.Add("IdCardCopy", query.IdCardCopy); //身份证人像面照片
+            Obj.Add("IdCardNational", query.IdCardNational); //身份证国徽面照片
+            Obj.Add("IdCardName", query.IdCardName); //身份证姓名
+            Obj.Add("IdCardNumber", query.IdCardNumber); //身份证号码
+            Obj.Add("IdCardAddress", query.IdCardAddress); //身份证居住地址
+            Obj.Add("CardPeriodBegin", query.CardPeriodBegin == null ? "" : query.CardPeriodBegin.Value.ToString("yyyy-MM-dd HH:mm:ss")); //身份证有效期开始时间
+            Obj.Add("CardPeriodEnd", query.CardPeriodEnd == null ? "" : query.CardPeriodEnd.Value.ToString("yyyy-MM-dd HH:mm:ss")); //身份证有效期结束时间
+            Obj.Add("Status", query.Status); //状态
+            Obj.Add("CreateDate", query.CreateDate); //创建时间
+            Obj.Add("AlipayAccount", query.CreateMan); //支付宝账号
+
+            return Obj;
+        }
+        #endregion
+
+
+
+        #region 进件管理-直连提交进件
+        /// <summary>
+        /// 进件管理-直连提交进件
+        /// </summary>
+        /// <param name="MerchantId">商户Id</param>
+        /// <returns></returns>
+        public static string DirectSubmitDo(int MerchantId)
+        {
+            var merInfo = MerchantInfoService.Query(MerchantId);
+            if (merInfo.Sort != 0 || merInfo.QueryCount != 2 || merInfo.Status != 2)
+            {
+
+                Dictionary<string, object> Fiel = new Dictionary<string, object>();
+                Fiel.Add("Sort", 1);
+                MerchantInfoService.Edit(Fiel, MerchantId, false);
+                MerchantAddInfoService.Edit(Fiel, MerchantId, false);
+                RedisDbconn.Instance.AddList("MerchantConfirmQueue", "{\"MerchantId\":\"" + MerchantId + "\"}");
+            }
+            else
+            {
+                return "提交失败，该商户为暂存状态或流程已结束";
+            }
+            return "success";
+        }
+        #endregion
+
+
+        #region 商户管理-直连查询商户交易信息
+        /// <summary>
+        /// 商户管理-直连查询商户交易信息
+        /// </summary>
+        /// <param name="MerchantName">商户名称</param>
+        /// <param name="Mobile">手机号码</param>
+        /// <param name="MakerCode">所属创客</param>
+        /// <param name="MatchNo">商户号</param>
+        /// <param name="AliPID">支付宝PID</param>
+        /// <param name="WeChatNo">微信商户号</param>
+        /// <param name="SubjectType">主体类型(1 个体 2 企业)</param>
+        /// <returns></returns>
+        public static Dictionary<string, object> DirectQueryMerchantTradeInfoDo(string MerchantName, string Mobile, string MakerCode, string MatchNo, string AliPID, string WeChatNo, string SubjectType)
+        {
+            Dictionary<string, object> Obj = new Dictionary<string, object>();
+            string condition = "";
+            if (!string.IsNullOrEmpty(MerchantName))
+            {
+                condition += " and MerchantName='" + MerchantName + "'";
+            }
+            if (!string.IsNullOrEmpty(MakerCode))
+            {
+                var Ids = MerchantInfoUtil.QueryMerchantIdByMakerCode(MakerCode);
+                condition += " and MerchantId in (" + Ids + ")";
+            }
+            if (!string.IsNullOrEmpty(SubjectType))
+            {
+                if (SubjectType == "1") SubjectType = "SUBJECT_TYPE_ENTERPRISE"; //企业公司
+                if (SubjectType == "2") SubjectType = "SUBJECT_TYPE_INDIVIDUAL"; //个体工商户
+                if (SubjectType == "3") SubjectType = "SUBJECT_TYPE_SMALL"; //小微
+                condition += " and SubjectType='" + SubjectType + "'";
+            }
+            var query = MerchantAddInfoService.Query(condition);
+            Obj.Add("MerchantName", query); //商户名称
+            Obj.Add("Mobile", query.MobilePhone); //手机号码
+            Obj.Add("MakerCode", query.MobilePhone); //所属创客
+            var subjectType = 0;
+            if (query.SubjectType == "SUBJECT_TYPE_ENTERPRISE") subjectType = 1; //企业公司
+            if (query.SubjectType == "SUBJECT_TYPE_INDIVIDUAL") subjectType = 2; //个体工商户
+            if (query.SubjectType == "SUBJECT_TYPE_SMALL") subjectType = 3; //小微
+            Obj.Add("SubjectType", subjectType); //主体类型(1 个体 2 企业 3 小微)
+            Obj.Add("AliPID", query.AlipayPid); //支付宝PID
+            Obj.Add("WeChatNo", query.SubMchid); //微信商户号
+            Obj.Add("OrderCount", ""); //订单总数
+            Obj.Add("TradeAmount", ""); //营业总金额
+            Obj.Add("InComeAmount", ""); //实收总金额
+            return Obj;
+        }
+        #endregion
+
+    }
+}

Util/Main1/MerchantInfoUtil.cs

@@ -0,0 +1,231 @@
+using Library;
+using MySystem.Service.Main1;
+using System.Collections.Generic;
+using MySystem.Service.KxsMain;
+using System.Linq;
+namespace MySystem.Service.Main1
+{
+    /// <summary>
+    /// 直连商户表工具类
+    /// </summary>
+    public class MerchantInfoUtil
+    {
+        #region 通过创客编号查询商户Id
+        /// <summary>
+        /// 通过创客编号查询商户Id
+        /// </summary>
+        /// <param name="MakerCode">创客编号</param>
+        /// <returns></returns>
+        public static string QueryMerchantIdByMakerCode(string MakerCode)
+        {
+            var info = "";
+            var userInfo = UsersService.QueryByMakerCode(MakerCode);
+            if (userInfo.Id > 0)
+            {
+                List<RelationData> relationData = new List<RelationData>();
+                var merInfo = MerchantInfoService.List(relationData, " and UserId=" + userInfo.Id + "", 1, 9999);
+                var merIds = "";
+                foreach (Dictionary<string, object> dic in merInfo)
+                {
+                    var MerchantId = int.Parse(dic["Id"].ToString());
+                    merIds += MerchantId + ",";
+                }
+                info = merIds.TrimEnd(',');
+            }
+            else
+            {
+                return "创客编号" + MakerCode + "不存在";
+            }
+            return info;
+        }
+        #endregion
+
+        #region 主体类型
+        /// <summary>
+        /// 主体类型
+        /// </summary>
+        /// <returns></returns>
+        public static Dictionary<string, string> GetSubjects()
+        {
+            Dictionary<string, string> dic = new Dictionary<string, string>();
+            dic.Add("SUBJECT_TYPE_INDIVIDUAL", "个体户");
+            dic.Add("SUBJECT_TYPE_ENTERPRISE", "企业");
+            // dic.Add("SUBJECT_TYPE_INSTITUTIONS", "党政、机关及事业单位");
+            // dic.Add("SUBJECT_TYPE_OTHERS", "其他组织");
+            return dic;
+        }
+        #endregion
+
+        #region 通过主体类型获取经营类型
+        /// <summary>
+        /// 通过主体类型获取经营类型
+        /// </summary>
+        /// <param name="Kind"></param>
+        /// <returns></returns>
+        public static List<SettleData> GetSettles(string Kind)
+        {
+            if (Kind == "SUBJECT_TYPE_INDIVIDUAL")
+            {
+                return GetPersonSettleItems();
+            }
+            return GetBusinessSettleItems();
+        }
+        #endregion
+
+        #region 个体经营类型
+        /// <summary>
+        /// 个体经营类型
+        /// </summary>
+        /// <returns></returns>
+        public static List<SettleData> GetPersonSettleItems()
+        {
+            List<SettleData> dic = new List<SettleData>();
+            dic.Add(new SettleData() { ptext = "食品生鲜", text = "肉、禽、蛋及水产品等", value = "719", code = "A0002_B0202" });
+            dic.Add(new SettleData() { ptext = "健身运动服务", text = "健身房", value = "719", code = "A0004_B0064" });
+            dic.Add(new SettleData() { ptext = "健身运动服务", text = "体育场馆", value = "719", code = "A0004_B0068" });
+            dic.Add(new SettleData() { ptext = "居民生活服务", text = "公共交通", value = "719", code = "A0006_B0088" });
+            dic.Add(new SettleData() { ptext = "景区/酒店", text = "旅行住宿", value = "719", code = "A0010_B0157" });
+            dic.Add(new SettleData() { ptext = "居民生活服务", text = "生活服务", value = "719", code = "A0003_B0116" });
+            dic.Add(new SettleData() { ptext = "零售", text = "百货商城", value = "719", code = "A0002_B0017" });
+            dic.Add(new SettleData() { ptext = "服饰鞋包", text = "服饰鞋包", value = "719", code = "A0002_B0026" });
+            dic.Add(new SettleData() { ptext = "零售", text = "家居家纺建材", value = "719", code = "A0002_B0216" });
+            dic.Add(new SettleData() { ptext = "零售", text = "母婴玩具", value = "719", code = "A0002_B0032" });
+            dic.Add(new SettleData() { ptext = "零售", text = "数码家电", value = "719", code = "A0003_B0051" });
+            dic.Add(new SettleData() { ptext = "零售", text = "图书音像", value = "719", code = "A0002_B0031" });
+            dic.Add(new SettleData() { ptext = "居民生活服务", text = "文化玩乐宠物", value = "719", code = "A0004_B0070" });
+            dic.Add(new SettleData() { ptext = "咨询/娱乐票务", text = "娱乐票务", value = "719", code = "A0004_B0065" });
+            dic.Add(new SettleData() { ptext = "零售", text = "办公用品", value = "719", code = "A0002_B0203" });
+            dic.Add(new SettleData() { ptext = "零售", text = "工业产品", value = "719", code = "A0002_B0042" });
+            dic.Add(new SettleData() { ptext = "咨询/娱乐票务", text = "专业咨询", value = "719", code = "A0008_B0139" });
+            dic.Add(new SettleData() { ptext = "其他", text = "其他类别", value = "716", code = "A0002_B0043" });
+
+
+            // dic.Add(new SettleData() { ptext = "餐饮", text = "餐饮", code = "C_C05_5814", value = "719", special = 0});
+            // dic.Add(new SettleData() { ptext = "食品生鲜", text = "酒类", code = "C_C05_5921", value = "719", special = 1});
+            // dic.Add(new SettleData() { ptext = "食品生鲜", text = "肉、禽、蛋及水产品等", code = "C_C05_5422", value = "719", special = 0});
+            // dic.Add(new SettleData() { ptext = "私立/民营医院/诊所", text = "医疗服务", code = "P_P01_8011", value = "719", special = 1});
+            // dic.Add(new SettleData() { ptext = "保健器械/医疗器械/非处方药品", text = "药品、药品经营者（批发商）", code = "B_B04_5122", value = "719", special = 1});
+            // dic.Add(new SettleData() { ptext = "保健器械/医疗器械/非处方药品", text = "医疗器械", code = "B_B04_5047", value = "719", special = 1});
+            // dic.Add(new SettleData() { ptext = "游艺厅/KTV/网吧", text = "游艺厅/KTV", code = "D_D01_7999", value = "719", special = 1});
+            // dic.Add(new SettleData() { ptext = "游艺厅/KTV/网吧", text = "网吧", code = "D_D01_7999", value = "719", special = 1});
+            // dic.Add(new SettleData() { ptext = "宠物医院", text = "宠物及宠物用品", code = "C_C10_5995", value = "719", special = 1});
+            // dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/其他", text = "公共交通", code = "A_A01_4121", value = "719", special = 0});
+            // dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/其他", text = "旅行住宿", code = "A_A04_7011", value = "719", special = 0});
+            // dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/其他", text = "公共仓储、集装整理", code = "A_A02_4225", value = "719", special = 0});
+            // dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/其他", text = "商业服务", code = "S_S05_7338", value = "719", special = 0});
+            // dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/其他", text = "汽车租赁和服务", code = "S_S10_7512", value = "719", special = 0});
+            // dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/其他", text = "生活服务", code = "S_S08_7295", value = "719", special = 0});
+            // dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/其他", text = "百货商城", code = "C_C04_5411", value = "719", special = 0});
+            // dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/其他", text = "服饰鞋包", code = "C_C06_5699", value = "719", special = 0});
+            // dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/其他", text = "家居家纺建材", code = "C_C03_5211", value = "719", special = 0});
+            // dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/其他", text = "母婴玩具", code = "C_C02_5641", value = "719", special = 0});
+            // dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/其他", text = "数码家电", code = "C_C07_5732", value = "719", special = 0});
+            // dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/其他", text = "图书音像", code = "C_C09_5942", value = "719", special = 0});
+            // dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/其他", text = "文化玩乐宠物", code = "C_C10_5995", value = "719", special = 0});
+            // dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/其他", text = "彩票", code = "D_D03_7995", value = "719", special = 0});
+            // dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/其他", text = "娱乐票务", code = "D_D01_7999", value = "719", special = 0});
+            // dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/其他", text = "法律咨询和律师事务所", code = "P_P04_8111", value = "719", special = 1});
+            // dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/其他", text = "办公用品", code = "B_B01_5943", value = "719", special = 0});
+            // dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/其他", text = "工业产品", code = "B_B02_5065", value = "719", special = 0});
+            // dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/其他", text = "汽车和运输工具", code = "B_B03_5599", value = "719", special = 0});
+            // dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/其他", text = "专业咨询", code = "P_P04_8999", value = "719", special = 0});
+            // dic.Add(new SettleData() { ptext = "话费通讯", text = "话费充值与缴费", code = "D_D04_4815", value = "720", special = 1});
+            // dic.Add(new SettleData() { ptext = "加油", text = "加油站、服务站", code = "B_B03_5541", value = "721", special = 1});
+            return dic;
+        }
+        #endregion
+
+        #region 企业经营类型
+        /// <summary>
+        /// 企业经营类型
+        /// </summary>
+        /// <returns></returns>
+        public static List<SettleData> GetBusinessSettleItems()
+        {
+            List<SettleData> dic = new List<SettleData>();
+            dic.Add(new SettleData() { ptext = "餐饮", text = "餐饮", value = "716", code = "A0001_B0001" });
+            dic.Add(new SettleData() { ptext = "食品生鲜", text = "肉、禽、蛋及水产品等", value = "716", code = "A0002_B0202" });
+            dic.Add(new SettleData() { ptext = "健身运动服务", text = "健身房", value = "716", code = "A0004_B0064" });
+            dic.Add(new SettleData() { ptext = "健身运动服务", text = "体育场馆", value = "716", code = "A0004_B0068" });
+            dic.Add(new SettleData() { ptext = "城市公共交通", text = "公共交通", value = "716", code = "A0006_B0088" });
+            dic.Add(new SettleData() { ptext = "景区/酒店", text = "旅行住宿", value = "716", code = "A0010_B0157" });
+            dic.Add(new SettleData() { ptext = "居民生活服务", text = "生活服务", value = "716", code = "A0003_B0116" });
+            dic.Add(new SettleData() { ptext = "零售", text = "百货商城", value = "716", code = "A0002_B0017" });
+            dic.Add(new SettleData() { ptext = "服饰鞋包", text = "服饰鞋包", value = "716", code = "A0002_B0026" });
+            dic.Add(new SettleData() { ptext = "零售", text = "家居家纺建材", value = "716", code = "A0002_B0216" });
+            dic.Add(new SettleData() { ptext = "零售", text = "母婴玩具", value = "716", code = "A0002_B0032" });
+            dic.Add(new SettleData() { ptext = "零售", text = "数码家电", value = "716", code = "A0003_B0051" });
+            dic.Add(new SettleData() { ptext = "零售", text = "图书音像", value = "716", code = "A0002_B0031" });
+            dic.Add(new SettleData() { ptext = "居民生活服务", text = "文化玩乐宠物", value = "716", code = "A0004_B0070" });
+            dic.Add(new SettleData() { ptext = "咨询/娱乐票务", text = "娱乐票务", value = "716", code = "A0004_B0065" });
+            dic.Add(new SettleData() { ptext = "零售", text = "办公用品", value = "716", code = "A0002_B0203" });
+            dic.Add(new SettleData() { ptext = "零售", text = "工业产品", value = "716", code = "A0002_B0042" });
+            dic.Add(new SettleData() { ptext = "婚介平台/就业信息平台/其他信息服务平台", text = "婚介服务", value = "720", code = "A0003_B0053" });
+            dic.Add(new SettleData() { ptext = "零售", text = "其它类别", value = "716", code = "A0002_B0043" });
+
+
+            // dic.Add(new SettleData() { ptext = "餐饮", text = "餐饮", code = "C_C05_5814", value = "716", special = 0});
+            // dic.Add(new SettleData() { ptext = "电商平台", text = "电商平台", code = "C_C05_5814", value = "716", special = 0});
+            // dic.Add(new SettleData() { ptext = "食品生鲜", text = "酒类", code = "C_C05_5921", value = "716", special = 1});
+            // dic.Add(new SettleData() { ptext = "食品生鲜", text = "肉、禽、蛋及水产品等", code = "C_C05_5422", value = "716", special = 0});
+            // dic.Add(new SettleData() { ptext = "电信运营商/宽带收费", text = "电信通讯", code = "D_D04_4814", value = "716", special = 1});
+            // dic.Add(new SettleData() { ptext = "私立/民营医院/诊所", text = "医疗服务", code = "P_P01_8011", value = "716", special = 1});
+            // dic.Add(new SettleData() { ptext = "保健器械/医疗器械/非处方药品", text = "医疗器械", code = "B_B04_5047", value = "716", special = 1});
+            // dic.Add(new SettleData() { ptext = "保健器械/医疗器械/非处方药品", text = "药品、药品经营者（批发商）", code = "B_B04_5122", value = "716", special = 1});
+            // dic.Add(new SettleData() { ptext = "游艺厅/KTV/网吧", text = "游艺厅/KTV", code = "D_D01_7999", value = "716", special = 1});
+            // dic.Add(new SettleData() { ptext = "游艺厅/KTV/网吧", text = "网吧", code = "D_D01_7999", value = "716", special = 1});
+            // dic.Add(new SettleData() { ptext = "宠物医院", text = "宠物及宠物用品", code = "C_C10_5995", value = "716", special = 1});
+            // dic.Add(new SettleData() { ptext = "旅行社", text = "旅行社和旅游服务", code = "A_A04_4722", value = "716", special = 1});
+            // dic.Add(new SettleData() { ptext = "宗教组织", text = "宗教物品", code = "C_C10_5973", value = "716", special = 0});
+            // dic.Add(new SettleData() { ptext = "宗教组织", text = "其他宗教服务", code = "P_P04_8999", value = "716", special = 1});
+            // dic.Add(new SettleData() { ptext = "文物经营/文物复制品销售", text = "文物经营/文物复制品销售", code = "C_C10_5971", value = "716", special = 1});
+            // dic.Add(new SettleData() { ptext = "拍卖典当", text = "典当行", code = "S_S04_5933", value = "716", special = 1});
+            // dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/网上商城/其他", text = "公共交通", code = "A_A01_4121", value = "716", special = 0});
+            // dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/网上商城/其他", text = "旅行住宿", code = "A_A04_7011", value = "716", special = 0});
+            // dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/网上商城/其他", text = "公共仓储、集装整理", code = "A_A02_4225", value = "716", special = 0});
+            // dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/网上商城/其他", text = "商业服务", code = "S_S05_7338", value = "716", special = 0});
+            // dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/网上商城/其他", text = "汽车租赁和服务", code = "S_S10_7512", value = "716", special = 0});
+            // dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/网上商城/其他", text = "生活服务", code = "S_S08_7295", value = "716", special = 0});
+            // dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/网上商城/其他", text = "百货商城", code = "C_C04_5411", value = "716", special = 0});
+            // dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/网上商城/其他", text = "服饰鞋包", code = "C_C06_5699", value = "716", special = 0});
+            // dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/网上商城/其他", text = "家居家纺建材", code = "C_C03_5211", value = "716", special = 0});
+            // dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/网上商城/其他", text = "母婴玩具", code = "C_C02_5641", value = "716", special = 0});
+            // dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/网上商城/其他", text = "数码家电", code = "C_C07_5732", value = "716", special = 0});
+            // dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/网上商城/其他", text = "图书音像", code = "C_C09_5942", value = "716", special = 0});
+            // dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/网上商城/其他", text = "文化玩乐宠物", code = "C_C10_5995", value = "716", special = 0});
+            // dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/网上商城/其他", text = "彩票", code = "D_D03_7995", value = "716", special = 0});
+            // dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/网上商城/其他", text = "娱乐票务", code = "D_D01_7999", value = "716", special = 0});
+            // dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/网上商城/其他", text = "法律咨询和律师事务所", code = "P_P04_8111", value = "716", special = 1});
+            // dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/网上商城/其他", text = "办公用品", code = "B_B01_5943", value = "716", special = 0});
+            // dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/网上商城/其他", text = "工业产品", code = "B_B02_5065", value = "716", special = 0});
+            // dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/网上商城/其他", text = "汽车和运输工具", code = "B_B03_5599", value = "716", special = 0});
+            // dic.Add(new SettleData() { ptext = "零售批发/生活娱乐/网上商城/其他", text = "专业咨询", code = "P_P04_8999", value = "716", special = 0});
+            // dic.Add(new SettleData() { ptext = "话费通讯", text = "话费充值与缴费", code = "D_D04_4815", value = "728", special = 1});
+            // dic.Add(new SettleData() { ptext = "婚介平台/就业信息平台/其他", text = "婚介服务", code = "S_S08_7273", value = "728", special = 0});
+            // dic.Add(new SettleData() { ptext = "门户论坛/网络广告及推广/软件开发/其他互联网服务", text = "计算机服务/其他", code = "D_D05_7372", value = "711", special = 0});
+            // dic.Add(new SettleData() { ptext = "快递", text = "快递服务", code = "A_A02_4215", value = "717", special = 1});
+            // dic.Add(new SettleData() { ptext = "加油", text = "加油站、服务站", code = "B_B03_5541", value = "717", special = 1});
+            // dic.Add(new SettleData() { ptext = "公共事业（水电煤气）", text = "公共事业（电、气、水）", code = "S_S06_4900", value = "730", special = 1});
+            // dic.Add(new SettleData() { ptext = "公共事业（水电煤气）", text = "公共事业-电力缴费", code = "S_S06_4901", value = "730", special = 1});
+            // dic.Add(new SettleData() { ptext = "公共事业（水电煤气）", text = "公共事业-煤气缴费", code = "S_S06_4902", value = "730", special = 1});
+            // dic.Add(new SettleData() { ptext = "公共事业（水电煤气）", text = "公共事业-自来水缴费", code = "S_S06_4903", value = "730", special = 1});
+            return dic;
+        }
+        #endregion
+
+        #region 账户类型
+        /// <summary>
+        /// 账户类型
+        /// </summary>
+        /// <returns></returns>
+        public static Dictionary<string, string> GetAccountTypes()
+        {
+            Dictionary<string, string> dic = new Dictionary<string, string>();
+            dic.Add("BANK_ACCOUNT_TYPE_CORPORATE", "对公银行账户");
+            dic.Add("BANK_ACCOUNT_TYPE_PERSONAL", "经营者个人银行卡");
+            return dic;
+        }
+        #endregion
+
+    }
+}

Util/Main2/MerchantAddInfoUtil.cs

@@ -0,0 +1,208 @@
+using Library;
+using MySystem.Service.Main2;
+using System.Collections.Generic;
+using MySystem.Service.KxsMain;
+namespace MySystem.Service.Main2
+{
+    /// <summary>
+    /// 银联商户进件表工具类
+    /// </summary>
+    public class MerchantAddInfoUtil
+    {
+        #region 银联商户进件详情
+        /// <summary>
+        /// 银联商户进件详情
+        /// </summary>
+        /// <param name="MerchantId">商户Id</param>
+        /// <returns></returns>
+        public static Dictionary<string, object> MerchantAddInfoDetail(int MerchantId)
+        {
+            Dictionary<string, object> Obj = new Dictionary<string, object>();
+            var query = MerchantAddInfoService.Query(MerchantId);
+            Obj.Add("ContactName", query.ContactName); //管理员姓名
+            Obj.Add("ContactIdNumber", query.ContactIdNumber); //管理员身份证件号码
+            Obj.Add("OpenId", query.OpenId); //管理员微信openid
+            Obj.Add("MobilePhone", query.MobilePhone); //联系手机
+            Obj.Add("ContactEmail", query.ContactEmail); //联系邮箱
+            Obj.Add("SubjectType", query.SubjectType); //主体类型
+            Obj.Add("SubjectTypeName", MerchantInfoUtil.GetDicValue(MerchantInfoUtil.GetSubjects(), query.SubjectType)); //主体类型名称
+            Obj.Add("LicenseCopy", query.LicenseCopy); //营业执照照片
+            Obj.Add("LicenseNumber", query.LicenseNumber); //统一社会信用代码
+            Obj.Add("LegalPerson", query.LegalPerson); //个体户经营者/法人姓名
+            Obj.Add("CertCopy", query.CertCopy); //登记证书照片
+            Obj.Add("CertType", query.CertType); //登记证书类型
+            Obj.Add("CertNumber", query.CertNumber); //证书号
+            Obj.Add("CertMerchantName", query.CertMerchantName); //商户名称
+            Obj.Add("CompanyAddress", query.CompanyAddress); //注册地址
+            Obj.Add("CertLegalPerson", query.CertLegalPerson); //法人姓名
+            Obj.Add("PeriodBegin", query.PeriodBegin == null ? "" : query.PeriodBegin.Value.ToString("yyyy-MM-dd HH:mm:ss")); //有效期限开始日期
+            Obj.Add("PeriodEnd", query.PeriodEnd == null ? "" : query.PeriodEnd.Value.ToString("yyyy-MM-dd HH:mm:ss")); //有效期限结束日期
+            Obj.Add("OrganizationCopy", query.OrganizationCopy); //组织机构代码证照片
+            Obj.Add("OrganizationCode", query.OrganizationCode); //组织机构代码
+            Obj.Add("OrgPeriodBegin", query.OrgPeriodBegin == null ? "" : query.OrgPeriodBegin.Value.ToString("yyyy-MM-dd HH:mm:ss")); //组织机构代码证有效期开始日期
+            Obj.Add("OrgPeriodEnd", query.OrgPeriodEnd == null ? "" : query.OrgPeriodEnd.Value.ToString("yyyy-MM-dd HH:mm:ss")); //组织机构代码证有效期结束日期
+            Obj.Add("CertificateLetterCopy", query.CertificateLetterCopy); //单位证明函照片
+            Obj.Add("IdDocType", query.IdDocType); //证件类型
+            Obj.Add("Owner", query.Owner); //经营者/法人是否为受益人
+            Obj.Add("UboInfoIdType", query.UboInfoIdType); //最终受益人证件类型
+            Obj.Add("UboInfoIdCardCopy", query.UboInfoIdCardCopy); //最终受益人身份证人像面照片
+            Obj.Add("UboInfoIdCardNational", query.UboInfoIdCardNational); //身份证国徽面照片
+            Obj.Add("UboInfoIdDocCopy", query.UboInfoIdDocCopy); //最终受益人证件照片
+            Obj.Add("UboInfoName", query.UboInfoName); //受益人姓名
+            Obj.Add("UboInfoIdNumber", query.UboInfoIdNumber); //最终受益人证件号码
+            Obj.Add("UboInfoIdPeriodBegin", query.UboInfoIdPeriodBegin == null ? "" : query.UboInfoIdPeriodBegin.Value.ToString("yyyy-MM-dd HH:mm:ss")); //证件有效期开始时间
+            Obj.Add("UboInfoIdPeriodEnd", query.UboInfoIdPeriodEnd == null ? "" : query.UboInfoIdPeriodEnd.Value.ToString("yyyy-MM-dd HH:mm:ss")); //证件有效期结束时间
+            Obj.Add("MerchantShortname", query.MerchantShortname); //商户简称
+            Obj.Add("ServicePhone", query.ServicePhone); //客服电话
+            Obj.Add("BizStoreName", query.BizStoreName); //门店名称
+            Obj.Add("BizAddressCode", query.BizAddressCode); //门店省市编码
+            Obj.Add("BizStoreAddress", query.BizStoreAddress); //门店地址
+            Obj.Add("StoreEntrancePic", query.StoreEntrancePic); //门店门头照片
+            Obj.Add("IndoorPic", query.IndoorPic); //店内环境照片
+            Obj.Add("BizSubAppid", query.BizSubAppid); //线下场所对应的商家APPID
+            Obj.Add("MpAppid", query.MpAppid); //服务商公众号APPID
+            Obj.Add("MpSubAppid", query.MpSubAppid); //商家公众号APPID
+            Obj.Add("MpPics", query.MpPics); //公众号页面截图
+            Obj.Add("MiniProgramAppid", query.MiniProgramAppid); //服务商小程序APPID
+            Obj.Add("MiniProgramSubAppid", query.MiniProgramSubAppid); //商家小程序APPID
+            Obj.Add("MiniProgramPics", query.MiniProgramPics); //小程序截图
+            Obj.Add("AppAppid", query.AppAppid); //服务商应用APPID
+            Obj.Add("AppSubAppid", query.AppSubAppid); //商家应用APPID
+            Obj.Add("AppPics", query.AppPics); //APP截图
+            Obj.Add("WebDomain", query.WebDomain); //互联网网站域名
+            Obj.Add("WebAuthorisation", query.WebAuthorisation); //网站授权函
+            Obj.Add("WebAppId", query.WebAppId); //互联网网站对应的商家APPID
+            Obj.Add("SubCorpId", query.SubCorpId); //商家企业微信CorpID
+            Obj.Add("WeworkPics", query.WeworkPics); //企业微信页面截图
+            Obj.Add("SettlementId", query.SettlementId + "_" + query.UpdateMan); //入驻结算规则ID
+            Obj.Add("QualificationType", query.QualificationType); //所属行业
+            Obj.Add("Qualifications", query.Qualifications); //特殊资质图片
+            Obj.Add("ActivitiesId", query.ActivitiesId); //优惠费率活动ID
+            Obj.Add("ActivitiesRate", query.ActivitiesRate); //优惠费率活动值
+            Obj.Add("BankAccountType", query.BankAccountType); //账户类型
+            Obj.Add("BankAccountTypeName", MerchantInfoUtil.GetDicValue(MerchantInfoUtil.GetAccountTypes(), query.BankAccountType)); //账户类型名称
+            Obj.Add("AccountName", query.AccountName); //开户名称
+            Obj.Add("AccountBank", query.AccountBank); //开户银行
+            Obj.Add("BankAddressCode", query.BankAddressCode); //开户银行省市编码
+            Obj.Add("BankBranchId", query.BankBranchId); //开户银行联行号
+            Obj.Add("BankName", query.BankName); //开户银行全称
+            Obj.Add("AccountNumber", query.AccountNumber); //银行账号
+            Obj.Add("ApplymentId", query.ApplymentId); //微信支付申请单号
+            Obj.Add("SubMchid", query.SubMchid); //特约商户号
+            Obj.Add("SignUrl", query.SignUrl); //超级管理员签约链接
+            Obj.Add("ApplymentState", query.ApplymentState); //申请单状态
+            Obj.Add("AuditDetail", query.AuditDetail); //驳回原因详情
+            Obj.Add("IdCardCopy", query.IdCardCopy); //身份证人像面照片
+            Obj.Add("IdCardNational", query.IdCardNational); //身份证国徽面照片
+            Obj.Add("IdCardName", query.IdCardName); //身份证姓名
+            Obj.Add("IdCardNumber", query.IdCardNumber); //身份证号码
+            Obj.Add("IdCardAddress", query.IdCardAddress);
+            Obj.Add("CardPeriodBegin", query.CardPeriodBegin == null ? "" : query.CardPeriodBegin.Value.ToString("yyyy-MM-dd HH:mm:ss")); //身份证有效期开始时间
+            Obj.Add("CardPeriodEnd", query.CardPeriodEnd == null ? "" : query.CardPeriodEnd.Value.ToString("yyyy-MM-dd HH:mm:ss")); //身份证有效期结束时间
+            Obj.Add("Status", query.Status); //状态
+            Obj.Add("CreateDate", query.CreateDate); //创建时间
+            Obj.Add("AlipayAccount", query.CreateMan); //支付宝账号
+            Obj.Add("MchtNo", query.MchtNo); //好哒商户号
+            Obj.Add("BankCard", query.BankCard); //收款人银行卡照片
+            Obj.Add("PersonWithIdCard", query.PersonWithIdCard); //法人手持身份证正面
+            Obj.Add("IndustryLicense1", query.IndustryLicense1); //行业许可证
+            Obj.Add("Extra1", query.Extra1); //补充资料
+            Obj.Add("CheckstandImg", query.CheckstandImg); //收银台
+            Obj.Add("SalesScenesType", query.QualificationType); //经营场景类型
+            Obj.Add("SalesScenesTypeName", query.SalesScenesType); //所属行业名称
+            Obj.Add("OpenAccountLicenses", query.OpenAccountLicenses); //开户许可证
+            Obj.Add("ResserveMobile", query.ResserveMobile); //银行预留手机号
+            Obj.Add("ChannelKind", query.ChannelKind); // 商户类型
+            Obj.Add("OpenBankAccout", query.OpenBankAccout); // 开户许可证-银行卡号
+            Obj.Add("OpenBankAccName", query.OpenBankAccName); // 开户许可证-开户名
+            Obj.Add("OpenBankName", OpenBankAllService.Query(" BankChildNo='" + query.OpenUnionNo + "'").BankChild); // 开户许可证-开户行全称
+            var str = "";
+            str = HaoDaAreaCodeService.Query("CityCode='" + query.OpenBankRegionCode + "'").CityName;
+            string OpenBankRegionCode = "";
+            if (!string.IsNullOrEmpty(str))
+            {
+                OpenBankRegionCode = str.Substring(str.IndexOf(',') + 1, str.Length - str.IndexOf(',') - 1);
+            }
+            Obj.Add("OpenBankRegionCode", OpenBankRegionCode); // 开户银行支行区域码
+
+            return Obj;
+        }
+        #endregion
+
+
+        #region 进件管理-银联提交进件
+        /// <summary>
+        /// 进件管理-银联提交进件
+        /// </summary>
+        /// <param name="MerchantId">商户Id</param>
+        /// <returns></returns>
+        public static string DirectSubmitDo(int MerchantId)
+        {
+            var merInfo = MerchantInfoService.Query(MerchantId);
+            if (merInfo.Sort != 0 || merInfo.QueryCount != 2 || merInfo.Status != 2)
+            {
+
+                Dictionary<string, object> Fiel = new Dictionary<string, object>();
+                Fiel.Add("Sort", 1);
+                MerchantInfoService.Edit(Fiel, MerchantId, false);
+                MerchantAddInfoService.Edit(Fiel, MerchantId, false);
+                RedisDbconn.Instance.AddList("MerchantConfirmHdQueue", "{\"MerchantId\":\"" + MerchantId + "\"}");
+            }
+            else
+            {
+                return "提交失败，该商户为暂存状态或流程已结束";
+            }
+            return "success";
+        }
+        #endregion
+
+
+        #region 商户管理-银联查询商户交易信息
+        /// <summary>
+        /// 商户管理-银联查询商户交易信息
+        /// </summary>
+        /// <param name="MerchantName">商户名称</param>
+        /// <param name="Mobile">手机号码</param>
+        /// <param name="MakerCode">所属创客</param>
+        /// <param name="MatchNo">商户号</param>
+        /// <param name="SubjectType">主体类型(1 个体 2 企业 3 小微)</param>
+        /// <returns></returns>
+        public static Dictionary<string, object> DirectQueryMerchantTradeInfoDo(string MerchantName, string Mobile, string MakerCode, string MatchNo, string SubjectType)
+        {
+            Dictionary<string, object> Obj = new Dictionary<string, object>();
+            string condition = "";
+            if (!string.IsNullOrEmpty(MerchantName))
+            {
+                condition += " and MerchantName='" + MerchantName + "'";
+            }
+            if (!string.IsNullOrEmpty(MakerCode))
+            {
+                var Ids = MerchantInfoUtil.QueryMerchantIdByMakerCode(MakerCode);
+                condition += " and MerchantId in (" + Ids + ")";
+            }
+            if (!string.IsNullOrEmpty(SubjectType))
+            {
+                if (SubjectType == "1") SubjectType = "SUBJECT_TYPE_ENTERPRISE"; //企业公司
+                if (SubjectType == "2") SubjectType = "SUBJECT_TYPE_INDIVIDUAL"; //个体工商户
+                if (SubjectType == "3") SubjectType = "SUBJECT_TYPE_SMALL"; //小微
+                condition += " and SubjectType='" + SubjectType + "'";
+            }
+            var query = MerchantAddInfoService.Query(condition);
+            Obj.Add("MerchantName", query); //商户名称
+            Obj.Add("Mobile", query.MobilePhone); //手机号码
+            Obj.Add("MakerCode", query.MobilePhone); //所属创客
+            var subjectType = 0;
+            if (query.SubjectType == "SUBJECT_TYPE_ENTERPRISE") subjectType = 1; //企业公司
+            if (query.SubjectType == "SUBJECT_TYPE_INDIVIDUAL") subjectType = 2; //个体工商户
+            if (query.SubjectType == "SUBJECT_TYPE_SMALL") subjectType = 3; //小微
+            Obj.Add("SubjectType", subjectType); //主体类型(1 个体 2 企业 3 小微)
+            Obj.Add("MatchNo", query.MchtNo); //商户号
+            Obj.Add("OrderCount", ""); //订单总数
+            Obj.Add("TradeAmount", ""); //营业总金额
+            Obj.Add("InComeAmount", ""); //实收总金额
+            return Obj;
+        }
+        #endregion
+
+    }
+}

Util/Main2/MerchantInfoUtil.cs

@@ -0,0 +1,92 @@
+using Library;
+using MySystem.Service.Main2;
+using System.Collections.Generic;
+using MySystem.Service.KxsMain;
+namespace MySystem.Service.Main2
+{
+    /// <summary>
+    /// 银联商户表工具类
+    /// </summary>
+    public class MerchantInfoUtil
+    {
+        #region 通过创客编号查询商户Id
+        /// <summary>
+        /// 通过创客编号查询商户Id
+        /// </summary>
+        /// <param name="MakerCode">创客编号</param>
+        /// <returns></returns>
+        public static string QueryMerchantIdByMakerCode(string MakerCode)
+        {
+            var info = "";
+            var userInfo = UsersService.QueryByMakerCode(MakerCode);
+            if (userInfo.Id > 0)
+            {
+                List<RelationData> relationData = new List<RelationData>();
+                var merInfo = MerchantInfoService.List(relationData, " and UserId=" + userInfo.Id + "", 1, 9999);
+                var merIds = "";
+                foreach (Dictionary<string, object> dic in merInfo)
+                {
+                    var MerchantId = int.Parse(dic["Id"].ToString());
+                    merIds += MerchantId + ",";
+                }
+                info = merIds.TrimEnd(',');
+            }
+            else
+            {
+                return "创客编号" + MakerCode + "不存在";
+            }
+            return info;
+        }
+        #endregion
+
+        #region 主体类型
+        /// <summary>
+        /// 主体类型
+        /// </summary>
+        /// <returns></returns>
+        public static Dictionary<string, string> GetSubjects()
+        {
+            Dictionary<string, string> dic = new Dictionary<string, string>();
+            dic.Add("SUBJECT_TYPE_INDIVIDUAL", "个体工商户");
+            dic.Add("SUBJECT_TYPE_ENTERPRISE", "企业公司");
+            dic.Add("SUBJECT_TYPE_SMALL", "小微商户");
+            // dic.Add("SUBJECT_TYPE_INSTITUTIONS", "党政、机关及事业单位");
+            // dic.Add("SUBJECT_TYPE_OTHERS", "其他组织");
+            return dic;
+        }
+        #endregion
+
+        #region 账户类型
+        /// <summary>
+        /// 账户类型
+        /// </summary>
+        /// <returns></returns>
+        public static Dictionary<string, string> GetAccountTypes()
+        {
+            Dictionary<string, string> dic = new Dictionary<string, string>();
+            dic.Add("BANK_ACCOUNT_TYPE_CORPORATE", "企业对公银行账号");
+            dic.Add("BANK_ACCOUNT_TYPE_PERSONAL", "法人个人银行卡");
+            return dic;
+        }
+        #endregion
+
+        #region 获取字典参数
+        /// <summary>
+        /// 获取字典参数
+        /// </summary>
+        /// <param name="dic"></param>
+        /// <param name="key"></param>
+        /// <returns></returns>
+        public static string GetDicValue(Dictionary<string, string> dic, string key)
+        {
+            key = function.CheckNull(key);
+            if (dic.ContainsKey(key))
+            {
+                return dic[key];
+            }
+            return "";
+        }
+        #endregion
+
+    }
+}