限制子商户进件时，主商户必须审核通过

Areas/Api/Controllers/Main/MerchantAddInfoController.cs

@@ -286,6 +286,10 @@ namespace MySystem.Areas.Api.Controllers.v1
                 MerchantAddInfo addInfo = MerchantAddInfoService.Query(MerchantAddInfoId);
                 if(sub)
                 {
+                    if(addInfo.HdStatus == 0)
+                    {
+                        return new AppResultJson() { Status = "-1", Info = "商户" + addInfo.CertMerchantName + "未进件成功", Data = Obj };
+                    }
                     if (SubjectType == "SUBJECT_TYPE_SMALL")
                     {
                         CertMerchantName += function.get_Random(00000000, 99999999);
@@ -797,7 +801,6 @@ namespace MySystem.Areas.Api.Controllers.v1
 
 
 
-
         #region 检查签名是否合法，合法返回1，不合法返回提示信息
 
         /// <summary>

appsettings.Development.json

@@ -15,7 +15,7 @@
     "Database": "TpAdminServer",
     "StatSqlConnStr": "server=47.109.31.237;port=3306;user=QrCodePlateMainServer;password=ll4DFaALMu9YIooM;database=QrCodePlateStatServer2;charset=utf8;",
     "KxsSqlConnStr": "server=47.108.62.1667;port=3306;user=root;password=HDlNs1ZpG5iR9D9I;database=KxsMainServer;charset=utf8;",
-    "SqlConnStr": "server=47.109.31.237;port=3306;user=QrCodePlateMainServer;password=ll4DFaALMu9YIooM;database=QrCodePlateMainServer2;charset=utf8;",
+    "SqlConnStr": "server=47.109.31.237;port=3306;user=QrCodePlateMainServer;password=ll4DFaALMu9YIooM;database=QrCodePlateMainServer2;charset=utf8mb4;",
     "ZsSqlConnStr": "server=47.109.31.237;port=3306;user=QrCodePlateMainServer;password=ll4DFaALMu9YIooM;database=QrCodePlateMainServer;charset=utf8;",
     "BsSqlConnStr": "server=47.109.31.237;port=3306;user=QrCodePlateBsServer;password=ld5Px33wvhyEz44P;database=QrCodePlateBsServer;charset=utf8;",
     "RedisConnStr": "47.109.31.237:6379,password=klm@redis,DefaultDatabase=5,poolsize=500,preheat=50,asyncPipeline=true",