调整创客-首页-新增商户

Areas/Api/Controllers/Main/MerchantAddInfoController.cs

@@ -35,81 +35,123 @@ namespace MySystem.Areas.Api.Controllers.v1
         }
         public AppResultJson AddDo(string value)
         {
+            function.WriteLog(value, "创客-首页-新增商户");
+            // value = "{\"LicenseCopy\":\"/static/upload/2023/8/16/MT0bebebbf73dc38e2.png\",\"CertMerchantName\":\"门头\",\"LicenseNumber\":\"410900100013231\",\"SubjectType\":\"SUBJECT_TYPE_ENTERPRISE\",\"MerchantShortname\":\"mentou\",\"ServicePhone\":\"13308240813\",\"SalesScenesType\":62,\"MchtNo\":\"\",\"BizStoreName\":\"mentou\",\"BizAddressCode\":\"北京市,东城区\",\"BizStoreAddress\":\"四川省成都市武侯区力德时代7栋客小爽二楼\",\"IdCardCopy\":\"/static/upload/2023/8/16/MT562f81c2651ea325.png\",\"IdCardNational\":\"/static/upload/2023/8/16/MTfcce2c67986eb10a.png\",\"CertLegalPerson\":\"名字\",\"IdCardNumber\":\"51382219940929723x\",\"CardPeriodBegin\":\"2023-08-16\",\"CardPeriodEnd\":\"2050-01-01\",\"PeriodBegin\":\"2023-08-16\",\"PeriodEnd\":\"9999-12-31\",\"MobilePhone\":\"13308240813\",\"AccountName\":\"门头\",\"ChannelKind\":\"000002\",\"BankAccountType\":\"BANK_ACCOUNT_TYPE_CORPORATE\",\"AccountNumber\":\"1234567899654514\",\"AccountBank\":\"中国银行\",\"BankCard\":\"/static/upload/2023/8/16/MT001e52d37c926681.png\",\"OpenAccountLicenses\":\"/static/upload/2023/8/16/MTbd2519a719966813.png\",\"BankName\":\"中国银行上海市北京东路支行\",\"BankAddressCode\":\"北京市,东城区\",\"PersonWithIdCard\":\"/static/upload/2023/8/16/MT374848dbbd1a10fc.png\",\"StoreEntrancePic\":\"/static/upload/2023/8/16/MTc991f44f8e92523b.png\",\"IndoorPic\":\"/static/upload/2023/8/16/MTc4c21727b4d51405.png\",\"CheckstandImg\":\"/static/upload/2023/8/16/MT9c5d940e98a72f90.png\",\"Extra1\":\"/static/upload/2023/8/16/MTd2dea8cfbed28c69.png,/static/upload/2023/8/16/MTf4016b1b53a3e12e.png\",\"IndustryLicense1\":\"\",\"ResserveMobile\":\"13308240813\",\"ContactName\":\"名字\",\"ContactIdNumber\":\"51382219940929723x\",\"IdCardName\":\"名字\",\"Finish\":0,\"UserId\":\"1\",\"Id\":\"\"}";
             JsonData data = JsonMapper.ToObject(value);
-            string ContactName = data["ContactName"].ToString(); //管理员姓名
-            string ContactIdNumber = data["ContactIdNumber"].ToString(); //管理员身份证件号码
-            string MobilePhone = data["MobilePhone"].ToString(); //联系手机
-            string ContactEmail = data["ContactEmail"].ToString(); //联系邮箱
-            string SubjectType = data["SubjectType"].ToString(); //主体类型 0-企业法人营业执照 1-个体工商户营业执照
-            string LicenseCopy = data["LicenseCopy"].ToString(); //营业执照照片
-            string LicenseNumber = data["LicenseNumber"].ToString(); //统一社会信用代码
-            string CertMerchantName = data["CertMerchantName"].ToString(); //商户名称
-            string CertLegalPerson = data["CertLegalPerson"].ToString(); //法人姓名
-            string IdCardCopy = data["IdCardCopy"].ToString(); //身份证人像面照片
-            string IdCardNational = data["IdCardNational"].ToString(); //身份证国徽面照片
-            string IdCardName = data["IdCardName"].ToString(); //身份证姓名
-            string IdCardNumber = data["IdCardNumber"].ToString(); //身份证号码
-            string IdCardAddress = data["IdCardAddress"].ToString(); //身份证号码
-            string CardPeriodBeginString = data["CardPeriodBegin"].ToString();
-            if (string.IsNullOrEmpty(CardPeriodBeginString))
-            {
-                CardPeriodBeginString = "1900-01-01";
-            }
-            DateTime CardPeriodBegin = DateTime.Parse(CardPeriodBeginString); //身份证有效期开始时间
-            string CardPeriodEndString = data["CardPeriodEnd"].ToString();
-            if (string.IsNullOrEmpty(CardPeriodEndString))
-            {
-                CardPeriodEndString = "1900-01-01";
-            }
-            DateTime CardPeriodEnd = DateTime.Parse(CardPeriodEndString); //身份证有效期结束时间
-            string ServicePhone = data["ServicePhone"].ToString(); //客服电话
-            string BizStoreName = data["BizStoreName"].ToString(); //门店名称
-            string BizAddressCode = data["BizAddressCode"].ToString(); //门店省市编码
-            string BizStoreAddress = data["BizStoreAddress"].ToString(); //门店地址
-            string StoreEntrancePic = data["StoreEntrancePic"].ToString(); //门店门头照片
-            string IndoorPic = data["IndoorPic"].ToString(); //店内环境照片
-            string QualificationType = data["QualificationType"].ToString(); //所属行业
-            string SettlementId = data["SettlementId"].ToString(); //入驻结算规则ID
-            string AlipayMccCode = "";
-            if (!string.IsNullOrEmpty(SettlementId))
-            {
-                AlipayMccCode = SettlementId.Substring(SettlementId.IndexOf("_") + 1);
-                SettlementId = SettlementId.Substring(0, SettlementId.IndexOf("_"));
-            }
-            string AlipayAccount = data["AlipayAccount"].ToString(); //支付宝账号
-            string BankAccountType = data["BankAccountType"].ToString(); //账户类型 1 对私 0 对公
-            string AccountName = data["AccountName"].ToString(); //开户名称
-            string AccountBank = data["AccountBank"].ToString(); //开户银行
-            string BankAddressCode = data["BankAddressCode"].ToString(); //开户银行省市编码
-            string MerchantShortname = data["MerchantShortname"].ToString();
-            string BankName = data["BankName"].ToString(); //开户银行全称
-            string AccountNumber = data["AccountNumber"].ToString(); //银行账号
-            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 BusinessId = data["BusinessId"].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 BankCard = data["BankCard"].ToString(); //银行卡照片
-            string PersonWithIdCard = data["PersonWithIdCard"].ToString(); //手持身份证
-            // string TakeCreditCard = data["TakeCreditCard"].ToString(); //拍卡
-            string MchtNo = data["MchtNo"].ToString(); //收款商户号
+
+            string LicenseCopy = data["LicenseCopy"].ToString(); //- 营业执照
+            string CertMerchantName = data["CertMerchantName"].ToString(); //- 商户名称
+            string LicenseNumber = data["LicenseNumber"].ToString(); //- 商户信用代码
+            string SubjectType = data["SubjectType"].ToString(); //- 主体类型
+            string MerchantShortname = data["MerchantShortname"].ToString(); //- 用户名称简写
+            string ServicePhone = data["ServicePhone"].ToString(); //- 商户电话
+            string SalesScenesType = data["SalesScenesType"].ToString(); //- 所属行业
+            string MchtNo = data["MchtNo"].ToString(); // 收款商户号
+            string BizStoreName = data["BizStoreName"].ToString(); //- 门店名称
+            string BizAddressCode = data["BizAddressCode"].ToString(); //- 门店区域
+            string BizStoreAddress = data["BizStoreAddress"].ToString(); //- 门店地址
+            string IdCardCopy = data["IdCardCopy"].ToString(); //- 身份证正面
+            string IdCardNational = data["IdCardNational"].ToString(); //- 身份证反面
+            string CertLegalPerson = data["CertLegalPerson"].ToString(); //- 真实姓名
+            string IdCardNumber = data["IdCardNumber"].ToString(); //- 身份证号码
+            string CardPeriodBegin = data["CardPeriodBegin"].ToString(); //- 身份证有效期开始
+            string CardPeriodEnd = data["CardPeriodEnd"].ToString(); //- 身份证有效期结束
+            string PeriodBegin = data["PeriodBegin"].ToString(); //- 身份证有效期开始
+            string PeriodEnd = data["PeriodEnd"].ToString(); //- 身份证有效期结束
+            string MobilePhone = data["MobilePhone"].ToString(); //- 手机号码
+            string AccountName = data["AccountName"].ToString(); //- 开户名称
+            string ChannelKind = data["ChannelKind"].ToString(); // 商户类型
+            string BankAccountType = data["BankAccountType"].ToString(); //- 账户类型
+            string AccountNumber = data["AccountNumber"].ToString(); //- 银行卡号
+            string AccountBank = data["AccountBank"].ToString(); //- 开户行
+            string BankCard = data["BankCard"].ToString(); // 银行卡照片
+            string OpenAccountLicenses = data["OpenAccountLicenses"].ToString(); // 开户许可证
+            string BankName = data["BankName"].ToString(); //- 开户行全称
+            string BankAddressCode = data["BankAddressCode"].ToString(); //- 开户地区
+            string PersonWithIdCard = data["PersonWithIdCard"].ToString(); //- 手持身份证照片（小微）
+            string StoreEntrancePic = data["StoreEntrancePic"].ToString(); // 门头照片组
+            string IndoorPic = data["IndoorPic"].ToString(); // 环境照片组
+            string CheckstandImg = data["CheckstandImg"].ToString(); // 收银照片组
+            string Extra1 = data["Extra1"].ToString(); // 补充资料照片组
+            string IndustryLicense1 = data["IndustryLicense1"].ToString(); //- 特殊资质照片组
+
+
+            // string ContactName = data["ContactName"].ToString(); //管理员姓名
+            // string ContactIdNumber = data["ContactIdNumber"].ToString(); //管理员身份证件号码
+            // string MobilePhone = data["MobilePhone"].ToString(); //联系手机
+            // string ContactEmail = data["ContactEmail"].ToString(); //联系邮箱
+            // string SubjectType = data["SubjectType"].ToString(); //主体类型 0-企业法人营业执照 1-个体工商户营业执照
+            // string LicenseCopy = data["LicenseCopy"].ToString(); //营业执照照片
+            // string LicenseNumber = data["LicenseNumber"].ToString(); //统一社会信用代码
+            // string CertMerchantName = data["CertMerchantName"].ToString(); //商户名称
+            // string CertLegalPerson = data["CertLegalPerson"].ToString(); //法人姓名
+            // string IdCardCopy = data["IdCardCopy"].ToString(); //身份证人像面照片
+            // string IdCardNational = data["IdCardNational"].ToString(); //身份证国徽面照片
+            // string IdCardName = data["IdCardName"].ToString(); //身份证姓名
+            // string IdCardNumber = data["IdCardNumber"].ToString(); //身份证号码
+            // string IdCardAddress = data["IdCardAddress"].ToString(); //身份证号码
+            // string CardPeriodBeginString = data["CardPeriodBegin"].ToString();
+            // if (string.IsNullOrEmpty(CardPeriodBeginString))
+            // {
+            //     CardPeriodBeginString = "1900-01-01";
+            // }
+            // DateTime CardPeriodBegin = DateTime.Parse(CardPeriodBeginString); //身份证有效期开始时间
+            // string CardPeriodEndString = data["CardPeriodEnd"].ToString();
+            // if (string.IsNullOrEmpty(CardPeriodEndString))
+            // {
+            //     CardPeriodEndString = "1900-01-01";
+            // }
+            // DateTime CardPeriodEnd = DateTime.Parse(CardPeriodEndString); //身份证有效期结束时间
+            // string ServicePhone = data["ServicePhone"].ToString(); //客服电话
+            // string BizStoreName = data["BizStoreName"].ToString(); //门店名称
+            // string BizAddressCode = data["BizAddressCode"].ToString(); //门店省市编码
+            // string BizStoreAddress = data["BizStoreAddress"].ToString(); //门店地址
+            // string StoreEntrancePic = data["StoreEntrancePic"].ToString(); //门店门头照片
+            // string IndoorPic = data["IndoorPic"].ToString(); //店内环境照片
+            // string QualificationType = data["QualificationType"].ToString(); //所属行业
+            // string SettlementId = data["SettlementId"].ToString(); //入驻结算规则ID
+            // string AlipayMccCode = "";
+            // if (!string.IsNullOrEmpty(SettlementId))
+            // {
+            //     AlipayMccCode = SettlementId.Substring(SettlementId.IndexOf("_") + 1);
+            //     SettlementId = SettlementId.Substring(0, SettlementId.IndexOf("_"));
+            // }
+            // string AlipayAccount = data["AlipayAccount"].ToString(); //支付宝账号
+            // string BankAccountType = data["BankAccountType"].ToString(); //账户类型 1 对私 0 对公
+            // string AccountName = data["AccountName"].ToString(); //开户名称
+            // string AccountBank = data["AccountBank"].ToString(); //开户银行
+            // string BankAddressCode = data["BankAddressCode"].ToString(); //开户银行省市编码
+            // string MerchantShortname = data["MerchantShortname"].ToString();
+            // string BankName = data["BankName"].ToString(); //开户银行全称
+            // string AccountNumber = data["AccountNumber"].ToString(); //银行账号
+            // 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 BusinessId = data["BusinessId"].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 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()));
@@ -125,35 +167,62 @@ namespace MySystem.Areas.Api.Controllers.v1
                 BankBranchId = openBank.BankCode;
             }
             Dictionary<string, object> Obj = new Dictionary<string, object>();
