Skip to content

H
huatu_API
Commit a55caf5f authored by 吴春's avatar 吴春
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/liudong1993/huatu_api

parents 920f8b92 d9987a3c
Hide whitespace changes
Inline Side-by-side
Showing with 72 additions and 48 deletions
REBORN.Common/Enum/Dmc/PriceTeamTypeEnum.cs
View file @ a55caf5f
......@@ -26,9 +26,9 @@ namespace REBORN.Common.Enum.Dmc
DanTuan = 3,
/// <summary>
/// 小包团
/// 定制团
/// </summary>
[EnumField("小包团")]
[EnumField("定制团")]
XiaoBaoTuan = 4,
/// <summary>
......
REBORN.Model/Entity/Finance/RB_FinancialInstitutions.cs
View file @ a55caf5f
......@@ -64,5 +64,10 @@ namespace REBORN.Model.Entity.Finance
get;
set;
}
/// <summary>
/// 集团ID
/// </summary>
public int GroupId { get; set; }
}
}
REBORN.Model/Extend/Finance/RB_Finance_Extend.cs
View file @ a55caf5f
......@@ -978,6 +978,11 @@ namespace REBORN.Model.Extend.Finance
/// </summary>
public string PriceTeamTypeName { get; set; }
/// <summary>
/// 团队类型
/// </summary>
public int PriceTeamType { get; set; }
/// <summary>
/// 报价单连接
/// </summary>
......
REBORN.Module.FinanceModule/FinancialModule.cs
View file @ a55caf5f
......@@ -5952,6 +5952,7 @@ namespace REBORN.Module.FinanceModule
PriceTeamTypeName = travelModel.PriceTeamType.GetEnumName(),
PriceOfferUrl = PriceOfferUrl,
TeamType = travelModel.TeamType.ToInt(),
PriceTeamType = travelModel.PriceTeamType.ToInt(),
ConfigID = travelModel.ConfigID,
//Config_OfferId = travelModel.Config_OfferId,
//HK 2023-07-27修改为团上的报价单编号
......
REBORN.Module.FinanceModule/RB_FinancialInstitutionsModule.cs
View file @ a55caf5f
......@@ -87,24 +87,24 @@ namespace REBORN.Module.FinanceModule
/// <returns></returns>
public bool Set(RB_FinancialInstitutions model)
{
IOssService ossService = OssService.Get();
string oldpath = model.Logo;
string NewFileUrl = "";
if (!string.IsNullOrEmpty(oldpath))
{
//转移图片
string userFile = "/New/Upload/Finance/Bank/";
//IOssService ossService = OssService.Get();
//string oldpath = model.Logo;
//string NewFileUrl = "";
//if (!string.IsNullOrEmpty(oldpath))
//{
// //转移图片
// string userFile = "/New/Upload/Finance/Bank/";
if (Config.GetFilePath(oldpath).Contains("/New/"))
{
NewFileUrl = Config.GetFilePath(oldpath).Replace("Temporary", "Finance/Bank");
}
else
{
NewFileUrl = "/New" + Config.GetFilePath(oldpath).Replace("Temporary", "Finance/Bank");
}
ThirdCore.Commom.CommonHelper.OssFileMove(Config.GetFilePath(oldpath), userFile);
}
// if (Config.GetFilePath(oldpath).Contains("/New/"))
// {
// NewFileUrl = Config.GetFilePath(oldpath).Replace("Temporary", "Finance/Bank");
// }
// else
// {
// NewFileUrl = "/New" + Config.GetFilePath(oldpath).Replace("Temporary", "Finance/Bank");
// }
// ThirdCore.Commom.CommonHelper.OssFileMove(Config.GetFilePath(oldpath), userFile);
//}
bool flag = false;
if (model.ID > 0)
{
......@@ -112,7 +112,7 @@ namespace REBORN.Module.FinanceModule
{
{ nameof(RB_FinancialInstitutions.Name),model.Name},
{ nameof(RB_FinancialInstitutions.EnCode),model.EnCode},
{ nameof(RB_FinancialInstitutions.Logo),NewFileUrl},
{ nameof(RB_FinancialInstitutions.Logo),model.Logo},
{ nameof(RB_FinancialInstitutions.Type),(int)model.Type}
};
IList<WhereHelper> whereHelpers = new List<WhereHelper>()
......@@ -123,7 +123,7 @@ namespace REBORN.Module.FinanceModule
}
else
{
model.Logo = NewFileUrl;
//model.Logo = NewFileUrl;
model.Status = (int)Common.Enum.DateStateEnum.Normal;
flag = repository.Insert(model) > 0;
}
......@@ -138,11 +138,12 @@ namespace REBORN.Module.FinanceModule
/// <param name="Name">账号名称</param>
/// <param name="EnCode">机构代码</param>
/// <returns></returns>
public bool Exists(int ID, string Name, string EnCode, int Type)
public bool Exists(int ID, string Name, string EnCode, int Type, int RB_Group_id)
{
IList<WhereHelper> where = new List<WhereHelper>
{
new WhereHelper() { FiledName = nameof(RB_FinancialInstitutions.Status), FiledValue = (int)Common.Enum.DateStateEnum.Normal, OperatorEnum = OperatorEnum.Equal }
new WhereHelper() { FiledName = nameof(RB_FinancialInstitutions.Status), FiledValue = (int)Common.Enum.DateStateEnum.Normal, OperatorEnum = OperatorEnum.Equal },
new WhereHelper() { FiledName = nameof(RB_FinancialInstitutions.GroupId), FiledValue = RB_Group_id, OperatorEnum = OperatorEnum.Equal }
};
if (!string.IsNullOrEmpty(Name))
{
......
REBORN.Module.SellModule/AllianceModule.cs
View file @ a55caf5f
......@@ -458,7 +458,7 @@ namespace REBORN.Module.SellModule
RB_Finance_Infochange_Log financeLog = new Model.Entity.Log.RB_Finance_Infochange_Log();
#region 添加银行机构
var tempFlag = true;
var FinancialInstitutions = new RB_FinancialInstitutionsRepository().GetByNameList(dmodel.BankName)?.FirstOrDefault();
var FinancialInstitutions = new RB_FinancialInstitutionsRepository().GetByNameList(dmodel.BankName, userInfo.RB_Group_id)?.FirstOrDefault();
if (FinancialInstitutions == null)
{
FinancialInstitutions = new RB_FinancialInstitutions_Extend()
......@@ -467,7 +467,8 @@ namespace REBORN.Module.SellModule
EnCode = "",
Logo = "",
Status = DateStateEnum.Normal,
Type = (Common.Enum.Finance.FinancialInstitutionsTypeEnum)(dmodel.AccountClassify == 2 ? 0 : 1)
Type = (Common.Enum.Finance.FinancialInstitutionsTypeEnum)(dmodel.AccountClassify == 2 ? 0 : 1),
GroupId = userInfo.RB_Group_id
};
FinancialInstitutions.ID = new RB_FinancialInstitutionsRepository().Insert(FinancialInstitutions, transCB);
tempFlag = FinancialInstitutions.ID > 0;
......@@ -683,7 +684,7 @@ namespace REBORN.Module.SellModule
RB_Finance_Infochange_Log financeLog = new Model.Entity.Log.RB_Finance_Infochange_Log();
#region 添加银行机构
var tempFlag = true;
var FinancialInstitutions = new RB_FinancialInstitutionsRepository().GetByNameList(dmodel.BankName)?.FirstOrDefault();
var FinancialInstitutions = new RB_FinancialInstitutionsRepository().GetByNameList(dmodel.BankName, userInfo.RB_Group_id)?.FirstOrDefault();
if (FinancialInstitutions == null)
{
FinancialInstitutions = new RB_FinancialInstitutions_Extend()
......@@ -692,7 +693,8 @@ namespace REBORN.Module.SellModule
EnCode = "",
Logo = "",
Status = DateStateEnum.Normal,
Type = (Common.Enum.Finance.FinancialInstitutionsTypeEnum)(dmodel.AccountClassify == 2 ? 0 : 1)
Type = (Common.Enum.Finance.FinancialInstitutionsTypeEnum)(dmodel.AccountClassify == 2 ? 0 : 1),
GroupId = userInfo.RB_Group_id
};
FinancialInstitutions.ID = new RB_FinancialInstitutionsRepository().Insert(FinancialInstitutions, transCB);
tempFlag = FinancialInstitutions.ID > 0;
......@@ -1379,7 +1381,7 @@ namespace REBORN.Module.SellModule
RB_FinancialInstitutions_Extend rB_Financial = new RB_FinancialInstitutions_Extend();
RB_Finance_Infochange_Log financeLog = new Model.Entity.Log.RB_Finance_Infochange_Log();
#region 添加银行机构
var FinancialInstitutions = new RB_FinancialInstitutionsRepository().GetByNameList(dmodel.BankName)?.FirstOrDefault();
var FinancialInstitutions = new RB_FinancialInstitutionsRepository().GetByNameList(dmodel.BankName, userInfo.RB_Group_id)?.FirstOrDefault();
if (FinancialInstitutions == null)
{
FinancialInstitutions = new RB_FinancialInstitutions_Extend()
......@@ -1388,7 +1390,8 @@ namespace REBORN.Module.SellModule
EnCode = "",
Logo = "",
Status = DateStateEnum.Normal,
Type = (Common.Enum.Finance.FinancialInstitutionsTypeEnum)(dmodel.AccountClassify == 2 ? 0 : 1)
Type = (Common.Enum.Finance.FinancialInstitutionsTypeEnum)(dmodel.AccountClassify == 2 ? 0 : 1),
RB_Group_Id = userInfo.RB_Group_id
};
FinancialInstitutions.ID = new RB_FinancialInstitutionsRepository().Insert(FinancialInstitutions);
flag = FinancialInstitutions.ID > 0;
......
REBORN.Module.UserModule/EmployeeModule.cs
View file @ a55caf5f
......@@ -1154,7 +1154,7 @@ namespace REBORN.Module.UserModule
}
RB_FinancialInstitutions_Extend rB_Financial = new RB_FinancialInstitutions_Extend();
#region 添加银行机构
var FinancialInstitutions = new RB_FinancialInstitutionsRepository().GetByNameList(dmodel.BankName)?.FirstOrDefault();
var FinancialInstitutions = new RB_FinancialInstitutionsRepository().GetByNameList(dmodel.BankName, dmodel.RB_Group_Id ?? 0)?.FirstOrDefault();
if (FinancialInstitutions == null)
{
FinancialInstitutions = new RB_FinancialInstitutions_Extend()
......@@ -1163,7 +1163,8 @@ namespace REBORN.Module.UserModule
EnCode = "",
Logo = "",
Status = DateStateEnum.Normal,
Type = (Common.Enum.Finance.FinancialInstitutionsTypeEnum)(dmodel.AccountClassify == 2 ? 0 : 1)
Type = (Common.Enum.Finance.FinancialInstitutionsTypeEnum)(dmodel.AccountClassify == 2 ? 0 : 1),
GroupId = dmodel.RB_Group_Id??0
};
FinancialInstitutions.ID = new RB_FinancialInstitutionsRepository().Insert(FinancialInstitutions);
flag = FinancialInstitutions.ID > 0;
......
REBORN.Repository/Finance/RB_FinancialInstitutionsRepository.cs
View file @ a55caf5f
......@@ -29,7 +29,11 @@ namespace REBORN.Repository.Finance
/// <returns></returns>
public List<RB_FinancialInstitutions_Extend> GetPageList(int pageIndex, int pageSize, RB_FinancialInstitutions_Extend model, out long count)
{
string where = string.Format(" AND A." + nameof(RB_FinancialInstitutions.Status) + "={0}", (int)Common.Enum.DateStateEnum.Normal);
string where = string.Format(" A." + nameof(RB_FinancialInstitutions.Status) + "={0}", (int)Common.Enum.DateStateEnum.Normal);
if (model.RB_Group_Id > 0)
{
where += string.Format(" AND A." + nameof(RB_FinancialInstitutions.GroupId) + " ={0}", model.RB_Group_Id);
}
if (!string.IsNullOrWhiteSpace(model.Name))
{
where += string.Format(" AND A." + nameof(RB_FinancialInstitutions.Name) + " like '%{0}%'", model.Name);
......@@ -39,18 +43,7 @@ namespace REBORN.Repository.Finance
where += string.Format(" AND A." + nameof(RB_FinancialInstitutions.Type) + " ={0}", (int)model.Type);
}
string peopletr = "";
//集团
if (model.RB_Group_Id > 0)
{
peopletr += string.Format(" AND " + nameof(Model.Entity.RB_BackAccount.RB_Group_Id) + " ={0}", model.RB_Group_Id);
}
if (model.RB_Branch_Id > 0)
{
peopletr += string.Format(" AND " + nameof(Model.Entity.RB_BackAccount.RB_Branch_Id) + " ={0}", model.RB_Branch_Id);
}
// string sql = string.Format(" SELECT *,(SELECT COUNT(1) FROM rb_backaccount where BackId=A.ID AND `Status`=0) as PeopleNum FROM {0} as A where Type=0 {1} UNION ALL SELECT *, (SELECT COUNT(1) FROM rb_platformaccount where BackId=A.ID AND `Status`=0) as PeopleNum FROM {0} as A where Type = 1 {1} {2}", TableName, where, "ORDER BY ID ASC");
string sql = string.Format(" SELECT *,(SELECT COUNT(1) FROM rb_backaccount where BackId=A.ID AND `Status`=0 {0}) as PeopleNum FROM {1} as A where Type=0 {2} UNION ALL SELECT *, (SELECT COUNT(1) FROM rb_platformaccount where BackId=A.ID AND `Status`=0 {0}) as PeopleNum FROM {1} as A where Type = 1 {2} {3}",peopletr, TableName, where, "ORDER BY ID ASC");
string sql = string.Format(" SELECT * FROM {0} as A where {1}", TableName, where, "ORDER BY ID ASC");
return GetPage<RB_FinancialInstitutions_Extend>(pageIndex, pageSize, out count, sql).ToList();
}
/// <summary>
......@@ -61,6 +54,10 @@ namespace REBORN.Repository.Finance
public List<RB_FinancialInstitutions_Extend> GetList(RB_FinancialInstitutions_Extend model)
{
string where = string.Format(" where " + nameof(RB_FinancialInstitutions.Status) + "={0}", (int)Common.Enum.DateStateEnum.Normal);
if (model.RB_Group_Id > 0)
{
where += string.Format(" AND " + nameof(RB_FinancialInstitutions.GroupId) + " ={0}", (int)model.RB_Group_Id);
}
if (!string.IsNullOrWhiteSpace(model.Name))
{
where += string.Format(" AND " + nameof(RB_FinancialInstitutions.Name) + " like '%{0}%'", model.Name);
......@@ -176,9 +173,12 @@ left join rb_accountrelation al on t.BankType=al.AccountType and t.ID=al.Account
/// </summary>
/// <param name="Name"></param>
/// <returns></returns>
public List<RB_FinancialInstitutions_Extend> GetByNameList(string Name)
public List<RB_FinancialInstitutions_Extend> GetByNameList(string Name, int GroupId =0)
{
string where = string.Format(" where " + nameof(RB_FinancialInstitutions.Status) + "={0}", (int)Common.Enum.DateStateEnum.Normal);
if (GroupId > 0) {
where += string.Format(" AND " + nameof(RB_FinancialInstitutions.GroupId) + "={0}", GroupId);
}
if (!string.IsNullOrWhiteSpace(Name))
{
where += string.Format(" AND " + nameof(RB_FinancialInstitutions.Name) + "='{0}'", Name);
......@@ -188,3 +188,4 @@ left join rb_accountrelation al on t.BankType=al.AccountType and t.ID=al.Account
}
}
}
REBORN.Services.FinanceService/FinancialInstitutionsService.cs
View file @ a55caf5f
......@@ -54,7 +54,11 @@ namespace REBORN.Services.FinanceService
/// <returns></returns>
public virtual ApiResult GetList(RequestParm request)
{
RB_FinancialInstitutions_Extend model = new RB_FinancialInstitutions_Extend();
UserInfo userInfo = request.groupId > 0 && request.requestFrom == Common.Enum.ApiRequestFromEnum.Edu ? CacheManager.User.RbUserCache.GetUserInfoForEdu(request) : CacheManager.User.RbUserCache.GetUserLoginInfo(request.uid);
RB_FinancialInstitutions_Extend model = new RB_FinancialInstitutions_Extend
{
RB_Group_Id = userInfo.RB_Group_id
};
var data = module.GetList(model);
var list = data.Select(x => new
{
......@@ -138,13 +142,13 @@ namespace REBORN.Services.FinanceService
UserInfo userInfo = CacheManager.User.RbUserCache.GetUserLoginInfo(request.uid);
RB_FinancialInstitutions model = JsonConvert.DeserializeObject<RB_FinancialInstitutions>(request.msg.ToString());
JObject parm = JObject.Parse(request.msg.ToString());
model.GroupId = userInfo.RB_Group_id;
if (string.IsNullOrWhiteSpace(model.Name))
{
return ApiResult.Failed("请填写类型名称！");
}
if (module.Exists(model.ID, model.Name, "", (int)model.Type.Value))
if (module.Exists(model.ID, model.Name, "", (int)model.Type.Value, userInfo.RB_Group_id))
{
return ApiResult.Failed("机构名称不能重复！");
}
......
REBORN.Services.FinanceService/FinancialService.cs
View file @ a55caf5f
......@@ -1903,6 +1903,7 @@ namespace REBORN.Services.FinanceService
y.GuestSurveyNum,
y.GuestTotalNum,
y.TeamType,
y.PriceTeamType,
y.TeamTypeNameStr,
y.ConfigID,
y.Config_OfferId,
......
REBORN.Services.SellService/CustomerOrderService.cs
View file @ a55caf5f
......@@ -3035,6 +3035,7 @@ namespace REBORN.Services.SellService
{
x.OrderId,
x.GuestId,
OutBranchId = x.EmpBranchId,
x.PlatformMoney,
x.GuestName,
MobilePhone = ConvertHelper.ReplaceMobile(x.MobilePhone),
......@@ -3458,6 +3459,7 @@ namespace REBORN.Services.SellService
demodel.OrderStatus = (int)CRMOrderStatusEnum.Normal;//默认正常订单
demodel.EnterID = userInfo.EmployeeId;
demodel.CreateBy = userInfo.EmployeeId;
demodel.EmpBranchId = userInfo.RB_Branch_id;
demodel.CreateTime = DateTime.Now;
string msg = customerOrderModule.SetGuestOrderInfo(demodel, supplierModel, appointOPList, userInfo);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment