暂存

Areas/Api/Controllers/Main/MerchantAddInfoController.cs

@@ -104,6 +104,10 @@ namespace MySystem.Areas.Api.Controllers.v1
             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 MchtNo = data["MchtNo"].ToString(); //收款商户号
 
             int Finish = int.Parse(function.CheckInt(data["Finish"].ToString()));
             int UserId = int.Parse(function.CheckInt(data["UserId"].ToString()));
@@ -128,7 +132,7 @@ 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);
+            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);
 
             var merchant = MerchantInfoService.Query(query.Id);
             if (merchant.Id == 0)
@@ -141,14 +145,12 @@ namespace MySystem.Areas.Api.Controllers.v1
 
             if (Finish == 1)
             {
-                merchant.Sort = 1;
                 Dictionary<string, object> Fiel = new Dictionary<string, object>();
                 Fiel.Add("Sort", 1);
                 MerchantInfoService.Edit(Fiel, merchant.Id);
                 // 如果提交完整资料，则发送到BsServer执行进件操作
                 RedisDbconn.Instance.AddList("MerchantConfirmQueue", "{\"MerchantId\":\"" + merchant.Id + "\"}");
             }
-            maindb.SaveChanges();
             Obj.Add("Id", MerchantAddInfoId); //Id
             return new AppResultJson() { Status = "1", Info = "", Data = Obj };
         }

Models/Main/MerchantAddInfo.cs

@@ -122,5 +122,8 @@ namespace MySystem.Models.Main
         public string RentAgreement { get; set; }
         public string OpenAccountLicenses { get; set; }
         public string ChannelKind { get; set; }
+        public string TakeCreditCard { get; set; }
+        public string BankCard { get; set; }
+        public string PersonWithIdCard { get; set; }
     }
 }

Models/Main/MerchantInfo.cs

@@ -41,5 +41,6 @@ namespace MySystem.Models.Main
         public decimal TotalActActual { get; set; }
         public decimal TotalActAmount { get; set; }
         public int ActStat { get; set; }
+        public DateTime? SignDate { get; set; }
     }
 }

Models/Main/UsersTmp.cs

@@ -0,0 +1,98 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models.Main
+{
+    public partial class UsersTmp
+    {
+        public int Id { get; set; }
+        public int Sort { get; set; }
+        public int QueryCount { get; set; }
+        public int Status { get; set; }
+        public int Version { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public string CreateMan { get; set; }
+        public string UpdateMan { get; set; }
+        public string SeoTitle { get; set; }
+        public string SeoKeyword { get; set; }
+        public string SeoDescription { get; set; }
+        public string AgentAreas { get; set; }
+        public int AgentLevel { get; set; }
+        public string SettleBankCardName { get; set; }
+        public DateTime? CertValidEndDate { get; set; }
+        public DateTime? CertValidStartDate { get; set; }
+        public DateTime? CitySetDate { get; set; }
+        public decimal ProfitRewardRate { get; set; }
+        public decimal ActiveRewardAmount { get; set; }
+        public decimal CashFreezeAmt { get; set; }
+        public decimal SettleAmount { get; set; }
+        public string MakerCode { get; set; }
+        public string HandPwd { get; set; }
+        public string Remark { get; set; }
+        public string BankCardPositiveImage { get; set; }
+        public string HandCertImage { get; set; }
+        public string CertReverseImage { get; set; }
+        public string CertFrontImage { get; set; }
+        public string DeviceToken { get; set; }
+        public string DeviceId { get; set; }
+        public DateTime? ExpiredDate { get; set; }
+        public string AccessToken { get; set; }
+        public string SettleRemark { get; set; }
+        public string RreezeRemark { get; set; }
+        public string RiskRemark { get; set; }
+        public ulong RiskFlag { get; set; }
+        public DateTime? AuthDate { get; set; }
+        public ulong AuthFlag { get; set; }
+        public ulong LockStatus { get; set; }
+        public int AuditStatus { get; set; }
+        public int LoginStatus { get; set; }
+        public DateTime? MerchantDate { get; set; }
+        public int MerchantType { get; set; }
+        public int UserProperty { get; set; }
+        public int UserType { get; set; }
+        public string SignImgUrl { get; set; }
+        public string ReferenceQrCode { get; set; }
+        public string CardRecCode { get; set; }
+        public int ReferralUserId { get; set; }
+        public string ReferenceCode { get; set; }
+        public string SettleBankName { get; set; }
+        public string SettleBankCardNo { get; set; }
+        public string IdCardEndNo { get; set; }
+        public ulong IsNewUser { get; set; }
+        public string AlipayUserId { get; set; }
+        public string OpenId { get; set; }
+        public string CarIds { get; set; }
+        public string PayPwd { get; set; }
+        public string LoginPwd { get; set; }
+        public string ParentNav { get; set; }
+        public string Tags { get; set; }
+        public string GroupId { get; set; }
+        public string Mobile { get; set; }
+        public string CardNo { get; set; }
+        public int UserLevel { get; set; }
+        public int ParentUserId { get; set; }
+        public string HeadPhoto { get; set; }
+        public string Address { get; set; }
+        public string Areas { get; set; }
+        public string CertId { get; set; }
+        public int Sex { get; set; }
+        public string RealName { get; set; }
+        public string NickName { get; set; }
+        public int CashStatus { get; set; }
+        public string CashNote { get; set; }
+        public decimal ThisMonthTrade { get; set; }
+        public int LeaderLevel { get; set; }
+        public int BusinessFlag { get; set; }
+        public decimal ValidAmount { get; set; }
+        public string DeviceType { get; set; }
+        public DateTime? HelpProfitAgreeDate { get; set; }
+        public ulong HelpProfitAgree { get; set; }
+        public string SignPic { get; set; }
+        public DateTime? SignDate { get; set; }
+        public ulong IsSign { get; set; }
+        public DateTime? CreateStoreDate { get; set; }
+        public int StoreStock { get; set; }
+        public int ThisMonthSend { get; set; }
+    }
+}

Models/Main/WebCMSEntities.cs

@@ -263,6 +263,7 @@ namespace MySystem.Models.Main
         public virtual DbSet<UserTradeDaySummary> UserTradeDaySummary { get; set; }
         public virtual DbSet<UserTradeMonthSummary> UserTradeMonthSummary { get; set; }
         public virtual DbSet<Users> Users { get; set; }
+        public virtual DbSet<UsersTmp> UsersTmp { get; set; }
 
         protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
         {
@@ -5043,6 +5044,12 @@ namespace MySystem.Models.Main
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.BankCard)
+                    .HasColumnType("varchar(200)")
+                    .HasComment("收款人银行卡照片")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
                 entity.Property(e => e.BankName)
                     .HasColumnType("varchar(50)")
                     .HasCharSet("utf8")
@@ -5306,6 +5313,12 @@ namespace MySystem.Models.Main
 
                 entity.Property(e => e.PeriodEnd).HasColumnType("datetime");
 
+                entity.Property(e => e.PersonWithIdCard)
+                    .HasColumnType("varchar(200)")
+                    .HasComment("法人手持身份证正面")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
                 entity.Property(e => e.ProductImg)
                     .HasColumnName("productImg")
                     .HasColumnType("varchar(200)")
@@ -5412,6 +5425,12 @@ namespace MySystem.Models.Main
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.TakeCreditCard)
+                    .HasColumnType("varchar(200)")
+                    .HasComment("拍卡")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
                 entity.Property(e => e.TaxImage)
                     .HasColumnName("taxImage")
                     .HasColumnType("varchar(200)")
