|
|
@@ -226,6 +226,7 @@ namespace MySystem.Areas.Api.Controllers.v1
|
|
|
}
|
|
|
Dictionary<string, object> Obj = new Dictionary<string, object>();
|
|
|
Dictionary<string, object> Fields = new Dictionary<string, object>();
|
|
|
+ bool OldFlag = false;
|
|
|
if (MerchantAddInfoId == 0)
|
|
|
{
|
|
|
if (SubjectType == "SUBJECT_TYPE_SMALL")
|
|
|
@@ -262,6 +263,7 @@ namespace MySystem.Areas.Api.Controllers.v1
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
+ MerchantAddInfo addInfo = MerchantAddInfoService.Query(MerchantAddInfoId);
|
|
|
if(sub)
|
|
|
{
|
|
|
if (SubjectType == "SUBJECT_TYPE_SMALL")
|
|
|
@@ -271,7 +273,7 @@ namespace MySystem.Areas.Api.Controllers.v1
|
|
|
Dictionary<string, object> Fiel = new Dictionary<string, object>();
|
|
|
Fiel.Add("CertMerchantName", CertMerchantName);
|
|
|
int ParentId = MerchantAddInfoId;
|
|
|
- Fiel.Add("OutMchtNo", MerchantAddInfoService.Query(MerchantAddInfoId).OutMchtNo); //费率
|
|
|
+ Fiel.Add("OutMchtNo", addInfo.OutMchtNo); //费率
|
|
|
Fiel.Add("ParentId", ParentId);
|
|
|
MerchantAddInfoId = (int)MerchantAddInfoService.Add(Fiel, false).Data;
|
|
|
|
|
|
@@ -286,13 +288,19 @@ namespace MySystem.Areas.Api.Controllers.v1
|
|
|
{
|
|
|
if (SubjectType == "SUBJECT_TYPE_SMALL")
|
|
|
{
|
|
|
- CertMerchantName = MerchantInfoService.Query(MerchantAddInfoId).Name;
|
|
|
+ CertMerchantName = addInfo.CertMerchantName;
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
Fields.Add("CertMerchantName", CertMerchantName);
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+ DateTime checkTime = addInfo.UpdateDate == null ? DateTime.Now : addInfo.UpdateDate.Value;
|
|
|
+ if(checkTime < DateTime.Parse("2024-12-05 00:00:00"))
|
|
|
+ {
|
|
|
+ OldFlag = true;
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
Fields.Add("LicenseCopy", LicenseCopy); //- 营业执照
|
|
|
@@ -371,7 +379,14 @@ namespace MySystem.Areas.Api.Controllers.v1
|
|
|
Fields.Add("BrandId", BrandId); // 品牌(0 银联 1 好哒)
|
|
|
Fields.Add("CybMakerCode", CybMakerCode); //创业帮创客编号
|
|
|
Fields.Add("FeeRate", SettleFee); //费率
|
|
|
- Fields.Add("AgentName", function.CheckNull(RedisDbconn.Instance.Get<string>("PublicAgentName"))); //机构类型
|
|
|
+ if(OldFlag)
|
|
|
+ {
|
|
|
+ Fields.Add("AgentName", "1"); //机构类型
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ Fields.Add("AgentName", function.CheckNull(RedisDbconn.Instance.Get<string>("PublicAgentName"))); //机构类型
|
|
|
+ }
|
|
|
|
|
|
MerchantAddInfoId = (int)MerchantInfoUtil.EditMerchantInfo(MerchantAddInfoId, UserId, CertMerchantName, MobilePhone, BizAddressCode, BizStoreAddress, BindStatus, BrandId, CybMakerCode).Data;
|
|
|
MerchantAddInfoUtil.EditMerchantAddInfo(Fields, MerchantAddInfoId);
|