-            var query = MerchantAddInfoService.Query(" CertMerchantName='" + CertMerchantName + "'");
-            if (query == null)
-            {
-                Dictionary<string, object> Fiel = new Dictionary<string, object>();
-                Fiel.Add("CertMerchantName", CertMerchantName);
-                MerchantAddInfoService.Add(Fiel);
-            }
-            var ActivitiesId = "20191030111cff5b5e";
-            var ActivitiesRate = "0.38";
+            // var query = MerchantAddInfoService.Query(" CertMerchantName='" + CertMerchantName + "'");
+            // if (query == null)
+            // {
+            //     Dictionary<string, object> Fiel = new Dictionary<string, object>();
+            //     Fiel.Add("CertMerchantName", CertMerchantName);
+            //     MerchantAddInfoService.Add(Fiel);
+            // }
+            // 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, PeriodBegin, PeriodEnd, ChannelKind, BusinessId, OpenAccountLicenses, CheckstandImg, IndustryLicense1, Extra1, BankCard, PersonWithIdCard, MchtNo);
-
-            var merchant = MerchantInfoService.Query(query.Id);
-            if (merchant.Id == 0)
-            {
-                Dictionary<string, object> Fiel = new Dictionary<string, object>();
-                Fiel.Add("Id", query.Id);
-                MerchantInfoService.Add(Fiel);
-            }
-            MerchantInfoUtil.EditMerchantInfo(merchant.Id, UserId, CertMerchantName, MobilePhone, BizAddressCode, BizStoreAddress);
-
+            Dictionary<string, object> Fields = new Dictionary<string, object>();
+            Fields.Add("LicenseCopy", LicenseCopy); //- 营业执照
+            Fields.Add("CertMerchantName", CertMerchantName); //- 商户名称
+            Fields.Add("LicenseNumber", LicenseNumber); //- 商户信用代码
+            Fields.Add("SubjectType", SubjectType); //- 主体类型
+            Fields.Add("MerchantShortname", MerchantShortname); //- 用户名称简写
+            Fields.Add("ServicePhone", ServicePhone); //- 商户电话
+            Fields.Add("SalesScenesType", SalesScenesType); //- 所属行业
+            Fields.Add("MchtNo", MchtNo); // 收款商户号
+            Fields.Add("BizStoreName", BizStoreName); //- 门店名称
+            Fields.Add("BizAddressCode", BizAddressCode); //- 门店区域
+            Fields.Add("BizStoreAddress", BizStoreAddress); //- 门店地址
+            Fields.Add("IdCardCopy", IdCardCopy); //- 身份证正面
+            Fields.Add("IdCardNational", IdCardNational); //- 身份证反面
+            Fields.Add("CertLegalPerson", CertLegalPerson); //- 真实姓名
+            Fields.Add("IdCardNumber", IdCardNumber); //- 身份证号码
+            Fields.Add("CardPeriodBegin", CardPeriodBegin); //- 身份证有效期开始
+            Fields.Add("CardPeriodEnd", CardPeriodEnd); //- 身份证有效期结束
+            Fields.Add("PeriodBegin", PeriodBegin); //- 身份证有效期开始
+            Fields.Add("PeriodEnd", PeriodEnd); //- 身份证有效期结束
+            Fields.Add("MobilePhone", MobilePhone); //- 手机号码
+            Fields.Add("AccountName", AccountName); //- 开户名称
+            Fields.Add("ChannelKind", ChannelKind); // 商户类型
+            Fields.Add("BankAccountType", BankAccountType); //- 账户类型
+            Fields.Add("AccountNumber", AccountNumber); //- 银行卡号
+            Fields.Add("AccountBank", AccountBank); //- 开户行
+            Fields.Add("BankCard", BankCard); // 银行卡照片
+            Fields.Add("openAccountLicenses", OpenAccountLicenses); // 开户许可证
+            Fields.Add("BankName", BankName); //- 开户行全称
+            Fields.Add("BankAddressCode", BankAddressCode); //- 开户地区
+            Fields.Add("PersonWithIdCard", PersonWithIdCard); //- 手持身份证照片（小微）
+            Fields.Add("StoreEntrancePic", StoreEntrancePic); // 门头照片组
+            Fields.Add("IndoorPic", IndoorPic); // 环境照片组
+            Fields.Add("checkstandImg", CheckstandImg); // 收银照片组
+            Fields.Add("extra1", Extra1); // 补充资料照片组
+            Fields.Add("industryLicense1", IndustryLicense1); //- 特殊资质照片组
+            MerchantAddInfoUtil.EditMerchantAddInfo(Fields, MerchantAddInfoId);
+            MerchantAddInfoId = (int)MerchantInfoUtil.EditMerchantInfo(MerchantAddInfoId, UserId, CertMerchantName, MobilePhone, BizAddressCode, BizStoreAddress).Data;
             if (Finish == 1)
             {
                 Dictionary<string, object> Fiel = new Dictionary<string, object>();
                 Fiel.Add("Sort", 1);
-                MerchantInfoService.Edit(Fiel, merchant.Id);
+                MerchantInfoService.Edit(Fiel, MerchantAddInfoId);
                 // 如果提交完整资料，则发送到BsServer执行进件操作
-                RedisDbconn.Instance.AddList("MerchantConfirmQueue", "{\"MerchantId\":\"" + merchant.Id + "\"}");
+                RedisDbconn.Instance.AddList("MerchantConfirmQueue", "{\"MerchantId\":\"" + MerchantAddInfoId + "\"}");
             }
             Obj.Add("Id", MerchantAddInfoId); //Id
             return new AppResultJson() { Status = "1", Info = "", Data = Obj };

