暂存

Areas/Api/Controllers/Main/MerchantAddInfoController.cs

@@ -88,6 +88,7 @@ namespace MySystem.Areas.Api.Controllers.v1
 
             //new add parameters:
             string ChannelKind = data["ChannelKind"].ToString(); //商户类型 有执照填000002无执照填000001
+            string ResserveMobile = data["ResserveMobile"].ToString(); //银行预留手机号 channelkind为000001时必填
             string SalesScenesType = data["SalesScenesType"].ToString(); //经营范围 参考经营范围表
             string OpenAccountLicenses = data["OpenAccountLicenses"].ToString(); //开户许可证(对公凭证)
             // string RentAgreement = data["RentAgreement"].ToString(); //租赁协议
@@ -291,7 +292,7 @@ namespace MySystem.Areas.Api.Controllers.v1
         {
             Dictionary<string, string> dic = new Dictionary<string, string>();
             dic.Add("SUBJECT_TYPE_INDIVIDUAL", "个体工商户");
-            dic.Add("SUBJECT_TYPE_ENTERPRISE", "企业");
+            dic.Add("SUBJECT_TYPE_ENTERPRISE", "企业公司");
             dic.Add("SUBJECT_TYPE_SMALL", "小微商户");
             // dic.Add("SUBJECT_TYPE_INSTITUTIONS", "党政、机关及事业单位");
             // dic.Add("SUBJECT_TYPE_OTHERS", "其他组织");

Models/Main/HaoDaAreaCode.cs

@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models.Main
+{
+    public partial class HaoDaAreaCode
+    {
+        public string CityName { get; set; }
+        public string CityCode { get; set; }
+    }
+}

Models/Main/MerchantAddInfo.cs

@@ -125,5 +125,18 @@ namespace MySystem.Models.Main
         public string TakeCreditCard { get; set; }
         public string BankCard { get; set; }
         public string PersonWithIdCard { get; set; }
+        public string BusinessId { get; set; }
+        public string AreaNo { get; set; }
+        public string OpenUnionNo { get; set; }
+        public string OpenCollectBankCode { get; set; }
+        public string OpenBankRegionCode { get; set; }
+        public string OpenBankAccout { get; set; }
+        public string OpenBankAccName { get; set; }
+        public string ZbankRegionCode { get; set; }
+        public string ZbankNo { get; set; }
+        public string AccountType { get; set; }
+        public string LicenceType { get; set; }
+        public string ResserveMobile { get; set; }
+        public string MchtNo { get; set; }
     }
 }

Models/Main/WebCMSEntities.cs

@@ -53,6 +53,7 @@ namespace MySystem.Models.Main
         public virtual DbSet<FileUpdateInfo> FileUpdateInfo { get; set; }
         public virtual DbSet<FluxProfitDetail> FluxProfitDetail { get; set; }
         public virtual DbSet<FluxProfitSummary> FluxProfitSummary { get; set; }
+        public virtual DbSet<HaoDaAreaCode> HaoDaAreaCode { get; set; }
         public virtual DbSet<HelpProfitAccountRecord> HelpProfitAccountRecord { get; set; }
         public virtual DbSet<HelpProfitAmountSummary> HelpProfitAmountSummary { get; set; }
         public virtual DbSet<HelpProfitExchange> HelpProfitExchange { get; set; }
@@ -3079,6 +3080,26 @@ namespace MySystem.Models.Main
                 entity.Property(e => e.Version).HasColumnType("int(11)");
             });
 
+            modelBuilder.Entity<HaoDaAreaCode>(entity =>
+            {
+                entity.HasKey(e => e.CityName)
+                    .HasName("PRIMARY");
+
+                entity.HasComment("好哒地区编码");
+
+                entity.Property(e => e.CityName)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("城市名称")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.CityCode)
+                    .HasColumnType("varchar(20)")
+                    .HasComment("城市区域编码")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+            });
+
             modelBuilder.Entity<HelpProfitAccountRecord>(entity =>
             {
                 entity.Property(e => e.Id).HasColumnType("int(11)");
@@ -5068,6 +5089,12 @@ namespace MySystem.Models.Main
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.AccountType)
+                    .HasColumnType("varchar(10)")
+                    .HasComment("账户类型")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
                 entity.Property(e => e.ActivitiesId)
                     .HasColumnType("varchar(32)")
                     .HasCharSet("utf8")
@@ -5158,6 +5185,12 @@ namespace MySystem.Models.Main
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.AreaNo)
+                    .HasColumnType("varchar(20)")
+                    .HasComment("经营地区区域码")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
                 entity.Property(e => e.AuditDetail)
                     .HasColumnType("mediumtext")
                     .HasCharSet("utf8")
