暂存

Areas/Api/Controllers/Main/MerchantAddInfoController.cs

@@ -24,7 +24,6 @@ namespace MySystem.Areas.Api.Controllers.v1
 
 
 
-
         #region 创客-首页-新增商户
         [Authorize]
         public JsonResult Add(string value)
@@ -90,23 +89,23 @@ namespace MySystem.Areas.Api.Controllers.v1
             //new add parameters:
             string ChannelKind = data["ChannelKind"].ToString(); //商户类型 有执照填000002无执照填000001
             string SalesScenesType = data["SalesScenesType"].ToString(); //经营范围 参考经营范围表
-            string OpenAccountLicenses = data["OpenAccountLicenses"].ToString(); //开户许可证
-            string RentAgreement = data["RentAgreement"].ToString(); //租赁协议
-            string OperatorMcht = data["OperatorMcht"].ToString(); //盒伙人商户合影
-            string AgentProtocol = data["AgentProtocol"].ToString(); //委托结算协议
-            string SignaturePicture = data["SignaturePicture"].ToString(); //商户签名图片
-            string Support = data["Support"].ToString(); //辅助照片
+            string OpenAccountLicenses = data["OpenAccountLicenses"].ToString(); //开户许可证(对公凭证)
+            // string RentAgreement = data["RentAgreement"].ToString(); //租赁协议
+            // string OperatorMcht = data["OperatorMcht"].ToString(); //盒伙人商户合影
+            // string AgentProtocol = data["AgentProtocol"].ToString(); //委托结算协议
+            // string SignaturePicture = data["SignaturePicture"].ToString(); //商户签名图片
+            // string Support = data["Support"].ToString(); //辅助照片
             string CheckstandImg = data["CheckstandImg"].ToString(); //收银台
-            string ProductImg = data["ProductImg"].ToString(); //商品照片
-            string Agreement = data["Agreement"].ToString(); //合同签名
-            string TaxImage = data["TaxImage"].ToString(); //税务登记证
-            string OrganizationCopy = data["OrganizationCopy"].ToString(); //组织机构证照片
-            string IndustryLicense1 = data["IndustryLicense1"].ToString(); //行业许可证
-            string FaceRecognition = data["FaceRecognition"].ToString(); //正面人像图片
-            string Extra1 = data["Extra1"].ToString(); //补充资料
+            // string ProductImg = data["ProductImg"].ToString(); //商品照片
+            // string Agreement = data["Agreement"].ToString(); //合同签名
+            // string TaxImage = data["TaxImage"].ToString(); //税务登记证
+            // string OrganizationCopy = data["OrganizationCopy"].ToString(); //组织机构证照片
+            // string IndustryLicense1 = data["IndustryLicense1"].ToString(); //行业许可证
+            // string FaceRecognition = data["FaceRecognition"].ToString(); //正面人像图片
+            // string Extra1 = data["Extra1"].ToString(); //补充资料
             string BankCard = data["BankCard"].ToString(); //银行卡照片
             string PersonWithIdCard = data["PersonWithIdCard"].ToString(); //手持身份证
-            string TakeCreditCard = data["TakeCreditCard"].ToString(); //拍卡
+            // string TakeCreditCard = data["TakeCreditCard"].ToString(); //拍卡
             string MchtNo = data["MchtNo"].ToString(); //收款商户号
 
             int Finish = int.Parse(function.CheckInt(data["Finish"].ToString()));
@@ -132,7 +131,9 @@ namespace MySystem.Areas.Api.Controllers.v1
             }
             var ActivitiesId = "20191030111cff5b5e";
             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, 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);
 
             var merchant = MerchantInfoService.Query(query.Id);
             if (merchant.Id == 0)
@@ -179,7 +180,6 @@ namespace MySystem.Areas.Api.Controllers.v1
         #endregion
 
 
-
         #region 创客-首页-经营范围
         [Authorize]
         public JsonResult BusinessScope(string value)
