|
@@ -248,6 +248,7 @@ namespace MySystem.Areas.Api.Controllers.v1
|
|
|
Dictionary<string, object> Fields = new Dictionary<string, object>();
|
|
|
bool OldFlag = false;
|
|
|
bool IsAdd = false;
|
|
|
+ int ParentId = 0;
|
|
|
if (MerchantAddInfoId == 0)
|
|
|
{
|
|
|
if (SubjectType == "SUBJECT_TYPE_SMALL")
|
|
@@ -300,7 +301,7 @@ namespace MySystem.Areas.Api.Controllers.v1
|
|
|
{
|
|
|
Dictionary<string, object> Fiel = new Dictionary<string, object>();
|
|
|
Fiel.Add("CertMerchantName", CertMerchantName);
|
|
|
- int ParentId = MerchantAddInfoId;
|
|
|
+ ParentId = MerchantAddInfoId;
|
|
|
Fiel.Add("OutMchtNo", addInfo.OutMchtNo); //费率
|
|
|
Fiel.Add("ParentId", ParentId);
|
|
|
MerchantAddInfoId = (int)MerchantAddInfoService.Add(Fiel, false).Data;
|
|
@@ -421,7 +422,15 @@ namespace MySystem.Areas.Api.Controllers.v1
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- Fields.Add("AgentName", function.CheckNull(RedisDbconn.Instance.Get<string>("PublicAgentName"))); //机构类型
|
|
|
+ if(sub)
|
|
|
+ {
|
|
|
+ MerchantAddInfo parent = maindb.MerchantAddInfo.FirstOrDefault(m => m.Id == ParentId) ?? new MerchantAddInfo();
|
|
|
+ Fields.Add("AgentName", parent.AgentName);
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ Fields.Add("AgentName", function.CheckNull(RedisDbconn.Instance.Get<string>("PublicAgentName"))); //机构类型
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|