Util/Main/MerchantAddInfoUtil.cs

@@ -80,71 +80,79 @@ namespace MySystem
         /// <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 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 PeriodBegin,string PeriodEnd,string ChannelKind, string BusinessId, string OpenAccountLicenses, string CheckstandImg, string IndustryLicense1, string Extra1, string BankCard, string PersonWithIdCard, string MchtNo)
+        public static AppResultJson EditMerchantAddInfo(Dictionary<string, object> Fields, int Id)
         {
-            Dictionary<string, object> Fields = new Dictionary<string, object>();
-            Fields.Add("ContactName", ContactName); //管理员姓名
-            Fields.Add("ContactIdNumber", ContactIdNumber); //管理员身份证件号码
-            Fields.Add("MobilePhone", MobilePhone); //联系手机
-            Fields.Add("ContactEmail", ContactEmail); //联系邮箱
-            Fields.Add("SubjectType", SubjectType); //主体类型
-            Fields.Add("LicenseCopy", LicenseCopy); //营业执照照片
-            Fields.Add("LicenseNumber", LicenseNumber); //统一社会信用代码
-            Fields.Add("LegalPerson", CertLegalPerson); //);体户经营者/法人姓名
-            Fields.Add("CertMerchantName", CertMerchantName); //商户名称
-            Fields.Add("CertLegalPerson", CertLegalPerson); //法人姓名
-            Fields.Add("ServicePhone", ServicePhone); //客服电话
-            Fields.Add("BizStoreName", BizStoreName); //门店名称
-            Fields.Add("BizAddressCode", BizAddressCode); //门店省市编码
-            Fields.Add("BizStoreAddress", BizStoreAddress); //门店地址
-            Fields.Add("StoreEntrancePic", StoreEntrancePic); //门店门头照片
-            Fields.Add("IndoorPic", IndoorPic); //店内环境照片
-            Fields.Add("QualificationType", QualificationType); //所属行业
-            Fields.Add("SettlementId", SettlementId); //入驻结算规则ID
-            Fields.Add("BankAccountType", BankAccountType); //账户类型
-            Fields.Add("AccountName", AccountName); //开户名称
-            Fields.Add("AccountBank", AccountBank); //开户银行
-            Fields.Add("BankAddressCode", BankAddressCode); //开户银行省市编码
-            Fields.Add("BankName", BankName); //开户银行全称
-            Fields.Add("BankBranchId", BankBranchId);
-            Fields.Add("AccountNumber", AccountNumber); //银行账号
-            Fields.Add("IdCardCopy", IdCardCopy); //身份证人像面照片
-            Fields.Add("IdCardNational", IdCardNational); //身份证国徽面照片
-            Fields.Add("IdCardName", IdCardName); //身份证姓名
-            Fields.Add("IdCardNumber", IdCardNumber); //身份证号码
-            Fields.Add("IdCardAddress", IdCardAddress); //身份证居住地址
-            Fields.Add("CardPeriodBegin", CardPeriodBegin); //身份证有效期开始时间
-            Fields.Add("CardPeriodEnd", CardPeriodEnd); //身份证有效期结束时间
-            Fields.Add("MerchantShortname", MerchantShortname);
-            Fields.Add("Qualifications", Qualifications); //特殊资质图片
-            Fields.Add("ActivitiesId", ActivitiesId);
-            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("BusinessId", BusinessId); //经营范围 参考经营范围表
-            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("BankCard", BankCard); //银行卡照片
-            Fields.Add("PersonWithIdCard", PersonWithIdCard); //手持身份证
-            // Fields.Add("TakeCreditCard", TakeCreditCard); //拍卡
-            Fields.Add("MchtNo", MchtNo); //收款商户号
-            var info = MerchantAddInfoService.Edit(Fields, Id);
+            // Dictionary<string, object> Fields = new Dictionary<string, object>();
+            // Fields.Add("ContactName", ContactName); //管理员姓名
+            // Fields.Add("ContactIdNumber", ContactIdNumber); //管理员身份证件号码
+            // Fields.Add("MobilePhone", MobilePhone); //联系手机
+            // Fields.Add("ContactEmail", ContactEmail); //联系邮箱
+            // Fields.Add("SubjectType", SubjectType); //主体类型
+            // Fields.Add("LicenseCopy", LicenseCopy); //营业执照照片
+            // Fields.Add("LicenseNumber", LicenseNumber); //统一社会信用代码
+            // Fields.Add("LegalPerson", CertLegalPerson); //);体户经营者/法人姓名
+            // Fields.Add("CertMerchantName", CertMerchantName); //商户名称
+            // Fields.Add("CertLegalPerson", CertLegalPerson); //法人姓名
+            // Fields.Add("ServicePhone", ServicePhone); //客服电话
+            // Fields.Add("BizStoreName", BizStoreName); //门店名称
+            // Fields.Add("BizAddressCode", BizAddressCode); //门店省市编码
+            // Fields.Add("BizStoreAddress", BizStoreAddress); //门店地址
+            // Fields.Add("StoreEntrancePic", StoreEntrancePic); //门店门头照片
+            // Fields.Add("IndoorPic", IndoorPic); //店内环境照片
+            // Fields.Add("QualificationType", QualificationType); //所属行业
+            // Fields.Add("SettlementId", SettlementId); //入驻结算规则ID
+            // Fields.Add("BankAccountType", BankAccountType); //账户类型
+            // Fields.Add("AccountName", AccountName); //开户名称
+            // Fields.Add("AccountBank", AccountBank); //开户银行
+            // Fields.Add("BankAddressCode", BankAddressCode); //开户银行省市编码
+            // Fields.Add("BankName", BankName); //开户银行全称
+            // Fields.Add("BankBranchId", BankBranchId);
+            // Fields.Add("AccountNumber", AccountNumber); //银行账号
+            // Fields.Add("IdCardCopy", IdCardCopy); //身份证人像面照片
+            // Fields.Add("IdCardNational", IdCardNational); //身份证国徽面照片
+            // Fields.Add("IdCardName", IdCardName); //身份证姓名
+            // Fields.Add("IdCardNumber", IdCardNumber); //身份证号码
+            // Fields.Add("IdCardAddress", IdCardAddress); //身份证居住地址
+            // Fields.Add("CardPeriodBegin", CardPeriodBegin); //身份证有效期开始时间
+            // Fields.Add("CardPeriodEnd", CardPeriodEnd); //身份证有效期结束时间
+            // Fields.Add("MerchantShortname", MerchantShortname);
+            // Fields.Add("Qualifications", Qualifications); //特殊资质图片
+            // Fields.Add("ActivitiesId", ActivitiesId);
+            // 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("BusinessId", BusinessId); //经营范围 参考经营范围表
+            // 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("BankCard", BankCard); //银行卡照片
+            // Fields.Add("PersonWithIdCard", PersonWithIdCard); //手持身份证
+            // // Fields.Add("TakeCreditCard", TakeCreditCard); //拍卡
+            // Fields.Add("MchtNo", MchtNo); //收款商户号
+            AppResultJson info = new AppResultJson();
+            if(Id == 0)
+            {
+                info = MerchantAddInfoService.Add(Fields, false);
+            }
+            else
+            {
+                info = MerchantAddInfoService.Edit(Fields, Id, false);
+            }
             return info;
         }
         #endregion

Util/Main/MerchantInfoUtil.cs

@@ -28,7 +28,15 @@ namespace MySystem
             Fields.Add("Mobile", Mobile);
             Fields.Add("Areas", Areas);
             Fields.Add("Address", Address);
-            var info = MerchantInfoService.Edit(Fields,Id);
+            AppResultJson info = new AppResultJson();
+            if (Id == 0)
+            {
+                info = MerchantInfoService.Add(Fields, false);
+            }
+            else
+            {
+                info = MerchantInfoService.Edit(Fields, Id, false);
+            }
             return info;
         }
         #endregion