暂存

Areas/Api/Controllers/Main/MerchantAddInfoController.cs

@@ -203,22 +203,30 @@ namespace MySystem.Areas.Api.Controllers.v1
                     }
                     CertMerchantName += function.get_Random(00000000, 99999999);
                 }
-                var query = MerchantAddInfoService.Query(" CertMerchantName='" + CertMerchantName + "'");
-                if (query.Id == 0)
-                {
-                    Dictionary<string, object> Fiel = new Dictionary<string, object>();
-                    Fiel.Add("CertMerchantName", CertMerchantName);
-                    Fields.Add("MchtNo", MchtNo); // 收款商户号
-                    MerchantAddInfoId = (int)MerchantAddInfoService.Add(Fiel, false).Data;
-
-                    Fiel = new Dictionary<string, object>();
-                    Fiel.Add("Id", MerchantAddInfoId);
-                    Fiel.Add("Name", CertMerchantName);
-                    MerchantInfoService.Add(Fiel, false);
-                }
                 else
                 {
-                    return new AppResultJson() { Status = "-1", Info = "该商户已进件", Data = Obj };
+                    var query = MerchantAddInfoService.Query(" CertMerchantName='" + CertMerchantName + "'");
+                    if (query.Id > 0)
+                    {
+                        return new AppResultJson() { Status = "-1", Info = "该商户已进件", Data = Obj };
+                    }
+
+                    // if (query.Id == 0)
+                    // {
+                    //     Dictionary<string, object> Fiel = new Dictionary<string, object>();
+                    //     Fiel.Add("CertMerchantName", CertMerchantName);
+                    //     Fields.Add("MchtNo", MchtNo); // 收款商户号
+                    //     MerchantAddInfoId = (int)MerchantAddInfoService.Add(Fiel, false).Data;
+
+                    //     Fiel = new Dictionary<string, object>();
+                    //     Fiel.Add("Id", MerchantAddInfoId);
+                    //     Fiel.Add("Name", CertMerchantName);
+                    //     MerchantInfoService.Add(Fiel, false);
+                    // }
+                    // else
+                    // {
+                    //     return new AppResultJson() { Status = "-1", Info = "该商户已进件", Data = Obj };
+                    // }
                 }
             }
             else
@@ -237,7 +245,7 @@ namespace MySystem.Areas.Api.Controllers.v1
             // 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);
 
             Fields.Add("LicenseCopy", LicenseCopy); //- 营业执照
-            // Fields.Add("CertMerchantName", CertMerchantName); //- 商户名称
+                                                    // Fields.Add("CertMerchantName", CertMerchantName); //- 商户名称
             Fields.Add("LicenseNumber", LicenseNumber); //- 商户信用代码
             Fields.Add("SubjectType", SubjectType); //- 主体类型
             var LicenceType = "";
@@ -289,13 +297,13 @@ namespace MySystem.Areas.Api.Controllers.v1
             //TODO：待修改
             Fields.Add("OpenBankAccout", OpenBankAccout); //- 开户许可证-银行卡号 企业商户必填(个体工商户对私不填)
             Fields.Add("OpenBankAccName", OpenBankAccName); //- 开户许可证-开户名 企业商户必填(个体工商户对私不填)
-            //TODO：待修改
+                                                            //TODO：待修改
             var bankInfo = OpenBankAllService.Query(" BankChild='" + BankName + "'");
             var kbankInfo = OpenBankAllService.Query(" BankChild='" + OpenBankName + "'");
             Fields.Add("OpenUnionNo", kbankInfo.BankChildNo); //- 开户许可证-开户支行 企业商户必填(个体工商户对私不填)
-            //TODO：待修改
+                                                              //TODO：待修改
             Fields.Add("OpenCollectBankCode", kbankInfo.BankParentNo); //- 开户许可证-银行代码(总行行号) 企业商户必填(个体工商户对私不填)
-            //TODO：待修改
+                                                                       //TODO：待修改
             Fields.Add("OpenBankRegionCode", HaoDaAreaCodeService.Query("CityName like '%" + OpenBankRegionCode + "%'").CityCode); //- 开户银行支行区域码 参考区域码表（联系对接人提供）
 
             Fields.Add("ZBankNo", bankInfo.BankChildNo); //- 开户银行支行号 参考支行号表（联系对接人提供）