|
|
|
@ -47,8 +47,6 @@ namespace Myshipping.Application
|
|
|
|
|
private readonly SqlSugarRepository<DjyWebsiteAccountConfig> _djyWebsiteAccountConfigRepository;
|
|
|
|
|
private readonly SqlSugarRepository<SysUser> _sysUserRepository;
|
|
|
|
|
|
|
|
|
|
private readonly INamedServiceProvider<IDjyWebsiteAccountConfigService> _namedDjyWebsiteAccountServiceProvider;
|
|
|
|
|
|
|
|
|
|
const string CONST_MAPPING_BC_MODULE_ROUTE = "BC_DOWN_RT";
|
|
|
|
|
const string CONST_MAPPING_DRAFT_MODULE_ROUTE = "DRAFT_DOWN_RT";
|
|
|
|
|
const string CONST_MAPPING_MANIALLO_CHK_MODULE_ROUTE = "MANI_ALLOC_CHK_RT";
|
|
|
|
@ -225,7 +223,6 @@ namespace Myshipping.Application
|
|
|
|
|
|
|
|
|
|
string webKey = string.Format(CONST_FORMAT_WEB, bcOrDraftRouteCfg.MapCode);
|
|
|
|
|
|
|
|
|
|
var _webAccountConfig = _namedDjyWebsiteAccountServiceProvider.GetService(nameof(DjyWebsiteAccountConfigService));
|
|
|
|
|
//获取个人对应的账户,这里GetAccountConfig逻辑优先取个人,个人没有配置取公司对应配置
|
|
|
|
|
var userWebAccountConfig = GetAccountConfig(webKey, UserManager.UserId,UserManager.TENANT_ID).GetAwaiter()
|
|
|
|
|
.GetResult();
|
|
|
|
@ -533,7 +530,6 @@ namespace Myshipping.Application
|
|
|
|
|
|
|
|
|
|
string webKey = string.Format(CONST_FORMAT_WEB, bcOrDraftRouteCfg.MapCode);
|
|
|
|
|
|
|
|
|
|
var _webAccountConfig = _namedDjyWebsiteAccountServiceProvider.GetService(nameof(DjyWebsiteAccountConfigService));
|
|
|
|
|
//获取个人对应的账户,这里GetAccountConfig逻辑优先取个人,个人没有配置取公司对应配置
|
|
|
|
|
var userWebAccountConfig = GetAccountConfig(webKey, UserManager.UserId, UserManager.TENANT_ID).GetAwaiter()
|
|
|
|
|
.GetResult();
|
|
|
|
@ -1044,7 +1040,6 @@ namespace Myshipping.Application
|
|
|
|
|
|
|
|
|
|
string webKey = string.Format(CONST_FORMAT_WEB, bcOrDraftRouteCfg.MapCode);
|
|
|
|
|
|
|
|
|
|
var _webAccountConfig = _namedDjyWebsiteAccountServiceProvider.GetService(nameof(DjyWebsiteAccountConfigService));
|
|
|
|
|
//获取个人对应的账户,这里GetAccountConfig逻辑优先取个人,个人没有配置取公司对应配置
|
|
|
|
|
var userWebAccountConfig = GetAccountConfig(webKey, UserManager.UserId, UserManager.TENANT_ID).GetAwaiter()
|
|
|
|
|
.GetResult();
|
|
|
|
|