添加客小爽主库

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

@@ -22,69 +22,6 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
         {
         }
 
-        #region 商户管理-直连查询商户交易信息
-        [Authorize]
-        public JsonResult DirectQueryMerchantTradeInfo(string value)
-        {
-            value = PublicFunction.DesDecrypt(value); ;
-            JsonData data = JsonMapper.ToObject(value);
-            Dictionary<string, object> Obj = DirectQueryMerchantTradeInfoDo(value);
-            return Json(new AppResultJson() { Status = "1", Info = "", Data = Obj });
-        }
-        private Dictionary<string, object> DirectQueryMerchantTradeInfoDo(string value)
-        {
-            JsonData data = JsonMapper.ToObject(value);
-            string MerchantName = data["MerchantName"].ToString(); //商户名称
-            string Mobile = data["Mobile"].ToString(); //手机号码
-            string MakerCode = data["MakerCode"].ToString(); //所属创客
-            string MatchNo = data["MatchNo"].ToString(); //商户号
-            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 企业 3 小微)
-            Obj.Add("MatchNo", ""); //商户号
-            Obj.Add("OrderCount", ""); //订单总数
-            Obj.Add("TradeAmount", ""); //营业总金额
-            Obj.Add("InComeAmount", ""); //实收总金额
-
-            return Obj;
-        }
-        #endregion
-
-
-
-        #region 商户管理-直连添加支付宝PID和微信商户号
-        [Authorize]
-        public JsonResult DirectAddPIDOrWeChatNo(string value)
-        {
-            value = PublicFunction.DesDecrypt(value); ;
-            JsonData data = JsonMapper.ToObject(value);
-            AppResultJson result = DirectAddPIDOrWeChatNoDo(value);
-            return Json(new AppResultJson() { Status = result.Status, Info = result.Info, Data = result.Data });
-        }
-        private AppResultJson DirectAddPIDOrWeChatNoDo(string value)
-        {
-            JsonData data = JsonMapper.ToObject(value);
-            string MerchantId = data["MerchantId"].ToString(); //商户Id
-            string AliPPID = data["AliPPID"].ToString(); //支付宝PID
-            string WeChatNo = data["WeChatNo"].ToString(); //微信商户号
-            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 };
-        }
-        #endregion
-
-
-
         #region 进件管理-直连商户列表
         [Authorize]
         public JsonResult DirectList(string value)
@@ -107,6 +44,9 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
             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()))
@@ -123,14 +63,22 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
             foreach (Dictionary<string, object> subdata in source)
             {
                 Dictionary<string, object> curData = new Dictionary<string, object>();
-                curData.Add("SubjectType", subdata["SubjectType"].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("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", ""); //审核平台
+                curData.Add("AuditInfo", ""); //审核平台(0 审核中 1 已通过 -1 审核失败 20 微信待签约、21 微信已签约、10 支付宝待签约、11 支付宝已签约)
 
                 dataList.Add(curData);
             }
@@ -140,32 +88,6 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
 
 
 
-        #region 进件管理-直连提交进件
-        [Authorize]
-        public JsonResult DirectSubmit(string value)
-        {
-            value = PublicFunction.DesDecrypt(value); ;
-            JsonData data = JsonMapper.ToObject(value);
-            AppResultJson result = DirectSubmitDo(value);
-            return Json(new AppResultJson() { Status = result.Status, Info = result.Info, Data = result.Data });
-        }
-        private AppResultJson DirectSubmitDo(string value)
-        {
-            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 };
-        }
-        #endregion
-
-
-
         #region 进件管理-直连查看失败原因
         [Authorize]
         public JsonResult DirectQueryFailReason(string value)
@@ -298,5 +220,94 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
 
 
 
