银联进件详情修复

删除冗余代码

Service/Bs/SystemSetService.cs

@@ -17,7 +17,7 @@ namespace MySystem.Service.Bs
         string _conn = "";
         public SystemSetService()
         {
-            _conn = ConfigurationManager.AppSettings["SqlConnStr"].ToString();
+            _conn = ConfigurationManager.AppSettings["BsSqlConnStr"].ToString();
         }
 
         /// <summary>
@@ -36,11 +36,11 @@ namespace MySystem.Service.Bs
             fields.Add("CreateDate"); //添加时间
             fields.Add("Status"); //状态
             fields.Add("WebUrl"); //网站地址
-fields.Add("WebName"); //网站名称
-fields.Add("UploadMaxSize"); //允许最大上传
-fields.Add("UploadAutoZoomWidth"); //自动缩略图宽
-fields.Add("UploadAutoZoomHeight"); //自动缩略图高
-fields.Add("UploadAutoWater"); //自动水印
+            fields.Add("WebName"); //网站名称
+            fields.Add("UploadMaxSize"); //允许最大上传
+            fields.Add("UploadAutoZoomWidth"); //自动缩略图宽
+            fields.Add("UploadAutoZoomHeight"); //自动缩略图高
+            fields.Add("UploadAutoWater"); //自动水印
 
             Dictionary<string, object> obj = new DbService(AppConfig.Base.dbTables, _conn).IndexData("SystemSet", relationData, orderBy, page, limit, condition, fields);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
@@ -54,11 +54,11 @@ fields.Add("UploadAutoWater"); //自动水印
             fields.Add("CreateDate"); //添加时间
             fields.Add("Status"); //状态
             fields.Add("WebUrl"); //网站地址
-fields.Add("WebName"); //网站名称
-fields.Add("UploadMaxSize"); //允许最大上传
-fields.Add("UploadAutoZoomWidth"); //自动缩略图宽
-fields.Add("UploadAutoZoomHeight"); //自动缩略图高
-fields.Add("UploadAutoWater"); //自动水印
+            fields.Add("WebName"); //网站名称
+            fields.Add("UploadMaxSize"); //允许最大上传
+            fields.Add("UploadAutoZoomWidth"); //自动缩略图宽
+            fields.Add("UploadAutoZoomHeight"); //自动缩略图高
+            fields.Add("UploadAutoWater"); //自动水印
 
             Dictionary<string, object> obj = new DbService(AppConfig.Base.dbTables, _conn).IndexData("SystemSet", relationData, orderBy, page, limit, condition, fields);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