@@ -192,8 +192,6 @@ namespace MySystem.Areas.Api.Controllers.v1
         public List<Dictionary<string, object>> BusinessScopeDo(string value)
         {
             JsonData data = JsonMapper.ToObject(value);
-            int PageSize = int.Parse(function.CheckInt(data["PageSize"].ToString()));
-            int PageNum = int.Parse(function.CheckInt(data["PageNum"].ToString()));
             List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
             Dictionary<string, object> item = new Dictionary<string, object>();
             var first = maindb.BusinessScopeType.OrderBy(m => m.Id).ToList();
@@ -234,13 +232,35 @@ namespace MySystem.Areas.Api.Controllers.v1
             int PageSize = int.Parse(function.CheckInt(data["PageSize"].ToString()));
             int PageNum = int.Parse(function.CheckInt(data["PageNum"].ToString()));
             List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
-            if (Kind == "2")
+            // if (Kind == "2")
+            // {
+            //     dataList = GetPersonSettles();
+            // }
+            // else if (Kind == "21")
+            // {
+            //     dataList = GetBusinessSettles();
+            // }
+            // if (!string.IsNullOrEmpty(Kind))
+            if (Kind == "2" || Kind == "21")
             {
-                dataList = GetPersonSettles();
-            }
-            else if (Kind == "21")
-            {
-                dataList = GetBusinessSettles();
+                Dictionary<string, object> item = new Dictionary<string, object>();
+                var first = maindb.BusinessScopeType.OrderBy(m => m.Id).ToList();
+                foreach (var itemf in first)
+                {
+                    item.Add("Id", itemf.Id);
+                    item.Add("Name", 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);
+                        sublist.Add(subitem);
+                    }
+                    item.Add("Children", sublist);
+                    dataList.Add(item);
+                }
             }
             else
             {
@@ -270,8 +290,9 @@ namespace MySystem.Areas.Api.Controllers.v1
         public Dictionary<string, string> GetSubjects()
         {
             Dictionary<string, string> dic = new Dictionary<string, string>();
-            dic.Add("SUBJECT_TYPE_INDIVIDUAL", "个体户");
+            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;

Util/HaoDa/HaoDaHelper.cs

@@ -21,11 +21,11 @@ namespace MySystem
         #region 盒易付
 
         //测试环境
-        string BoxRequestUrl = "https://openapi-test.iboxpay.com/api";
-        string BoxAppId = "8840021411446784";
-        string BoxAppSecret = "xgwGnmYGjVy0GOWOWkQtRk8Hk8ur5tCV";
-        string BoxPublicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjMQxp24mjxDTr13uPW0y+tiO1yXFGw7P/pPQ0oZKK7F6KstEaus7pLEywBZ5XRXE5jgkhR2TS7Ne7djJfbpn5yFc6pPlz3ZsOfBVeB88NEwhx6xzCGX2eqSSkO33n8w2G0xc2ss5HpYBarT00NBZWhrwOXpdRPYLOYHKVU3Rl+FA9xDw/wYfoWvrr+JSfHRGn/ENMmQFEdckAbPauKaQMrZD2kz+PRrhq56eWnCuVQPcaz/jroVT8qQEgkg2IsNy+DwfLOIqm8IySEpxnQ5wN/KvsQJc2wXDQNf9F5kvWwjoqSSP0qJS+oPRXET+zJb+WTk2y5M6AYoC9NodwsC4NwIDAQAB";
-        string BrhCode = "039001";
+        string BoxRequestUrl = "https://openapi-test.iboxpay.com";
+        string BoxAppId = "AP7175619323825451008";
+        string BoxAppSecret = "hUfR53gdjyfiZTBR5bILanMqRD1dXD7y";
+        string BoxPublicKey = "";
+        string BrhCode = "030145";
 
         //生产环境
         // string BoxRequestUrl = "";

Util/Main/MerchantAddInfoUtil.cs

@@ -76,7 +76,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 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)
         {
             Dictionary<string, object> Fields = new Dictionary<string, object>();
             Fields.Add("ContactName", ContactName); //管理员姓名
@@ -119,23 +121,23 @@ namespace MySystem
             Fields.Add("UpdateMan", AlipayMccCode);
             Fields.Add("ChannelKind", ChannelKind); //商户类型 有执照填000002无执照填000001
             Fields.Add("SalesScenesType", SalesScenesType); //经营范围 参考经营范围表
-            Fields.Add("OpenAccountLicenses", OpenAccountLicenses); //开户许可证
-            Fields.Add("RentAgreement", RentAgreement); //租赁协议
-            Fields.Add("OperatorMcht", OperatorMcht); //盒伙人商户合影
-            Fields.Add("AgentProtocol", AgentProtocol); //委托结算协议
-            Fields.Add("SignaturePicture", SignaturePicture); //商户签名图片
-            Fields.Add("Support", Support); //辅助照片
+            Fields.Add("OpenAccountLicenses", OpenAccountLicenses); //开户许可证(对公凭证)
+            // Fields.Add("RentAgreement", RentAgreement); //租赁协议
+            // Fields.Add("OperatorMcht", OperatorMcht); //盒伙人商户合影
+            // Fields.Add("AgentProtocol", AgentProtocol); //委托结算协议
+            // Fields.Add("SignaturePicture", SignaturePicture); //商户签名图片
+            // Fields.Add("Support", Support); //辅助照片
             Fields.Add("CheckstandImg", CheckstandImg); //收银台
-            Fields.Add("ProductImg", ProductImg); //商品照片
-            Fields.Add("Agreement", Agreement); //合同签名
-            Fields.Add("TaxImage", TaxImage); //税务登记证
-            Fields.Add("OrganizationCopy", OrganizationCopy); //组织机构证照片
-            Fields.Add("IndustryLicense1", IndustryLicense1); //行业许可证
-            Fields.Add("FaceRecognition", FaceRecognition); //正面人像图片
-            Fields.Add("Extra1", Extra1); //补充资料
+            // Fields.Add("ProductImg", ProductImg); //商品照片
+            // Fields.Add("Agreement", Agreement); //合同签名
+            // Fields.Add("TaxImage", TaxImage); //税务登记证
+            // Fields.Add("OrganizationCopy", OrganizationCopy); //组织机构证照片
+            // Fields.Add("IndustryLicense1", IndustryLicense1); //行业许可证
+            // Fields.Add("FaceRecognition", FaceRecognition); //正面人像图片
+            // Fields.Add("Extra1", Extra1); //补充资料
             Fields.Add("BankCard", BankCard); //银行卡照片
             Fields.Add("PersonWithIdCard", PersonWithIdCard); //手持身份证
-            Fields.Add("TakeCreditCard", TakeCreditCard); //拍卡
+            // Fields.Add("TakeCreditCard", TakeCreditCard); //拍卡
             Fields.Add("MchtNo", MchtNo); //收款商户号
             var info = MerchantAddInfoService.Edit(Fields, Id);
             return info;