+        #region 进件管理-直连提交进件
+        [Authorize]
+        public JsonResult DirectSubmit(string value)
+        {
+            value = PublicFunction.DesDecrypt(value); ;
+            JsonData data = JsonMapper.ToObject(value);
+            AppResultJson result = DirectSubmitDo(value);
+            return Json(new AppResultJson() { Status = result.Status, Info = result.Info, Data = result.Data });
+        }
+        private AppResultJson DirectSubmitDo(string value)
+        {
+            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 };
+        }
+        #endregion
+
+
+
+        #region 商户管理-直连查询商户交易信息
+        [Authorize]
+        public JsonResult DirectQueryMerchantTradeInfo(string value)
+        {
+            value = PublicFunction.DesDecrypt(value); ;
+            JsonData data = JsonMapper.ToObject(value);
+            Dictionary<string, object> Obj = DirectQueryMerchantTradeInfoDo(value);
+            return Json(new AppResultJson() { Status = "1", Info = "", Data = Obj });
+        }
+        private Dictionary<string, object> DirectQueryMerchantTradeInfoDo(string value)
+        {
+            JsonData data = JsonMapper.ToObject(value);
+            string MerchantName = data["MerchantName"].ToString(); //商户名称
+            string Mobile = data["Mobile"].ToString(); //手机号码
+            string MakerCode = data["MakerCode"].ToString(); //所属创客
+            string MatchNo = data["MatchNo"].ToString(); //商户号
+            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 企业 3 小微)
+            Obj.Add("MatchNo", ""); //商户号
+            Obj.Add("OrderCount", ""); //订单总数
+            Obj.Add("TradeAmount", ""); //营业总金额
+            Obj.Add("InComeAmount", ""); //实收总金额
+
+            return Obj;
+        }
+        #endregion
+
+
+
+        #region 商户管理-直连添加支付宝PID和微信商户号
+        [Authorize]
+        public JsonResult DirectAddPIDOrWeChatNo(string value)
+        {
+            value = PublicFunction.DesDecrypt(value); ;
+            JsonData data = JsonMapper.ToObject(value);
+            AppResultJson result = DirectAddPIDOrWeChatNoDo(value);
+            return Json(new AppResultJson() { Status = result.Status, Info = result.Info, Data = result.Data });
+        }
+        private AppResultJson DirectAddPIDOrWeChatNoDo(string value)
+        {
+            JsonData data = JsonMapper.ToObject(value);
+            string MerchantId = data["MerchantId"].ToString(); //商户Id
+            string AliPPID = data["AliPPID"].ToString(); //支付宝PID
+            string WeChatNo = data["WeChatNo"].ToString(); //微信商户号
+            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 };
+        }
+        #endregion
+
+
+
     }
 }

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

@@ -22,43 +22,6 @@ namespace MySystem.Areas.Api.Controllers.v1
         {
         }
 
-        #region 商户管理-银联查询商户交易信息
-        [Authorize]
-        public JsonResult UnionPayQueryMerchantTradeInfo(string value)
-        {
-            value = PublicFunction.DesDecrypt(value); ;
-            JsonData data = JsonMapper.ToObject(value);
-            Dictionary<string, object> Obj = UnionPayQueryMerchantTradeInfoDo(value);
-            return Json(new AppResultJson() { Status = "1", Info = "", Data = Obj });
-        }
-        private Dictionary<string, object> UnionPayQueryMerchantTradeInfoDo(string value)
-        {
-            JsonData data = JsonMapper.ToObject(value);
-            string MerchantName = data["MerchantName"].ToString(); //商户名称
-            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 企业)
-            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", ""); //实收总金额
-
-            return Obj;
-        }
-        #endregion
-
-
         #region 进件管理-银联商户列表
         [Authorize]
         public JsonResult UnionPayList(string value)
@@ -114,32 +77,6 @@ namespace MySystem.Areas.Api.Controllers.v1
 
 
 
