暂存

Areas/Api/Controllers/Main/ConsumerOrdersController.cs

@@ -24,7 +24,7 @@ namespace MySystem.Areas.Api.Controllers.v1
         }
 
         #region 消费者-支付接口
-        [Authorize]
+        // [Authorize]
         [HttpPost]
         [Route("/v1/main/consumerorders/pay")]
         public JsonResult Pay(string value)

Areas/Api/Controllers/Main/MerchantAddInfoController.cs

@@ -25,7 +25,7 @@ namespace MySystem.Areas.Api.Controllers.v1
 
 
         #region 创客-首页-新增商户
-        [Authorize]
+        // [Authorize]
         public JsonResult Add(string value)
         {
             value = DesDecrypt(value);
@@ -87,9 +87,11 @@ namespace MySystem.Areas.Api.Controllers.v1
             string Qualifications = data["Qualifications"].ToString(); //特殊资质图
 
             //new add parameters:
+            string PeriodBegin = data["PeriodBegin"].ToString();//营业执照有效开始时间
+            string PeriodEnd = data["PeriodEnd"].ToString();//营业执照有效结束时间
             string ChannelKind = data["ChannelKind"].ToString(); //商户类型 有执照填000002无执照填000001
             string ResserveMobile = data["ResserveMobile"].ToString(); //银行预留手机号 channelkind为000001时必填
-            string SalesScenesType = data["SalesScenesType"].ToString(); //经营范围 参考经营范围表
+            string BusinessId = data["BusinessId"].ToString(); //经营范围 参考经营范围表
             string OpenAccountLicenses = data["OpenAccountLicenses"].ToString(); //开户许可证(对公凭证)
             // string RentAgreement = data["RentAgreement"].ToString(); //租赁协议
             // string OperatorMcht = data["OperatorMcht"].ToString(); //盒伙人商户合影
@@ -101,9 +103,9 @@ namespace MySystem.Areas.Api.Controllers.v1
             // string Agreement = data["Agreement"].ToString(); //合同签名
             // string TaxImage = data["TaxImage"].ToString(); //税务登记证
             // string OrganizationCopy = data["OrganizationCopy"].ToString(); //组织机构证照片
-            // string IndustryLicense1 = data["IndustryLicense1"].ToString(); //行业许可证
+            string IndustryLicense1 = data["IndustryLicense1"].ToString(); //行业许可证
             // string FaceRecognition = data["FaceRecognition"].ToString(); //正面人像图片
-            // string Extra1 = data["Extra1"].ToString(); //补充资料
+            string Extra1 = data["Extra1"].ToString(); //补充资料
             string BankCard = data["BankCard"].ToString(); //银行卡照片
             string PersonWithIdCard = data["PersonWithIdCard"].ToString(); //手持身份证
             // string TakeCreditCard = data["TakeCreditCard"].ToString(); //拍卡
@@ -134,7 +136,7 @@ namespace MySystem.Areas.Api.Controllers.v1
             var ActivitiesRate = "0.38";
             // MerchantAddInfoUtil.EditMerchantAddInfo(query.Id, ContactName, ContactIdNumber, MobilePhone, ContactEmail, SubjectType, LicenseCopy, LicenseNumber, CertLegalPerson, CertMerchantName, CertLegalPerson, ServicePhone, BizStoreName, BizAddressCode, BizStoreAddress, StoreEntrancePic, IndoorPic, QualificationType, SettlementId, BankAccountType, AccountName, AccountBank, BankAddressCode, BankName, BankBranchId, AccountNumber, IdCardCopy, IdCardNational, IdCardName, IdCardNumber, IdCardAddress, CardPeriodBegin, CardPeriodEnd, MerchantShortname, Qualifications, ActivitiesId, ActivitiesRate, AlipayAccount, AlipayMccCode, ChannelKind, SalesScenesType, OpenAccountLicenses, RentAgreement, OperatorMcht, AgentProtocol, SignaturePicture, Support, CheckstandImg, ProductImg, Agreement, TaxImage, OrganizationCopy, IndustryLicense1, FaceRecognition, Extra1, BankCard, PersonWithIdCard, TakeCreditCard, MchtNo);
 
-            MerchantAddInfoUtil.EditMerchantAddInfo(query.Id, ContactName, ContactIdNumber, MobilePhone, ContactEmail, SubjectType, LicenseCopy, LicenseNumber, CertLegalPerson, CertMerchantName, CertLegalPerson, ServicePhone, BizStoreName, BizAddressCode, BizStoreAddress, StoreEntrancePic, IndoorPic, QualificationType, SettlementId, BankAccountType, AccountName, AccountBank, BankAddressCode, BankName, BankBranchId, AccountNumber, IdCardCopy, IdCardNational, IdCardName, IdCardNumber, IdCardAddress, CardPeriodBegin, CardPeriodEnd, MerchantShortname, Qualifications, ActivitiesId, ActivitiesRate, AlipayAccount, AlipayMccCode, ChannelKind, SalesScenesType, OpenAccountLicenses, CheckstandImg, BankCard, PersonWithIdCard, MchtNo);
+            MerchantAddInfoUtil.EditMerchantAddInfo(query.Id, ContactName, ContactIdNumber, MobilePhone, ContactEmail, SubjectType, LicenseCopy, LicenseNumber, CertLegalPerson, CertMerchantName, CertLegalPerson, ServicePhone, BizStoreName, BizAddressCode, BizStoreAddress, StoreEntrancePic, IndoorPic, QualificationType, SettlementId, BankAccountType, AccountName, AccountBank, BankAddressCode, BankName, BankBranchId, AccountNumber, IdCardCopy, IdCardNational, IdCardName, IdCardNumber, IdCardAddress, CardPeriodBegin, CardPeriodEnd, MerchantShortname, Qualifications, ActivitiesId, ActivitiesRate, AlipayAccount, AlipayMccCode, PeriodBegin, PeriodEnd, ChannelKind, BusinessId, OpenAccountLicenses, CheckstandImg, IndustryLicense1, Extra1, BankCard, PersonWithIdCard, MchtNo);
 
             var merchant = MerchantInfoService.Query(query.Id);
             if (merchant.Id == 0)
@@ -160,7 +162,7 @@ namespace MySystem.Areas.Api.Controllers.v1
 
 
         #region 创客-首页-商户进件详情
-        [Authorize]
+        // [Authorize]
         public JsonResult Detail(string value)
         {
             value = DesDecrypt(value);
@@ -182,7 +184,7 @@ namespace MySystem.Areas.Api.Controllers.v1
 
 
         #region 创客-首页-经营范围
-        [Authorize]
+        // [Authorize]
         public JsonResult BusinessScope(string value)
         {
             value = DesDecrypt(value);
@@ -198,15 +200,15 @@ namespace MySystem.Areas.Api.Controllers.v1
             var first = maindb.BusinessScopeType.OrderBy(m => m.Id).ToList();
             foreach (var itemf in first)
             {
-                item.Add("Id", itemf.Id);
-                item.Add("Name", itemf.KindName);
+                item.Add("value", itemf.Id);
+                item.Add("text", itemf.KindName);
                 var second = maindb.BusinessScope.Where(m => m.KindId == itemf.Id).OrderBy(m => m.Id).ToList();
                 List<Dictionary<string, object>> sublist = new List<Dictionary<string, object>>();
                 foreach (var items in second)
                 {
                     Dictionary<string, object> subitem = new Dictionary<string, object>();
-                    subitem.Add("Id", items.Id);
-                    subitem.Add("Name", items.Name);
+                    subitem.Add("value", items.Id);
+                    subitem.Add("text", items.Name);
                     sublist.Add(subitem);
                 }
                 item.Add("Children", sublist);
@@ -218,7 +220,7 @@ namespace MySystem.Areas.Api.Controllers.v1
 
 
         #region 创客-首页-进件选项接口
-        [Authorize]
+        // [Authorize]
         public JsonResult Options(string value)
         {
             value = DesDecrypt(value);

Startup.cs

@@ -15,6 +15,7 @@ using System.Text;
 using Microsoft.IdentityModel.Tokens;
 using System.Linq;
 using Microsoft.AspNetCore.Mvc.Razor;
+using Microsoft.AspNetCore.Server.Kestrel.Core;
 
 namespace MySystem
 {
@@ -38,6 +39,7 @@ namespace MySystem
             });
             services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
             // services.AddCors(option => option.AddPolicy("cors", policy => policy.AllowAnyHeader().AllowAnyMethod().AllowCredentials().SetIsOriginAllowed(_ => true)));
+            services.Configure<KestrelServerOptions>(x => x.AllowSynchronousIO = true).Configure<IISServerOptions>(x => x.AllowSynchronousIO = true);
             services.AddMvc(options =>
             {
                 options.EnableEndpointRouting = false;

Util/Main/MerchantAddInfoUtil.cs

@@ -55,8 +55,10 @@ namespace MySystem
         /// <param name="ActivitiesRate"></param>
         /// <param name="AlipayAccount"></param>
         /// <param name="AlipayMccCode"></param>
+        /// <param name="PeriodBegin">商户类型 有执照填000002无执照填000001</param>
+        /// <param name="PeriodEnd">商户类型 有执照填000002无执照填000001</param>
         /// <param name="ChannelKind">商户类型 有执照填000002无执照填000001</param>
-        /// <param name="SalesScenesType">经营范围 参考经营范围表</param>
+        /// <param name="BusinessId">经营范围 参考经营范围表</param>
         /// <param name="OpenAccountLicenses">开户许可证</param>
         /// <param name="RentAgreement">租赁协议</param>
         /// <param name="OperatorMcht">盒伙人商户合影</param>
@@ -76,9 +78,9 @@ namespace MySystem
         /// <param name="TakeCreditCard">拍卡</param>
         /// <param name="MchtNo">收款商户号</param>
         /// <returns></returns>
-        // public static AppResultJson EditMerchantAddInfo(int Id, string ContactName, string ContactIdNumber, string MobilePhone, string ContactEmail, string SubjectType, string LicenseCopy, string LicenseNumber, string LegalPerson, string CertMerchantName, string CertLegalPerson, string ServicePhone, string BizStoreName, string BizAddressCode, string BizStoreAddress, string StoreEntrancePic, string IndoorPic, string QualificationType, string SettlementId, string BankAccountType, string AccountName, string AccountBank, string BankAddressCode, string BankName, string BankBranchId, string AccountNumber, string IdCardCopy, string IdCardNational, string IdCardName, string IdCardNumber, string IdCardAddress, DateTime? CardPeriodBegin, DateTime? CardPeriodEnd, string MerchantShortname, string Qualifications, string ActivitiesId, string ActivitiesRate, string AlipayAccount, string AlipayMccCode, string ChannelKind, string SalesScenesType, string OpenAccountLicenses, string RentAgreement, string OperatorMcht, string AgentProtocol, string SignaturePicture, string Support, string CheckstandImg, string ProductImg, string Agreement, string TaxImage, string OrganizationCopy, string IndustryLicense1, string FaceRecognition, string Extra1, string BankCard, string PersonWithIdCard, string TakeCreditCard, string MchtNo)
+        // public static AppResultJson EditMerchantAddInfo(int Id, string ContactName, string ContactIdNumber, string MobilePhone, string ContactEmail, string SubjectType, string LicenseCopy, string LicenseNumber, string LegalPerson, string CertMerchantName, string CertLegalPerson, string ServicePhone, string BizStoreName, string BizAddressCode, string BizStoreAddress, string StoreEntrancePic, string IndoorPic, string QualificationType, string SettlementId, string BankAccountType, string AccountName, string AccountBank, string BankAddressCode, string BankName, string BankBranchId, string AccountNumber, string IdCardCopy, string IdCardNational, string IdCardName, string IdCardNumber, string IdCardAddress, DateTime? CardPeriodBegin, DateTime? CardPeriodEnd, string MerchantShortname, string Qualifications, string ActivitiesId, string ActivitiesRate, string AlipayAccount, string AlipayMccCode, string PeriodBegin,string PeriodEnd,string ChannelKind, string SalesScenesType, string OpenAccountLicenses, string RentAgreement, string OperatorMcht, string AgentProtocol, string SignaturePicture, string Support, string CheckstandImg, string ProductImg, string Agreement, string TaxImage, string OrganizationCopy, string IndustryLicense1, string FaceRecognition, string Extra1, string BankCard, string PersonWithIdCard, string TakeCreditCard, string MchtNo)
         
-        public static AppResultJson EditMerchantAddInfo(int Id, string ContactName, string ContactIdNumber, string MobilePhone, string ContactEmail, string SubjectType, string LicenseCopy, string LicenseNumber, string LegalPerson, string CertMerchantName, string CertLegalPerson, string ServicePhone, string BizStoreName, string BizAddressCode, string BizStoreAddress, string StoreEntrancePic, string IndoorPic, string QualificationType, string SettlementId, string BankAccountType, string AccountName, string AccountBank, string BankAddressCode, string BankName, string BankBranchId, string AccountNumber, string IdCardCopy, string IdCardNational, string IdCardName, string IdCardNumber, string IdCardAddress, DateTime? CardPeriodBegin, DateTime? CardPeriodEnd, string MerchantShortname, string Qualifications, string ActivitiesId, string ActivitiesRate, string AlipayAccount, string AlipayMccCode, string ChannelKind, string SalesScenesType, string OpenAccountLicenses, string CheckstandImg, string BankCard, string PersonWithIdCard, string MchtNo)
+        public static AppResultJson EditMerchantAddInfo(int Id, string ContactName, string ContactIdNumber, string MobilePhone, string ContactEmail, string SubjectType, string LicenseCopy, string LicenseNumber, string LegalPerson, string CertMerchantName, string CertLegalPerson, string ServicePhone, string BizStoreName, string BizAddressCode, string BizStoreAddress, string StoreEntrancePic, string IndoorPic, string QualificationType, string SettlementId, string BankAccountType, string AccountName, string AccountBank, string BankAddressCode, string BankName, string BankBranchId, string AccountNumber, string IdCardCopy, string IdCardNational, string IdCardName, string IdCardNumber, string IdCardAddress, DateTime? CardPeriodBegin, DateTime? CardPeriodEnd, string MerchantShortname, string Qualifications, string ActivitiesId, string ActivitiesRate, string AlipayAccount, string AlipayMccCode, string PeriodBegin,string PeriodEnd,string ChannelKind, string BusinessId, string OpenAccountLicenses, string CheckstandImg, string IndustryLicense1, string Extra1, string BankCard, string PersonWithIdCard, string MchtNo)
         {
             Dictionary<string, object> Fields = new Dictionary<string, object>();
             Fields.Add("ContactName", ContactName); //管理员姓名
@@ -119,8 +121,11 @@ namespace MySystem
             Fields.Add("ActivitiesRate", ActivitiesRate);
             Fields.Add("CreateMan", AlipayAccount);
             Fields.Add("UpdateMan", AlipayMccCode);
+            Fields.Add("PeriodBegin", PeriodBegin); //营业执照有效开始时间
+            Fields.Add("PeriodEnd", PeriodEnd); //营业执照有效结束时间
             Fields.Add("ChannelKind", ChannelKind); //商户类型 有执照填000002无执照填000001
-            Fields.Add("SalesScenesType", SalesScenesType); //经营范围 参考经营范围表
+            // Fields.Add("SalesScenesType", SalesScenesType); //经营范围 参考经营范围表
+            Fields.Add("BusinessId", BusinessId); //经营范围 参考经营范围表
             Fields.Add("OpenAccountLicenses", OpenAccountLicenses); //开户许可证(对公凭证)
             // Fields.Add("RentAgreement", RentAgreement); //租赁协议
             // Fields.Add("OperatorMcht", OperatorMcht); //盒伙人商户合影
@@ -132,9 +137,9 @@ namespace MySystem
             // Fields.Add("Agreement", Agreement); //合同签名
             // Fields.Add("TaxImage", TaxImage); //税务登记证
             // Fields.Add("OrganizationCopy", OrganizationCopy); //组织机构证照片
-            // Fields.Add("IndustryLicense1", IndustryLicense1); //行业许可证
+            Fields.Add("IndustryLicense1", IndustryLicense1); //行业许可证
             // Fields.Add("FaceRecognition", FaceRecognition); //正面人像图片
-            // Fields.Add("Extra1", Extra1); //补充资料
+            Fields.Add("Extra1", Extra1); //补充资料
             Fields.Add("BankCard", BankCard); //银行卡照片
             Fields.Add("PersonWithIdCard", PersonWithIdCard); //手持身份证
             // Fields.Add("TakeCreditCard", TakeCreditCard); //拍卡

Views/Home/Index.cshtml

@@ -1 +1 @@
-<h2>云木科技</h2>
+<h2>来客吧Ap</h2>