@@ -87,7 +87,7 @@ fields.Add("UploadAutoWater"); //自动水印
         {
             int result = 0;
             DataTable dt = CustomerSqlConn.dtable("select count(Id) from SystemSet where 1=1" + condition, _conn);
-            if(dt.Rows.Count > 0)
+            if (dt.Rows.Count > 0)
             {
                 result = int.Parse(function.CheckInt(dt.Rows[0][0].ToString()));
             }
@@ -114,32 +114,32 @@ fields.Add("UploadAutoWater"); //自动水印
         /// <returns></returns>
         public AppResultJson Add(Dictionary<string, object> fields, bool check = true)
         {
-            if(check)
+            if (check)
             {
                 if (!function.IsInt(fields["UploadMaxSize"].ToString()))
-{
-    return new AppResultJson() { Status = "-1", Info = "请填写正确的允许最大上传" };
-}
-if (string.IsNullOrEmpty(fields["UploadAutoZoomWidth"].ToString()))
-{
-    return new AppResultJson() { Status = "-1", Info = "请填写自动缩略图宽" };
-}
-if (!function.IsInt(fields["UploadAutoZoomWidth"].ToString()))
-{
-    return new AppResultJson() { Status = "-1", Info = "请填写正确的自动缩略图宽" };
-}
-if (string.IsNullOrEmpty(fields["UploadAutoZoomHeight"].ToString()))
-{
-    return new AppResultJson() { Status = "-1", Info = "请填写自动缩略图高" };
-}
-if (!function.IsInt(fields["UploadAutoZoomHeight"].ToString()))
-{
-    return new AppResultJson() { Status = "-1", Info = "请填写正确的自动缩略图高" };
-}
+                {
+                    return new AppResultJson() { Status = "-1", Info = "请填写正确的允许最大上传" };
+                }
+                if (string.IsNullOrEmpty(fields["UploadAutoZoomWidth"].ToString()))
+                {
+                    return new AppResultJson() { Status = "-1", Info = "请填写自动缩略图宽" };
+                }
+                if (!function.IsInt(fields["UploadAutoZoomWidth"].ToString()))
+                {
+                    return new AppResultJson() { Status = "-1", Info = "请填写正确的自动缩略图宽" };
+                }
+                if (string.IsNullOrEmpty(fields["UploadAutoZoomHeight"].ToString()))
+                {
+                    return new AppResultJson() { Status = "-1", Info = "请填写自动缩略图高" };
+                }
+                if (!function.IsInt(fields["UploadAutoZoomHeight"].ToString()))
+                {
+                    return new AppResultJson() { Status = "-1", Info = "请填写正确的自动缩略图高" };
+                }
 
             }
             int Id = new DbService(AppConfig.Base.dbTables, _conn).Add("SystemSet", fields, 0);
-            return new AppResultJson(){ Status = "1", Data = Id };
+            return new AppResultJson() { Status = "1", Data = Id };
         }
 
         /// <summary>
@@ -149,32 +149,32 @@ if (!function.IsInt(fields["UploadAutoZoomHeight"].ToString()))
         /// <param name="Id">主键Id</param>
         public AppResultJson Edit(Dictionary<string, object> fields, int Id, bool check = true)
         {
-            if(check)
+            if (check)
             {
                 if (!function.IsInt(fields["UploadMaxSize"].ToString()))
-{
-    return new AppResultJson() { Status = "-1", Info = "请填写正确的允许最大上传" };
-}
-if (string.IsNullOrEmpty(fields["UploadAutoZoomWidth"].ToString()))
-{
-    return new AppResultJson() { Status = "-1", Info = "请填写自动缩略图宽" };
-}
-if (!function.IsInt(fields["UploadAutoZoomWidth"].ToString()))
-{
-    return new AppResultJson() { Status = "-1", Info = "请填写正确的自动缩略图宽" };
-}
-if (string.IsNullOrEmpty(fields["UploadAutoZoomHeight"].ToString()))
-{
-    return new AppResultJson() { Status = "-1", Info = "请填写自动缩略图高" };
-}
-if (!function.IsInt(fields["UploadAutoZoomHeight"].ToString()))
-{
-    return new AppResultJson() { Status = "-1", Info = "请填写正确的自动缩略图高" };
-}
+                {
+                    return new AppResultJson() { Status = "-1", Info = "请填写正确的允许最大上传" };
+                }
+                if (string.IsNullOrEmpty(fields["UploadAutoZoomWidth"].ToString()))
+                {
+                    return new AppResultJson() { Status = "-1", Info = "请填写自动缩略图宽" };
+                }
+                if (!function.IsInt(fields["UploadAutoZoomWidth"].ToString()))
+                {
+                    return new AppResultJson() { Status = "-1", Info = "请填写正确的自动缩略图宽" };
+                }
+                if (string.IsNullOrEmpty(fields["UploadAutoZoomHeight"].ToString()))
+                {
+                    return new AppResultJson() { Status = "-1", Info = "请填写自动缩略图高" };
+                }
+                if (!function.IsInt(fields["UploadAutoZoomHeight"].ToString()))
+                {
+                    return new AppResultJson() { Status = "-1", Info = "请填写正确的自动缩略图高" };
+                }
 
             }
             new DbService(AppConfig.Base.dbTables, _conn).Edit("SystemSet", fields, Id);
-            return new AppResultJson(){ Status = "1", Data = Id };
+            return new AppResultJson() { Status = "1", Data = Id };
         }
 
         /// <summary>
@@ -215,15 +215,15 @@ if (!function.IsInt(fields["UploadAutoZoomHeight"].ToString()))
         {
             WebCMSEntities db = new WebCMSEntities();
             JsonData list = JsonMapper.ToObject(ExcelData);
-            for (int i = 1; i < list.Count;i++ )
+            for (int i = 1; i < list.Count; i++)
             {
                 JsonData dr = list[i];
-                
+
                 db.SystemSet.Add(new SystemSet()
                 {
                     CreateDate = DateTime.Now,
                     UpdateDate = DateTime.Now,
-                    
+
                 });
                 db.SaveChanges();
             }
@@ -238,7 +238,7 @@ if (!function.IsInt(fields["UploadAutoZoomHeight"].ToString()))
         /// <returns></returns>
         // public void ExportExcel(List<RelationData> relationData, string condition)
         // {
-            
+
         // }
     }
 }