-        #region 进件管理-银联提交进件
-        [Authorize]
-        public JsonResult UnionPaySubmit(string value)
-        {
-            value = PublicFunction.DesDecrypt(value); ;
-            JsonData data = JsonMapper.ToObject(value);
-            AppResultJson result = UnionPaySubmitDo(value);
-            return Json(new AppResultJson() { Status = result.Status, Info = result.Info, Data = result.Data });
-        }
-        private AppResultJson UnionPaySubmitDo(string value)
-        {
-            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 };
-        }
-        #endregion
-
-
-
         #region 进件管理-银联查看失败原因
         [Authorize]
         public JsonResult UnionPayQueryFailReason(string value)
@@ -284,5 +221,68 @@ namespace MySystem.Areas.Api.Controllers.v1
 
 
 
+        #region 进件管理-银联提交进件
+        [Authorize]
+        public JsonResult UnionPaySubmit(string value)
+        {
+            value = PublicFunction.DesDecrypt(value); ;
+            JsonData data = JsonMapper.ToObject(value);
+            AppResultJson result = UnionPaySubmitDo(value);
+            return Json(new AppResultJson() { Status = result.Status, Info = result.Info, Data = result.Data });
+        }
+        private AppResultJson UnionPaySubmitDo(string value)
+        {
+            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 };
+        }
+        #endregion
+
+
+
+        #region 商户管理-银联查询商户交易信息
+        [Authorize]
+        public JsonResult UnionPayQueryMerchantTradeInfo(string value)
+        {
+            value = PublicFunction.DesDecrypt(value); ;
+            JsonData data = JsonMapper.ToObject(value);
+            Dictionary<string, object> Obj = UnionPayQueryMerchantTradeInfoDo(value);
+            return Json(new AppResultJson() { Status = "1", Info = "", Data = Obj });
+        }
+        private Dictionary<string, object> UnionPayQueryMerchantTradeInfoDo(string value)
+        {
+            JsonData data = JsonMapper.ToObject(value);
+            string MerchantName = data["MerchantName"].ToString(); //商户名称
+            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 企业)
+            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", ""); //实收总金额
+
+            return Obj;
+        }
+        #endregion
+
+
     }
 }

Config/Base.cs

@@ -8,6 +8,7 @@ namespace AppConfig
         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();
@@ -18,6 +19,7 @@ namespace AppConfig
         #region 数据库结构
         public static Dictionary<string, Dictionary<string, string>> dbTables = new Dictionary<string, Dictionary<string, string>>();
         public static Dictionary<string, Dictionary<string, string>> bsTables = new Dictionary<string, Dictionary<string, string>>();
+        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>>();

Startup.cs

@@ -132,10 +132,33 @@ namespace MySystem
             initMain1Server();//直连
             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"];
+            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)
+            {
+                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 = 'KxsSqlConnStr' 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.kxsMainTables = tables;
+        }
         private void initBsServer()
         {
             Dictionary<string, Dictionary<string, string>> tables = new Dictionary<string, Dictionary<string, string>>();

appsettings.Development.json

@@ -13,6 +13,7 @@
     "SourceHost": "http://mpap.kexiaoshuang.com",
     "Database": "MpAdminServer",
     "SqlConnStr": "server=47.109.31.237;port=3306;user=MpMainServer;password=Qg7PI5FzvF1uvQUy;database=MpMainServer;charset=utf8;",
+    "KxsSqlConnStr": "server=47.109.31.237;port=3306;user=KxsMainServer;password=FrW8ZfxlcaVdm1r0;database=KxsMainServer;charset=utf8;",
     "BsSqlConnStr": "server=47.109.31.237;port=3306;user=QrCodePlateBsServer;password=ld5Px33wvhyEz44P;database=QrCodePlateBsServer;charset=utf8;",
     "SqlConnStr1": "server=47.109.31.237;port=3306;user=QrCodePlateMainServer;password=ll4DFaALMu9YIooM;database=QrCodePlateMainServer;charset=utf8;",
     "SqlConnStr2": "server=47.109.31.237;port=3306;user=QrCodePlateMainServer;password=ll4DFaALMu9YIooM;database=QrCodePlateMainServer2;charset=utf8;",