Commit 04e057a2 authored by 吴春's avatar 吴春

提交获取付款账户列表

parent 9a50cc3c
...@@ -248,5 +248,15 @@ namespace Mall.Model.Query ...@@ -248,5 +248,15 @@ namespace Mall.Model.Query
/// </summary> /// </summary>
public decimal RemitFXCommission { get; set; } public decimal RemitFXCommission { get; set; }
/// <summary>
/// 主播佣金
/// </summary>
public decimal LiveCommission { get; set; }
/// <summary>
/// 主播佣金生成的财务单据 逗号分隔
/// </summary>
public string LiveFinanceIds { get; set; }
} }
} }
...@@ -305,5 +305,19 @@ namespace Mall.Module.User ...@@ -305,5 +305,19 @@ namespace Mall.Module.User
} }
return clientBankAccountRepository.Exists(where); return clientBankAccountRepository.Exists(where);
} }
}
#region 获取财务单据付款人信息
/// <summary>
/// 根据查询条件获取客户账户列表
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public List<RB_ClientBankAccount> GetClientBankAccountList(Model.Extend.Finance.RB_ClientBankAccount_Extend model)
{
return clientBankAccountRepository.GetList(model);
}
#endregion
}
} }
...@@ -157,7 +157,7 @@ namespace Mall.Repository.Finance ...@@ -157,7 +157,7 @@ namespace Mall.Repository.Finance
{ {
where += string.Format(" AND a." + nameof(RB_ClientBankAccount.CardNum) + " like '%{0}%' ", model.CardNum); where += string.Format(" AND a." + nameof(RB_ClientBankAccount.CardNum) + " like '%{0}%' ", model.CardNum);
} }
string sql = $@"select a.* from {TableName} as a {TableName}"; string sql = $@"select a.* from {TableName} as a {where}";
return Get<RB_ClientBankAccount>(sql).ToList(); return Get<RB_ClientBankAccount>(sql).ToList();
} }
......
...@@ -332,7 +332,7 @@ namespace Mall.WebApi.Controllers.User ...@@ -332,7 +332,7 @@ namespace Mall.WebApi.Controllers.User
result.Add(newOrderGoods); result.Add(newOrderGoods);
} }
} }
if (demodel.IsSelectAll == 0 || demodel.IsSelectAll == 2) if (demodel.IsSelectAll == 0 || demodel.IsSelectAll == 2)
{ {
if (orderGoodsItem.FreightCostMoney.HasValue && orderGoodsItem.FreightCostMoney.Value > 0 && orderGoodsItem.FreightFinanceId <= 0) if (orderGoodsItem.FreightCostMoney.HasValue && orderGoodsItem.FreightCostMoney.Value > 0 && orderGoodsItem.FreightFinanceId <= 0)
{ {
...@@ -450,5 +450,37 @@ namespace Mall.WebApi.Controllers.User ...@@ -450,5 +450,37 @@ namespace Mall.WebApi.Controllers.User
} }
#endregion #endregion
#region 获取付款对象的列表
[HttpPost]
public ApiResult GetClientBankAccountList()
{
var parms = RequestParm;
Model.Extend.Finance.RB_ClientBankAccount_Extend demodel = JsonConvert.DeserializeObject<Model.Extend.Finance.RB_ClientBankAccount_Extend>(RequestParm.msg.ToString());
demodel.RB_Group_Id = 2;
demodel.RB_Branch_Id = -1;
demodel.Type = Common.Enum.Finance.ClientTypeEnum.Other;
var list = supplierModule.GetClientBankAccountList(demodel);
var result = list.Select(x => new
{
x.ID,
x.OpenBankName,
x.AccountAlias,
x.AccountClassify,
x.AccountHolder,
x.AccountType,
x.BankId,
x.CardNum,
x.RB_Branch_Id,
x.RB_Group_Id
});
return ApiResult.Success("", result);
}
#endregion
} }
} }
\ No newline at end of file
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