Service/Main2/MerchantDepositOrderService.cs

@@ -14,7 +14,7 @@ namespace MySystem.Service.Main2
 {
     public class MerchantDepositOrderService
     {
-        static string _conn = ConfigurationManager.AppSettings["SqlConnStr"].ToString();
+        static string _conn = ConfigurationManager.AppSettings["SqlConnStr2"].ToString();
 
         /// <summary>
         /// 查询列表(适合多表关联查询)

Service/Main2/OpenBankAllService.cs

@@ -14,7 +14,7 @@ namespace MySystem.Service.Main2
 {
     public class OpenBankAllService
     {
-        static string _conn = ConfigurationManager.AppSettings["SqlConnStr"].ToString();
+        static string _conn = ConfigurationManager.AppSettings["SqlConnStr2"].ToString();
 
         /// <summary>
         /// 查询列表(适合多表关联查询)

Util/Main1/MerchantAddInfoUtil.cs

@@ -213,7 +213,7 @@ namespace MySystem.Service.Main1
             var query = MerchantAddInfoService.Query(condition);
             Obj.Add("MerchantName", query.CertMerchantName); //商户名称
             Obj.Add("Mobile", query.MobilePhone); //手机号码
-            Obj.Add("MakerCode", query.MobilePhone); //所属创客
+            Obj.Add("MakerCode", UsersService.Query(MerchantInfoService.Query(query.Id).UserId).MakerCode); //所属创客
             var subjectType = 0;
             if (query.SubjectType == "SUBJECT_TYPE_ENTERPRISE") subjectType = 1; //企业公司
             if (query.SubjectType == "SUBJECT_TYPE_INDIVIDUAL") subjectType = 2; //个体工商户

Util/Main2/MerchantAddInfoUtil.cs

@@ -198,7 +198,7 @@ namespace MySystem.Service.Main2
             var query = MerchantAddInfoService.Query(condition);
             Obj.Add("MerchantName", query.CertMerchantName); //商户名称
             Obj.Add("Mobile", query.MobilePhone); //手机号码
-            Obj.Add("MakerCode", query.MobilePhone); //所属创客
+            Obj.Add("MakerCode", UsersService.Query(MerchantInfoService.Query(query.Id).UserId).MakerCode); //所属创客
             var subjectType = 0;
             if (query.SubjectType == "SUBJECT_TYPE_ENTERPRISE") subjectType = 1; //企业公司
             if (query.SubjectType == "SUBJECT_TYPE_INDIVIDUAL") subjectType = 2; //个体工商户

appsettings.Development.json

@@ -12,7 +12,6 @@
     "OssHost": "http://mpap.kexiaoshuang.com",
     "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;",