@@ -6221,6 +6240,10 @@ namespace MySystem.Models.Main
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.SignDate)
+                    .HasColumnType("datetime")
+                    .HasComment("微信确认签约时间");
+
                 entity.Property(e => e.Sort).HasColumnType("int(11)");
 
                 entity.Property(e => e.Status).HasColumnType("int(11)");
@@ -18226,6 +18249,337 @@ namespace MySystem.Models.Main
                 entity.Property(e => e.Version).HasColumnType("int(11)");
             });
 
+            modelBuilder.Entity<UsersTmp>(entity =>
+            {
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.AccessToken)
+                    .HasColumnType("varchar(64)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.ActiveRewardAmount).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.Address)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.AgentAreas)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.AgentLevel).HasColumnType("int(11)");
+
+                entity.Property(e => e.AlipayUserId)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Areas)
+                    .HasColumnType("varchar(30)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.AuditStatus).HasColumnType("int(11)");
+
+                entity.Property(e => e.AuthDate).HasColumnType("datetime");
+
+                entity.Property(e => e.AuthFlag)
+                    .HasColumnType("bit(1)")
+                    .HasDefaultValueSql("b'0'");
+
+                entity.Property(e => e.BankCardPositiveImage)
+                    .HasColumnType("varchar(200)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.BusinessFlag).HasColumnType("int(11)");
+
+                entity.Property(e => e.CarIds)
+                    .HasColumnType("varchar(100)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.CardNo)
+                    .HasColumnType("varchar(30)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.CardRecCode)
+                    .HasColumnType("varchar(200)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.CashFreezeAmt).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.CashNote)
+                    .HasColumnType("varchar(200)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.CashStatus).HasColumnType("int(11)");
+
+                entity.Property(e => e.CertFrontImage)
+                    .HasColumnType("varchar(200)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.CertId)
+                    .HasColumnType("varchar(30)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.CertReverseImage)
+                    .HasColumnType("varchar(200)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.CertValidEndDate).HasColumnType("datetime");
+
+                entity.Property(e => e.CertValidStartDate).HasColumnType("datetime");
+
+                entity.Property(e => e.CitySetDate).HasColumnType("datetime");
+
+                entity.Property(e => e.CreateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.CreateMan)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.CreateStoreDate).HasColumnType("datetime");
+
+                entity.Property(e => e.DeviceId)
+                    .HasColumnType("varchar(128)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.DeviceToken)
+                    .HasColumnType("varchar(64)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.DeviceType)
+                    .HasColumnType("varchar(30)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.ExpiredDate).HasColumnType("datetime");
+
+                entity.Property(e => e.GroupId)
+                    .HasColumnType("varchar(200)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.HandCertImage)
+                    .HasColumnType("varchar(200)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.HandPwd)
+                    .HasColumnType("varchar(32)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.HeadPhoto)
+                    .HasColumnType("varchar(2000)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.HelpProfitAgree)
+                    .HasColumnType("bit(1)")
+                    .HasDefaultValueSql("b'0'");
+
+                entity.Property(e => e.HelpProfitAgreeDate).HasColumnType("datetime");
+
+                entity.Property(e => e.IdCardEndNo)
+                    .HasColumnType("varchar(4)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.IsNewUser)
+                    .HasColumnType("bit(1)")
+                    .HasDefaultValueSql("b'0'");
+
+                entity.Property(e => e.IsSign)
+                    .HasColumnType("bit(1)")
+                    .HasDefaultValueSql("b'0'");
+
+                entity.Property(e => e.LeaderLevel).HasColumnType("int(11)");
+
+                entity.Property(e => e.LockStatus)
+                    .HasColumnType("bit(1)")
+                    .HasDefaultValueSql("b'0'");
+
+                entity.Property(e => e.LoginPwd)
+                    .HasColumnType("varchar(32)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.LoginStatus).HasColumnType("int(11)");
+
+                entity.Property(e => e.MakerCode)
+                    .HasColumnType("varchar(32)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.MerchantDate).HasColumnType("datetime");
+
+                entity.Property(e => e.MerchantType).HasColumnType("int(11)");
+
+                entity.Property(e => e.Mobile)
+                    .HasColumnType("varchar(15)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.NickName)
+                    .HasColumnType("varchar(300)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.OpenId)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.ParentNav)
+                    .HasColumnType("longtext")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.ParentUserId).HasColumnType("int(11)");
+
+                entity.Property(e => e.PayPwd)
+                    .HasColumnType("varchar(32)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.ProfitRewardRate).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.QueryCount).HasColumnType("int(11)");
+
+                entity.Property(e => e.RealName)
+                    .HasColumnType("varchar(30)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.ReferenceCode)
+                    .HasColumnType("varchar(200)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.ReferenceQrCode)
+                    .HasColumnType("varchar(200)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.ReferralUserId).HasColumnType("int(11)");
+
+                entity.Property(e => e.Remark)
+                    .HasColumnType("mediumtext")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.RiskFlag)
+                    .HasColumnType("bit(1)")
+                    .HasDefaultValueSql("b'0'");
+
+                entity.Property(e => e.RiskRemark)
+                    .HasColumnType("varchar(64)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.RreezeRemark)
+                    .HasColumnType("varchar(64)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoDescription)
+                    .HasColumnType("varchar(500)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoKeyword)
+                    .HasColumnType("varchar(200)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoTitle)
+                    .HasColumnType("varchar(100)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SettleAmount).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.SettleBankCardName)
+                    .HasColumnType("varchar(20)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SettleBankCardNo)
+                    .HasColumnType("varchar(32)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SettleBankName)
+                    .HasColumnType("varchar(32)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SettleRemark)
+                    .HasColumnType("varchar(64)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Sex).HasColumnType("int(11)");
+
+                entity.Property(e => e.SignDate).HasColumnType("datetime");
+
+                entity.Property(e => e.SignImgUrl)
+                    .HasColumnType("varchar(200)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SignPic)
+                    .HasColumnType("varchar(200)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Sort).HasColumnType("int(11)");
+
+                entity.Property(e => e.Status).HasColumnType("int(11)");
+
+                entity.Property(e => e.StoreStock).HasColumnType("int(11)");
+
+                entity.Property(e => e.Tags)
+                    .HasColumnType("varchar(200)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.ThisMonthSend).HasColumnType("int(11)");
+
+                entity.Property(e => e.ThisMonthTrade).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.UpdateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.UpdateMan)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.UserLevel).HasColumnType("int(11)");
+
+                entity.Property(e => e.UserProperty).HasColumnType("int(11)");
+
+                entity.Property(e => e.UserType).HasColumnType("int(11)");
+
+                entity.Property(e => e.ValidAmount).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.Version).HasColumnType("int(11)");
+            });
+
             OnModelCreatingPartial(modelBuilder);
         }
 

Util/Main/MerchantAddInfoUtil.cs

@@ -71,8 +71,12 @@ namespace MySystem
         /// <param name="IndustryLicense1">行业许可证</param>
         /// <param name="FaceRecognition">正面人像图片</param>
         /// <param name="Extra1">补充资料</param>
+        /// <param name="BankCard">银行卡照片</param>
+        /// <param name="PersonWithIdCard">手持身份证</param>
+        /// <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)
+        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)
         {
             Dictionary<string, object> Fields = new Dictionary<string, object>();
             Fields.Add("ContactName", ContactName); //管理员姓名
@@ -129,6 +133,10 @@ namespace MySystem
             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("MchtNo", MchtNo); //收款商户号
             var info = MerchantAddInfoService.Edit(Fields, Id);
             return info;
         }