|
@@ -46,6 +46,7 @@ namespace MySystem.Areas.Api.Controllers.v1
|
|
|
string MerchantShortname = data["MerchantShortname"].ToString();
|
|
|
string ServicePhone = data["ServicePhone"].ToString();
|
|
|
string SalesScenesType = data["SalesScenesType"].ToString();
|
|
|
+ string SalesScenesTypeName = data["SalesScenesTypeName"].ToString();
|
|
|
string MchtNo = data["MchtNo"].ToString();
|
|
|
string BizStoreName = data["BizStoreName"].ToString();
|
|
|
string BizAddressCode = data["BizAddressCode"].ToString();
|
|
@@ -59,19 +60,19 @@ namespace MySystem.Areas.Api.Controllers.v1
|
|
|
string IdCardAddress = data["IdCardAddress"].ToString();
|
|
|
string PeriodBegin = data["PeriodBegin"].ToString();
|
|
|
string PeriodEnd = data["PeriodEnd"].ToString();
|
|
|
- if(string.IsNullOrEmpty(CardPeriodBegin))
|
|
|
+ if (string.IsNullOrEmpty(CardPeriodBegin))
|
|
|
{
|
|
|
CardPeriodBegin = "1900-01-01";
|
|
|
}
|
|
|
- if(string.IsNullOrEmpty(CardPeriodEnd))
|
|
|
+ if (string.IsNullOrEmpty(CardPeriodEnd))
|
|
|
{
|
|
|
CardPeriodEnd = "1900-01-01";
|
|
|
}
|
|
|
- if(string.IsNullOrEmpty(PeriodBegin))
|
|
|
+ if (string.IsNullOrEmpty(PeriodBegin))
|
|
|
{
|
|
|
PeriodBegin = "1900-01-01";
|
|
|
}
|
|
|
- if(string.IsNullOrEmpty(PeriodEnd))
|
|
|
+ if (string.IsNullOrEmpty(PeriodEnd))
|
|
|
{
|
|
|
PeriodEnd = "1900-01-01";
|
|
|
}
|
|
@@ -200,12 +201,19 @@ namespace MySystem.Areas.Api.Controllers.v1
|
|
|
Fields.Add("CertMerchantName", CertMerchantName);
|
|
|
Fields.Add("LicenseNumber", LicenseNumber);
|
|
|
Fields.Add("SubjectType", SubjectType);
|
|
|
+ var LicenceType = "";
|
|
|
+ if (SubjectType == "SUBJECT_TYPE_ENTERPRISE") LicenceType = "0";
|
|
|
+ if (SubjectType == "SUBJECT_TYPE_INDIVIDUAL") LicenceType = "1";
|
|
|
+ Fields.Add("LicenceType", LicenceType);
|
|
|
Fields.Add("MerchantShortname", MerchantShortname);
|
|
|
Fields.Add("ServicePhone", ServicePhone);
|
|
|
- Fields.Add("SalesScenesType", SalesScenesType);
|
|
|
+ Fields.Add("QualificationType", SalesScenesType);
|
|
|
+ Fields.Add("SalesScenesType", SalesScenesTypeName);
|
|
|
+ Fields.Add("BusinessId", SalesScenesType);
|
|
|
Fields.Add("MchtNo", MchtNo);
|
|
|
Fields.Add("BizStoreName", BizStoreName);
|
|
|
Fields.Add("BizAddressCode", BizAddressCode);
|
|
|
+ Fields.Add("AreaNo", HaoDaAreaCodeService.Query("CityName like '%" + BizAddressCode + "%'").CityCode);
|
|
|
Fields.Add("BizStoreAddress", BizStoreAddress);
|
|
|
Fields.Add("IdCardCopy", IdCardCopy);
|
|
|
Fields.Add("IdCardNational", IdCardNational);
|
|
@@ -220,12 +228,23 @@ namespace MySystem.Areas.Api.Controllers.v1
|
|
|
Fields.Add("AccountName", AccountName);
|
|
|
Fields.Add("ChannelKind", ChannelKind);
|
|
|
Fields.Add("BankAccountType", BankAccountType);
|
|
|
+ var AccountType = "";
|
|
|
+ if (BankAccountType == "BANK_ACCOUNT_TYPE_CORPORATE") AccountType = "0";
|
|
|
+ if (BankAccountType == "BANK_ACCOUNT_TYPE_PERSONAL") AccountType = "1";
|
|
|
+ Fields.Add("AccountType", AccountType);
|
|
|
Fields.Add("AccountNumber", AccountNumber);
|
|
|
Fields.Add("AccountBank", AccountBank);
|
|
|
Fields.Add("BankCard", BankCard);
|
|
|
Fields.Add("openAccountLicenses", OpenAccountLicenses);
|
|
|
Fields.Add("BankName", BankName);
|
|
|
+ Fields.Add("OpenBankAccName", BankName);
|
|
|
+ var bankInfo = OpenBankAllService.Query(" BankChild='" + BankName + "'");
|
|
|
+ Fields.Add("OpenUnionNo", bankInfo.BankChildNo);
|
|
|
+ Fields.Add("OpenCollectBankCode", bankInfo.BankParentNo);
|
|
|
+ Fields.Add("OpenBankRegionCode", HaoDaAreaCodeService.Query("CityName like '%" + BankAddressCode + "%'").CityCode);
|
|
|
+ Fields.Add("ZBankNo", bankInfo.BankChildNo);
|
|
|
Fields.Add("BankAddressCode", BankAddressCode);
|
|
|
+ Fields.Add("ZbankRegionCode", HaoDaAreaCodeService.Query("CityName like '%" + BankAddressCode + "%'").CityCode);
|
|
|
Fields.Add("PersonWithIdCard", PersonWithIdCard);
|
|
|
Fields.Add("StoreEntrancePic", StoreEntrancePic);
|
|
|
Fields.Add("IndoorPic", IndoorPic);
|
|
@@ -239,7 +258,7 @@ namespace MySystem.Areas.Api.Controllers.v1
|
|
|
{
|
|
|
Dictionary<string, object> Fiel = new Dictionary<string, object>();
|
|
|
Fiel.Add("Sort", 1);
|
|
|
- MerchantInfoService.Edit(Fiel, MerchantAddInfoId);
|
|
|
+ MerchantInfoService.Edit(Fiel, MerchantAddInfoId, false);
|
|
|
|
|
|
RedisDbconn.Instance.AddList("MerchantConfirmQueue", "{\"MerchantId\":\"" + MerchantAddInfoId + "\"}");
|
|
|
}
|
|
@@ -280,22 +299,22 @@ namespace MySystem.Areas.Api.Controllers.v1
|
|
|
{
|
|
|
JsonData data = JsonMapper.ToObject(value);
|
|
|
List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
|
|
|
- var first = maindb.BusinessScopeType.OrderBy(m => m.Id).ToList();
|
|
|
- foreach (var itemf in first)
|
|
|
+ List<RelationData> relationData = new List<RelationData>();
|
|
|
+ List<Dictionary<string, object>> listf = BusinessScopeTypeService.List(relationData, "", 1, 99999);
|
|
|
+ foreach (Dictionary<string, object> dicf in listf)
|
|
|
{
|
|
|
Dictionary<string, object> item = new Dictionary<string, object>();
|
|
|
- item.Add("value", itemf.Id);
|
|
|
- item.Add("text", itemf.KindName);
|
|
|
- var second = maindb.BusinessScope.Where(m => m.KindId == itemf.Id).OrderBy(m => m.Id).ToList();
|
|
|
+ item.Add("value", dicf["Id"].ToString());
|
|
|
+ item.Add("text", dicf["KindName"].ToString());
|
|
|
List<Dictionary<string, object>> sublist = new List<Dictionary<string, object>>();
|
|
|
- foreach (var items in second)
|
|
|
+ List<Dictionary<string, object>> lists = BusinessScopeService.List(relationData, "and KindId='" + dicf["Id"].ToString() + "'", 1, 99999);
|
|
|
+ foreach (Dictionary<string, object> dics in lists)
|
|
|
{
|
|
|
Dictionary<string, object> subitem = new Dictionary<string, object>();
|
|
|
- subitem.Add("value", items.Id);
|
|
|
- subitem.Add("text", items.Name);
|
|
|
+ subitem.Add("value", dics["Id"].ToString());
|
|
|
+ subitem.Add("text", dics["Name"].ToString());
|
|
|
sublist.Add(subitem);
|
|
|
}
|
|
|
- item.Add("children", sublist);
|
|
|
dataList.Add(item);
|
|
|
}
|
|
|
return dataList;
|
|
@@ -564,7 +583,7 @@ namespace MySystem.Areas.Api.Controllers.v1
|
|
|
|
|
|
return list;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
public Dictionary<string, string> GetBanks()
|
|
|
{
|
|
|
Dictionary<string, string> dic = new Dictionary<string, string>();
|