@@ -5214,6 +5247,12 @@ namespace MySystem.Models.Main
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.BusinessId)
+                    .HasColumnType("varchar(20)")
+                    .HasComment("经营范围")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
                 entity.Property(e => e.CardPeriodBegin).HasColumnType("datetime");
 
                 entity.Property(e => e.CardPeriodEnd).HasColumnType("datetime");
@@ -5356,6 +5395,12 @@ namespace MySystem.Models.Main
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.LicenceType)
+                    .HasColumnType("varchar(10)")
+                    .HasComment("营业执照类型")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
                 entity.Property(e => e.LicenseCopy)
                     .HasColumnType("varchar(200)")
                     .HasCharSet("utf8")
@@ -5366,6 +5411,12 @@ namespace MySystem.Models.Main
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.MchtNo)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("好哒商户号")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
                 entity.Property(e => e.MerchantShortname)
                     .HasColumnType("varchar(50)")
                     .HasCharSet("utf8")
@@ -5413,11 +5464,41 @@ namespace MySystem.Models.Main
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.OpenBankAccName)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("开户许可证-开户名")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.OpenBankAccout)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("开户许可证-银行卡号")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.OpenBankRegionCode)
+                    .HasColumnType("varchar(20)")
+                    .HasComment("开户许可证-银行地区码")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.OpenCollectBankCode)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("开户许可证-银行代码")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
                 entity.Property(e => e.OpenId)
                     .HasColumnType("varchar(50)")
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.OpenUnionNo)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("开户许可证-开户支行")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
                 entity.Property(e => e.OperatorMcht)
                     .HasColumnName("operatorMcht")
                     .HasColumnType("varchar(200)")
@@ -5479,6 +5560,12 @@ namespace MySystem.Models.Main
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.ResserveMobile)
+                    .HasColumnType("varchar(11)")
+                    .HasComment("银行预留手机号")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
                 entity.Property(e => e.SalesScenesType)
                     .HasColumnType("varchar(50)")
                     .HasCharSet("utf8")
@@ -5644,6 +5731,19 @@ namespace MySystem.Models.Main
                     .HasColumnType("varchar(200)")
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.ZbankNo)
+                    .HasColumnName("ZBankNo")
+                    .HasColumnType("varchar(50)")
+                    .HasComment("开户银行支行号")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.ZbankRegionCode)
+                    .HasColumnType("varchar(20)")
+                    .HasComment("开户银行支行区域码")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
             });
 
             modelBuilder.Entity<MerchantAdmin>(entity =>

Util/HaoDa/HaoDaHelper.cs

@@ -21,19 +21,19 @@ namespace MySystem
         #region 盒易付
 
         //测试环境
+        // string BoxRequestUrl = "https://openapi-test.iboxpay.com";
+        // string BoxAppId = "AT7317781468267548672";
+        // string BoxAppSecret = "OfWuHQdhQfnE8NaF4xdtgk4B9CYqnbri";
+        // string BoxPublicKey = "";
+        // string BrhCode = "001040";
+
+        //生产环境
         string BoxRequestUrl = "https://openapi-test.iboxpay.com";
         string BoxAppId = "AP7175619323825451008";
         string BoxAppSecret = "hUfR53gdjyfiZTBR5bILanMqRD1dXD7y";
         string BoxPublicKey = "";
         string BrhCode = "030145";
 
-        //生产环境
-        // string BoxRequestUrl = "";
-        // string BoxAppId = "";
-        // string BoxAppSecret = "";
-        // string BoxPublicKey = "";
-        // string BrhCode = "";
-
         public string BoxServiceFee(string SnList, string ServiceFee)
         {
             function.WriteLog(DateTime.Now.ToString(), "设置盒易付机具服务费");
@@ -290,7 +290,7 @@ namespace MySystem
             return ret;
         }
 
-        
+
         /// <summary>
         /// 微信公众号和小程序支付接口
         /// </summary>