Skip to content

M
mall.oytour.com
Commit c8e4ab39 authored by 吴春's avatar 吴春
Browse files
Options

提交代码

parent 4bec7a05
Hide whitespace changes
Inline Side-by-side
Showing with 50 additions and 34 deletions
Mall.Common/Config.cs
View file @ c8e4ab39
......@@ -353,5 +353,16 @@ namespace Mall.Common
}
}
/// <summary>
/// 数据库地址
/// </summary>
public static string RebornDMC
{
get
{
return new ConfigurationBuilder().Add(new JsonConfigurationSource { Path = "appsettings.json" }).Build().GetSection("RebornDMC").Value;
}
}
}
}
\ No newline at end of file
Mall.Repository/Finance/RB_ClientBankAccountRepository.cs
View file @ c8e4ab39
using Mall.Common.Enum;
using Mall.Common;
using Mall.Common.Enum;
using Mall.Model.Entity.Finance;
using Mall.Model.Extend.Finance;
using System;
......@@ -28,36 +29,37 @@ namespace Mall.Repository.Finance
public List<RB_ClientBankAccount_Extend> GetPageList(int pageIndex, int pageSize, RB_ClientBankAccount_Extend model, out long count)
{
string where = " WHERE 1=1 ";
where += string.Format(" AND " + nameof(RB_ClientBankAccount_Extend.Status) + "={0}", (int)DateStateEnum.Normal);
where += string.Format(" AND a." + nameof(RB_ClientBankAccount_Extend.Status) + "={0}", (int)DateStateEnum.Normal);
if (model.RB_Group_Id > 0)
{
where += string.Format(" AND " + nameof(RB_ClientBankAccount_Extend.RB_Group_Id) + "={0}", model.RB_Group_Id);
where += string.Format(" AND a." + nameof(RB_ClientBankAccount_Extend.RB_Group_Id) + "={0}", model.RB_Group_Id);
}
if (model.RB_Branch_Id >= 0)
{
where += string.Format(" AND " + nameof(RB_ClientBankAccount_Extend.RB_Branch_Id) + "={0}", model.RB_Branch_Id);
where += string.Format(" AND a." + nameof(RB_ClientBankAccount_Extend.RB_Branch_Id) + "={0}", model.RB_Branch_Id);
}
if (model.Type > 0)
{
where += string.Format(" AND " + nameof(RB_ClientBankAccount_Extend.Type) + "={0}", (int)model.Type);
where += string.Format(" AND a." + nameof(RB_ClientBankAccount_Extend.Type) + "={0}", (int)model.Type);
}
if (!string.IsNullOrEmpty(model.AccountAlias))
{
where += string.Format(" AND " + nameof(RB_ClientBankAccount_Extend.AccountAlias) + " like '%{0}%' ", model.AccountAlias);
where += string.Format(" AND a." + nameof(RB_ClientBankAccount_Extend.AccountAlias) + " like '%{0}%' ", model.AccountAlias);
}
if (!string.IsNullOrEmpty(model.OpenBankName))
{
where += string.Format(" AND " + nameof(RB_ClientBankAccount_Extend.OpenBankName) + " like '%{0}%' ", model.OpenBankName);
where += string.Format(" AND a." + nameof(RB_ClientBankAccount_Extend.OpenBankName) + " like '%{0}%' ", model.OpenBankName);
}
if (!string.IsNullOrEmpty(model.CardNum))
{
where += string.Format(" AND " + nameof(RB_ClientBankAccount_Extend.CardNum) + " like '%{0}%' ", model.CardNum);
where += string.Format(" AND a." + nameof(RB_ClientBankAccount_Extend.CardNum) + " like '%{0}%' ", model.CardNum);
}
if (!string.IsNullOrEmpty(model.AccountHolder))
{
where += string.Format(" AND " + nameof(RB_ClientBankAccount_Extend.AccountHolder) + " like '%{0}%' ", model.AccountHolder);
where += string.Format(" AND a." + nameof(RB_ClientBankAccount_Extend.AccountHolder) + " like '%{0}%' ", model.AccountHolder);
}
return GetPage<RB_ClientBankAccount_Extend>(pageIndex, pageSize, out count, " select * from " + TableName + "" + where).ToList();
string sql = $@"select a.*,b.name as BankName from {TableName} as a {TableName}";
return GetPage<RB_ClientBankAccount_Extend>(pageIndex, pageSize, out count, sql).ToList();
}
/// <summary>
/// 获取客户账户列表
......@@ -69,44 +71,45 @@ namespace Mall.Repository.Finance
public List<RB_ClientBankAccount> GetList(RB_ClientBankAccount model, string AccountAlias = "", string ClientIdStr = "")
{
string where = " WHERE 1=1 ";
where += string.Format(" AND " + nameof(RB_ClientBankAccount.Status) + "={0} ", (int)DateStateEnum.Normal);
where += string.Format(" AND a." + nameof(RB_ClientBankAccount.Status) + "={0} ", (int)DateStateEnum.Normal);
if (model.RB_Group_Id > 0)
{
where += string.Format(" AND " + nameof(RB_ClientBankAccount.RB_Group_Id) + "={0} ", model.RB_Group_Id);
where += string.Format(" AND a." + nameof(RB_ClientBankAccount.RB_Group_Id) + "={0} ", model.RB_Group_Id);
}
if (model.RB_Branch_Id >= 0)
{
where += string.Format(" AND " + nameof(RB_ClientBankAccount.RB_Branch_Id) + "={0} ", model.RB_Branch_Id);
where += string.Format(" AND a." + nameof(RB_ClientBankAccount.RB_Branch_Id) + "={0} ", model.RB_Branch_Id);
}
if (model.ID > 0)
{
where += string.Format(" AND " + nameof(RB_ClientBankAccount.ID) + "={0} ", model.ID);
where += string.Format(" AND a." + nameof(RB_ClientBankAccount.ID) + "={0} ", model.ID);
}
if (ClientIdStr != "")
{
where += string.Format(" AND " + nameof(RB_ClientBankAccount.ID) + " in({0}) ", ClientIdStr);
where += string.Format(" AND a." + nameof(RB_ClientBankAccount.ID) + " in({0}) ", ClientIdStr);
}
if (model.Type > 0)
{
where += string.Format(" AND " + nameof(RB_ClientBankAccount.Type) + "={0}", (int)model.Type);
where += string.Format(" AND a." + nameof(RB_ClientBankAccount.Type) + "={0}", (int)model.Type);
}
if (model.ObjID > 0)
{
where += string.Format(" AND " + nameof(RB_ClientBankAccount.ObjID) + "={0}", model.ObjID);
where += string.Format(" AND a." + nameof(RB_ClientBankAccount.ObjID) + "={0}", model.ObjID);
}
if (!string.IsNullOrEmpty(model.AccountAlias))
{
where += string.Format(" AND " + nameof(RB_ClientBankAccount.AccountAlias) + "='{0}'", model.AccountAlias);
where += string.Format(" AND a." + nameof(RB_ClientBankAccount.AccountAlias) + "='{0}'", model.AccountAlias);
}
if (AccountAlias != "")
{
where += string.Format(" AND " + nameof(RB_ClientBankAccount.AccountAlias) + " like'%{0}%'", AccountAlias);
where += string.Format(" AND a." + nameof(RB_ClientBankAccount.AccountAlias) + " like'%{0}%'", AccountAlias);
}
if (!string.IsNullOrEmpty(model.CardNum))
{
where += string.Format(" AND " + nameof(RB_ClientBankAccount.CardNum) + " like '%{0}%' ", model.CardNum);
where += string.Format(" AND a." + nameof(RB_ClientBankAccount.CardNum) + " like '%{0}%' ", model.CardNum);
}
return Get<RB_ClientBankAccount>("select * from " + TableName + " " + where).ToList();
string sql = $@"select a.*,b.name as BankName from {TableName} as a {TableName}";
return Get<RB_ClientBankAccount>(sql).ToList();
}
/// <summary>
......@@ -117,45 +120,46 @@ namespace Mall.Repository.Finance
public List<RB_ClientBankAccount> GetList(RB_ClientBankAccount_Extend model)
{
string where = " WHERE 1=1 ";
where += string.Format(" AND " + nameof(RB_ClientBankAccount.Status) + "={0} ", (int)DateStateEnum.Normal);
where += string.Format(" AND a." + nameof(RB_ClientBankAccount.Status) + "={0} ", (int)DateStateEnum.Normal);
if (model.RB_Group_Id > 0)
{
where += string.Format(" AND " + nameof(RB_ClientBankAccount.RB_Group_Id) + "={0} ", model.RB_Group_Id);
where += string.Format(" AND a." + nameof(RB_ClientBankAccount.RB_Group_Id) + "={0} ", model.RB_Group_Id);
}
if (model.RB_Branch_Id >= 0)
{
where += string.Format(" AND " + nameof(RB_ClientBankAccount.RB_Branch_Id) + "={0} ", model.RB_Branch_Id);
where += string.Format(" AND a." + nameof(RB_ClientBankAccount.RB_Branch_Id) + "={0} ", model.RB_Branch_Id);
}
if (model.ID > 0)
{
where += string.Format(" AND " + nameof(RB_ClientBankAccount.ID) + "={0} ", model.ID);
where += string.Format(" AND a." + nameof(RB_ClientBankAccount.ID) + "={0} ", model.ID);
}
if (!string.IsNullOrWhiteSpace(model.ClientIdStr))
{
where += string.Format(" AND " + nameof(RB_ClientBankAccount.ID) + " in({0}) ", model.ClientIdStr);
where += string.Format(" AND a." + nameof(RB_ClientBankAccount.ID) + " in({0}) ", model.ClientIdStr);
}
if (model.Type > 0)
{
where += string.Format(" AND " + nameof(RB_ClientBankAccount.Type) + "={0}", (int)model.Type);
where += string.Format(" AND a." + nameof(RB_ClientBankAccount.Type) + "={0}", (int)model.Type);
}
if (model.ObjID > 0)
{
where += string.Format(" AND " + nameof(RB_ClientBankAccount.ObjID) + "={0}", model.ObjID);
where += string.Format(" AND a." + nameof(RB_ClientBankAccount.ObjID) + "={0}", model.ObjID);
}
if (!string.IsNullOrWhiteSpace(model.ObjIdStr))
{
where += string.Format(" AND " + nameof(RB_ClientBankAccount.ObjID) + " in({0})", model.ObjIdStr);
where += string.Format(" AND a." + nameof(RB_ClientBankAccount.ObjID) + " in({0})", model.ObjIdStr);
}
if (!string.IsNullOrEmpty(model.AccountAlias))
{
where += string.Format(" AND " + nameof(RB_ClientBankAccount.AccountAlias) + "='{0}'", model.AccountAlias);
where += string.Format(" AND a." + nameof(RB_ClientBankAccount.AccountAlias) + "='{0}'", model.AccountAlias);
}
if (!string.IsNullOrEmpty(model.CardNum))
{
where += string.Format(" AND " + nameof(RB_ClientBankAccount.CardNum) + " like '%{0}%' ", model.CardNum);
where += string.Format(" AND a." + nameof(RB_ClientBankAccount.CardNum) + " like '%{0}%' ", model.CardNum);
}
return Get<RB_ClientBankAccount>("select * from " + TableName + " " + where).ToList();
string sql = $@"select a.*,b.name as BankName from {TableName} as a {TableName}";
return Get<RB_ClientBankAccount>(sql).ToList();
}
}
}
Mall.Repository/User/RB_Member_IntegralRepository.cs
View file @ c8e4ab39
......@@ -43,7 +43,7 @@ namespace Mall.Repository.User
}
if (dmodel.Type > 0)
{
where += $@" and {nameof(RB_Member_Integral.Type)}={dmodel.Type}";
where += $@" and {nameof(RB_Member_Integral.Type)}={(int)dmodel.Type}";
}
if (dmodel.UserId > 0)
{
......
Mall.WebApi/appsettings.json
View file @ c8e4ab39
......@@ -29,6 +29,7 @@
"ByteDanceSendTemplate": "https://developer.toutiao.com/api/apps/game/template/send",
"sTenpayNotify": "http://mallapi.oytour.com/api/WeChatNotify/Notify", //微信回调地址
"NetworkDirector": 1756, //网络主管的id，用于新建供应商账户的时候的创建人
"RebornDMC": "reborn_dmc",
"RedisSetting": {
"RedisServer": "192.168.2.214",
"RedisPort": "6379",
......
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