暂存

Entity/HaoDa/AddNewMerchant.cs

@@ -30,7 +30,7 @@ namespace MySystem
         public string areaNo { get; set; }//经营地区区域码 参考区域码表，填6位地区码（联系对接人提供）
         public string businessId { get; set; }//经营范围 参考经营范围表（联系对接人提供）
         public string licNo { get; set; }//营业执照号 有营业执照必填
-        public string usinessTerm { get; set; }//营业执照有效期 格式：20200101-20300101，长期的填 20200101-99991231
+        public string businessTerm { get; set; }//营业执照有效期 格式：20200101-20300101，长期的填 20200101-99991231
         public string licenceType { get; set; }//营业执照类型 0-企业法人营业执照 1-个体工商户营业执照 2-党政，机关及事业单位 3-其他组织
         public string userCardNo { get; set; }//商户法人身份证号
         public string userPhone { get; set; }//法人手机号

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 =>

Startup.cs

@@ -131,6 +131,7 @@ namespace MySystem
 
             initMainServer();
             MerchantConfirmService.Instance.Start(); //提交商户进件
+            CheckWeChatSignService.Instance.Start(); //查询商户审核状态
         }
 
         //初始化数据结构

Util/HaoDa/AddNewMerchantSetUtil.cs

@@ -19,21 +19,33 @@ namespace MySystem
         public static AddNewMerchant SetValue(MerchantAddInfo AddInfo)
         {
             AddNewMerchant addNewMerchant = new AddNewMerchant();
-            addNewMerchant.brh = "030145"; //机构号
-            addNewMerchant.mchtNo = AddInfo.SubMchid; //收款商户号
-            addNewMerchant.accountNo = AddInfo.AccountNumber; //银行卡号
-            addNewMerchant.accountName = AddInfo.AccountName; //开户名（账户名称）
-            addNewMerchant.accountType = AddInfo.BankAccountType; //账户类型 1 对私 0 对公
-            addNewMerchant.zbankNo = AddInfo.BankBranchId; //开户银行支行号 参考支行号表（联系对接人提供）
-            addNewMerchant.zbankRegionCode = AddInfo.BankAddressCode; //开户银行支行区域码 参考区域码表（联系对接人提供）
-            if (AddInfo.SubjectType == "0")
+            // addNewMerchant.brh = "001040"; //机构号(测试)
+            // addNewMerchant.brh = "030145"; //机构号(正式)
+            addNewMerchant.brh = HaoDaHelper.BrhCode; //机构号(正式)
+            if (!string.IsNullOrEmpty(AddInfo.MchtNo))
             {
-                addNewMerchant.openBankAccName = AddInfo.AccountBank; //开户许可证-开户名 企业商户必填(个体工商户对私不填)
-                addNewMerchant.openBankAccout = AddInfo.AccountNumber; //开户许可证-银行卡号 企业商户必填(个体工商户对私不填)
-                addNewMerchant.openBankRegionCode = AddInfo.BankAddressCode; //开户许可证-银行地区码 企业商户必填(个体工商户对私不填)
-                addNewMerchant.openCollectBankCode = AddInfo.BankBranchId; //开户许可证-银行代码 企业商户必填(个体工商户对私不填)
-                addNewMerchant.openUnionNo = AddInfo.BankName; //开户许可证-开户支行 企业商户必填(个体工商户对私不填)
+                addNewMerchant.mchtNo = AddInfo.MchtNo; //收款商户号
             }
+            addNewMerchant.accountNo = AddInfo.AccountNumber; //银行卡号
+            addNewMerchant.accountName = AddInfo.AccountName; //开户名（账户名称）
+            addNewMerchant.accountType = AddInfo.AccountType; //账户类型 1 对私 0 对公
+            addNewMerchant.zbankNo = AddInfo.ZbankNo; //开户银行支行号 参考支行号表（联系对接人提供）
+            addNewMerchant.zbankRegionCode = AddInfo.ZbankRegionCode; //开户银行支行区域码 参考区域码表（联系对接人提供）
+            // if (AddInfo.SubjectType == "0")
+            // {
+            //     addNewMerchant.openBankAccName = AddInfo.OpenBankAccName; //开户许可证-开户名 企业商户必填(个体工商户对私不填)
+            //     addNewMerchant.openBankAccout = AddInfo.OpenBankAccout; //开户许可证-银行卡号 企业商户必填(个体工商户对私不填)
+            //     addNewMerchant.openBankRegionCode = AddInfo.OpenBankRegionCode; //开户许可证-银行地区码 企业商户必填(个体工商户对私不填)
+            //     addNewMerchant.openCollectBankCode = AddInfo.OpenCollectBankCode; //开户许可证-银行代码 企业商户必填(个体工商户对私不填)
+            //     addNewMerchant.openUnionNo = AddInfo.OpenUnionNo; //开户许可证-开户支行 企业商户必填(个体工商户对私不填)
+            // }
+
+            addNewMerchant.openBankAccName = AddInfo.OpenBankAccName; //开户许可证-开户名 企业商户必填(个体工商户对私不填)
+            addNewMerchant.openBankAccout = AddInfo.AccountNumber; //开户许可证-银行卡号 企业商户必填(个体工商户对私不填)
+            addNewMerchant.openBankRegionCode = AddInfo.OpenBankRegionCode; //开户许可证-银行地区码 企业商户必填(个体工商户对私不填)
+            addNewMerchant.openCollectBankCode = AddInfo.OpenCollectBankCode; //开户许可证-银行代码 企业商户必填(个体工商户对私不填)
+            addNewMerchant.openUnionNo = AddInfo.OpenUnionNo; //开户许可证-开户支行 企业商户必填(个体工商户对私不填)
+
             addNewMerchant.channelKind = AddInfo.ChannelKind; //商户类型 有执照填000002无执照填000001
             addNewMerchant.mchtName = AddInfo.CertMerchantName; //商户名称 无营业执照商户命名规则：商户_姓名 有营业执照商户命名规则：与营业执照商户名一致
             addNewMerchant.mchtCnShortName = AddInfo.MerchantShortname; //商户简称
@@ -41,16 +53,17 @@ namespace MySystem
             addNewMerchant.alipayRate = "0.38"; //支付宝费率，值0.38，0.33等
             addNewMerchant.wechatPayRate = "0.38"; //微信费率，值0.38，0.33等
             addNewMerchant.unionPayRate = "0.38"; //银联二维码费率，值0.38，0.33等
-            addNewMerchant.areaNo = AddInfo.BizAddressCode; //经营地区区域码 参考区域码表，填6位地区码（联系对接人提供）
-            addNewMerchant.businessId = AddInfo.SalesScenesType; //经营范围 参考经营范围表（联系对接人提供）
+            addNewMerchant.areaNo = AddInfo.AreaNo; //经营地区区域码 参考区域码表，填6位地区码（联系对接人提供）
+            addNewMerchant.businessId = AddInfo.BusinessId; //经营范围 参考经营范围表（联系对接人提供）
             addNewMerchant.licNo = AddInfo.LicenseNumber; //营业执照号 有营业执照必填
-            addNewMerchant.usinessTerm = AddInfo.PeriodBegin.Value.ToString("yyyyMMdd") + "-" + AddInfo.PeriodEnd.Value.ToString("yyyyMMdd"); //营业执照有效期 格式：20200101-20300101，长期的填 20200101-99991231
-            addNewMerchant.licenceType = AddInfo.SubjectType; //营业执照类型 0-企业法人营业执照 1-个体工商户营业执照 2-党政，机关及事业单位 3-其他组织
+            addNewMerchant.businessTerm = AddInfo.PeriodBegin.Value.ToString("yyyyMMdd") + "-" + AddInfo.PeriodEnd.Value.ToString("yyyyMMdd"); //营业执照有效期 格式：20200101-20300101，长期的填 20200101-99991231
+            addNewMerchant.licenceType = AddInfo.LicenceType; //营业执照类型 0-企业法人营业执照 1-个体工商户营业执照 2-党政，机关及事业单位 3-其他组织
             addNewMerchant.userCardNo = AddInfo.IdCardNumber; //商户法人身份证号
             addNewMerchant.userPhone = AddInfo.MobilePhone; //法人手机号
+
             if (AddInfo.ChannelKind == "000001")
             {
-                addNewMerchant.resserveMobile = AddInfo.MobilePhone; //银行预留手机号 channelkind为000001时必填
+                addNewMerchant.resserveMobile = AddInfo.ResserveMobile; //银行预留手机号 channelkind为000001时必填
             }
             addNewMerchant.userName = AddInfo.CertLegalPerson; //商户法人姓名
             if (AddInfo.CardPeriodEnd.Value.Year == 2050)
@@ -70,7 +83,6 @@ namespace MySystem
                 var tokenInfo = JsonMapper.ToObject(HaoDaHelper.Instance.GetToken(AddInfo.PersonWithIdCard.Substring(AddInfo.PersonWithIdCard.LastIndexOf("/")).Trim('/'), "0"));
                 if (tokenInfo["code"].ToString() == "1")
                 {
-                    // var returnInfo = HaoDaHelper.Instance.ReturnFileName(tokenInfo["token"].ToString(), AddInfo.PersonWithIdCard.Substring(AddInfo.PersonWithIdCard.LastIndexOf("/")).Trim('/'));
                     var returnInfo = HaoDaHelper.Instance.ReturnFileName(tokenInfo["token"].ToString(), AddInfo.PersonWithIdCard);
                     if (returnInfo != "false")
                     {
@@ -81,15 +93,14 @@ namespace MySystem
                     }
                 }
             }
-            if (AddInfo.BankAccountType == "1")
+            if (AddInfo.AccountType == "1")
             {
                 //收款人银行卡照片
                 if (!string.IsNullOrEmpty(AddInfo.BankCard))
                 {
-                    var tokenInfo = JsonMapper.ToObject(HaoDaHelper.Instance.GetToken(AddInfo.BankCard.Substring(AddInfo.PersonWithIdCard.LastIndexOf("/")).Trim('/'), "0"));
+                    var tokenInfo = JsonMapper.ToObject(HaoDaHelper.Instance.GetToken(AddInfo.BankCard.Substring(AddInfo.BankCard.LastIndexOf("/")).Trim('/'), "0"));
                     if (tokenInfo["code"].ToString() == "1")
                     {
-                        // var returnInfo = HaoDaHelper.Instance.ReturnFileName(tokenInfo["token"].ToString(), AddInfo.BankCard.Substring(AddInfo.PersonWithIdCard.LastIndexOf("/")).Trim('/'));
                         var returnInfo = HaoDaHelper.Instance.ReturnFileName(tokenInfo["token"].ToString(), AddInfo.BankCard);
                         if (returnInfo != "false")
                         {
@@ -101,15 +112,48 @@ namespace MySystem
                     }
                 }
             }
-            if (AddInfo.BankAccountType == "0")
+            //身份证正面
+            if (!string.IsNullOrEmpty(AddInfo.IdCardCopy))
+            {
+                var a = AddInfo.IdCardCopy.Substring(AddInfo.IdCardCopy.LastIndexOf("/")).Trim('/');
+                var tokenInfo = JsonMapper.ToObject(HaoDaHelper.Instance.GetToken(AddInfo.IdCardCopy.Substring(AddInfo.IdCardCopy.LastIndexOf("/")).Trim('/'), "0"));
+                if (tokenInfo["code"].ToString() == "1")
+                {
+                    var returnInfo = HaoDaHelper.Instance.ReturnFileName(tokenInfo["token"].ToString(), AddInfo.IdCardCopy);
+                    if (returnInfo != "false")
+                    {
+                        imageItem = new ImageItem();
+                        imageItem.name = "idCardFront";
+                        imageItem.value = returnInfo;
+                        imageList.Add(imageItem);
+                    }
+                }
+            }
+            //身份证反面
+            if (!string.IsNullOrEmpty(AddInfo.IdCardNational))
+            {
+                var a = AddInfo.IdCardNational.Substring(AddInfo.IdCardNational.LastIndexOf("/")).Trim('/');
+                var tokenInfo = JsonMapper.ToObject(HaoDaHelper.Instance.GetToken(AddInfo.IdCardNational.Substring(AddInfo.IdCardNational.LastIndexOf("/")).Trim('/'), "0"));
+                if (tokenInfo["code"].ToString() == "1")
+                {
+                    var returnInfo = HaoDaHelper.Instance.ReturnFileName(tokenInfo["token"].ToString(), AddInfo.IdCardNational);
+                    if (returnInfo != "false")
+                    {
+                        imageItem = new ImageItem();
+                        imageItem.name = "idCardBack";
+                        imageItem.value = returnInfo;
+                        imageList.Add(imageItem);
+                    }
+                }
+            }
+            if (AddInfo.AccountType == "0")
             {
                 //开户许可证(对公凭证)
                 if (!string.IsNullOrEmpty(AddInfo.OpenAccountLicenses))
                 {
-                    var tokenInfo = JsonMapper.ToObject(HaoDaHelper.Instance.GetToken(AddInfo.OpenAccountLicenses.Substring(AddInfo.PersonWithIdCard.LastIndexOf("/")).Trim('/'), "0"));
+                    var tokenInfo = JsonMapper.ToObject(HaoDaHelper.Instance.GetToken(AddInfo.OpenAccountLicenses.Substring(AddInfo.OpenAccountLicenses.LastIndexOf("/")).Trim('/'), "0"));
                     if (tokenInfo["code"].ToString() == "1")
                     {
-                        // var returnInfo = HaoDaHelper.Instance.ReturnFileName(tokenInfo["token"].ToString(), AddInfo.OpenAccountLicenses.Substring(AddInfo.PersonWithIdCard.LastIndexOf("/")).Trim('/'));
                         var returnInfo = HaoDaHelper.Instance.ReturnFileName(tokenInfo["token"].ToString(), AddInfo.OpenAccountLicenses);
                         if (returnInfo != "false")
                         {
@@ -215,10 +259,9 @@ namespace MySystem
             //门头照
             if (!string.IsNullOrEmpty(AddInfo.StoreEntrancePic))
             {
-                var tokenInfo = JsonMapper.ToObject(HaoDaHelper.Instance.GetToken(AddInfo.StoreEntrancePic.Substring(AddInfo.PersonWithIdCard.LastIndexOf("/")).Trim('/'), "0"));
+                var tokenInfo = JsonMapper.ToObject(HaoDaHelper.Instance.GetToken(AddInfo.StoreEntrancePic.Substring(AddInfo.StoreEntrancePic.LastIndexOf("/")).Trim('/'), "0"));
                 if (tokenInfo["code"].ToString() == "1")
                 {
-                    // var returnInfo = HaoDaHelper.Instance.ReturnFileName(tokenInfo["token"].ToString(), AddInfo.StoreEntrancePic.Substring(AddInfo.PersonWithIdCard.LastIndexOf("/")).Trim('/'));
                     var returnInfo = HaoDaHelper.Instance.ReturnFileName(tokenInfo["token"].ToString(), AddInfo.StoreEntrancePic);
                     if (returnInfo != "false")
                     {
@@ -232,10 +275,9 @@ namespace MySystem
             //收银台
             if (!string.IsNullOrEmpty(AddInfo.CheckstandImg))
             {
-                var tokenInfo = JsonMapper.ToObject(HaoDaHelper.Instance.GetToken(AddInfo.CheckstandImg.Substring(AddInfo.PersonWithIdCard.LastIndexOf("/")).Trim('/'), "0"));
+                var tokenInfo = JsonMapper.ToObject(HaoDaHelper.Instance.GetToken(AddInfo.CheckstandImg.Substring(AddInfo.CheckstandImg.LastIndexOf("/")).Trim('/'), "0"));
                 if (tokenInfo["code"].ToString() == "1")
                 {
-                    // var returnInfo = HaoDaHelper.Instance.ReturnFileName(tokenInfo["token"].ToString(), AddInfo.CheckstandImg.Substring(AddInfo.PersonWithIdCard.LastIndexOf("/")).Trim('/'));
                     var returnInfo = HaoDaHelper.Instance.ReturnFileName(tokenInfo["token"].ToString(), AddInfo.CheckstandImg);
                     if (returnInfo != "false")
                     {
@@ -249,10 +291,9 @@ namespace MySystem
             //店铺全景
             if (!string.IsNullOrEmpty(AddInfo.IndoorPic))
             {
-                var tokenInfo = JsonMapper.ToObject(HaoDaHelper.Instance.GetToken(AddInfo.IndoorPic.Substring(AddInfo.PersonWithIdCard.LastIndexOf("/")).Trim('/'), "0"));
+                var tokenInfo = JsonMapper.ToObject(HaoDaHelper.Instance.GetToken(AddInfo.IndoorPic.Substring(AddInfo.IndoorPic.LastIndexOf("/")).Trim('/'), "0"));
                 if (tokenInfo["code"].ToString() == "1")
                 {
-                    // var returnInfo = HaoDaHelper.Instance.ReturnFileName(tokenInfo["token"].ToString(), AddInfo.IndoorPic.Substring(AddInfo.PersonWithIdCard.LastIndexOf("/")).Trim('/'));
                     var returnInfo = HaoDaHelper.Instance.ReturnFileName(tokenInfo["token"].ToString(), AddInfo.IndoorPic);
                     if (returnInfo != "false")
                     {

Util/HaoDa/CheckWeChatSignService.cs

@@ -50,9 +50,9 @@ namespace MySystem
             {
                 var mId = int.Parse(query.MerchantId);
                 WebCMSEntities db = new WebCMSEntities();
-                var returnInfo = HaoDaHelper.Instance.QueryMerchantStatus("030145",query.MerchantNo);
+                var returnInfo = HaoDaHelper.Instance.QueryMerchantStatus(HaoDaHelper.BrhCode,query.MerchantNo);
                 JsonData dic = JsonMapper.ToObject(returnInfo);
-                if (dic["code"].ToString() == "4")
+                if (dic["data"]["code"].ToString() == "4")
                 {
                     MerchantAddInfo merchantadd = db.MerchantAddInfo.FirstOrDefault(m => m.Id == mId);
                     if (merchantadd != null)
@@ -75,7 +75,7 @@ namespace MySystem
                     }
                     return "wait";
                 }
-                else if (dic["code"].ToString() == "3")
+                else if (dic["data"]["code"].ToString() == "3")
                 {
                     MerchantAddInfo merchantadd = db.MerchantAddInfo.FirstOrDefault(m => m.Id == mId);
                     if (merchantadd != null)

Util/HaoDa/HaoDaHelper.cs

@@ -19,22 +19,21 @@ 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 = "AT7317781468267548672";
+        // string BoxAppSecret = "OfWuHQdhQfnE8NaF4xdtgk4B9CYqnbri";
+        // string BoxPublicKey = "";
+        // string BrhCode = "001040";
 
         //生产环境
-        // string BoxRequestUrl = "";
-        // string BoxAppId = "";
-        // string BoxAppSecret = "";
-        // string BoxPublicKey = "";
-        // string BrhCode = "";
+        string BoxRequestUrl = "https://openapi.iboxpay.com";
+        string BoxAppId = "AP7175619323825451008";
+        string BoxAppSecret = "hUfR53gdjyfiZTBR5bILanMqRD1dXD7y";
+        string BoxPublicKey = "";
+        public static string BrhCode = "030145";
 
 
         /// <summary>
@@ -44,6 +43,7 @@ namespace MySystem
         /// <returns></returns>
         public string AddNewMerchant(AddNewMerchant request)
         {
+            request.brh = BrhCode;
             function.WriteLog(DateTime.Now.ToString(), "好哒新创建商户");
 
             string req = Newtonsoft.Json.JsonConvert.SerializeObject(request);

Util/HaoDa/MerchantConfirmService.cs

@@ -24,28 +24,28 @@ namespace MySystem
 
         public void StartListen()
         {
-            while (true)
-            {
-                // string content = RedisDbconn.Instance.RPop<string>("MerchantConfirmQueue");
-                // if (!string.IsNullOrEmpty(content))
-                // {
-                //     try
-                //     {
-                //         JsonData jsonObj = JsonMapper.ToObject(content);
-                //         int MerchantId = int.Parse(jsonObj["MerchantId"].ToString());
-                //         StartDo(MerchantId);
-                //     }
-                //     catch (Exception ex)
-                //     {
-                //         function.WriteLog(DateTime.Now.ToString() + ":" + ex.ToString(), "好哒商户进件异常");
-                //     }
-                // }
-                // else
-                // {
-                //     Thread.Sleep(2000);
-                // }
-                StartDo(1);
-            }
+            // while (true)
+            // {
+            //     string content = RedisDbconn.Instance.RPop<string>("MerchantConfirmQueue");
+            //     if (!string.IsNullOrEmpty(content))
+            //     {
+            //         try
+            //         {
+            //             JsonData jsonObj = JsonMapper.ToObject(content);
+            //             int MerchantId = int.Parse(jsonObj["MerchantId"].ToString());
+            //             StartDo(MerchantId);
+            //         }
+            //         catch (Exception ex)
+            //         {
+            //             function.WriteLog(DateTime.Now.ToString() + ":" + ex.ToString(), "好哒商户进件异常");
+            //         }
+            //     }
+            //     else
+            //     {
+            //         Thread.Sleep(2000);
+            //     }
+            // }
+            StartDo(1);
         }
 
         public void StartDo(int MerchantId)
@@ -86,17 +86,17 @@ namespace MySystem
                     var info = AddNewMerchantSetUtil.SetValue(AddInfo);
                     string result = HaoDaHelper.Instance.AddNewMerchant(info);
                     JsonData jsonObj = JsonMapper.ToObject(result);
-                    if (jsonObj["resultCode"].ToString() == "0")
+                    if (jsonObj["resultCode"].ToString() == "1")
                     {
 
                         AddInfo.WeChatRemark = "";
-                        AddInfo.SubMchid = jsonObj["mchtNo"].ToString();
+                        AddInfo.MchtNo = jsonObj["data"]["mchtNo"].ToString();
                         AddInfo.Status = 0;
                         merchant.Status = 0;
                         db.SaveChanges();
                         QueryMerchantStatus queryMerchantStatus = new QueryMerchantStatus();
                         queryMerchantStatus.MerchantId = MerchantId.ToString();
-                        queryMerchantStatus.MerchantNo = AddInfo.SubMchid;
+                        queryMerchantStatus.MerchantNo = AddInfo.MchtNo;
                         RedisDbconn.Instance.AddList("WeChatSignQueue", queryMerchantStatus);
                     }
                     else