Commit 83406134 authored by 吴春's avatar 吴春

提交优惠券

parent 6d869f63
...@@ -57,7 +57,7 @@ namespace Mall.Model.Entity.Product ...@@ -57,7 +57,7 @@ namespace Mall.Model.Entity.Product
set; set;
} }
/// <summary> /// <summary>
/// 客人名称 /// 客人名称
/// </summary> /// </summary>
...@@ -188,5 +188,11 @@ namespace Mall.Model.Entity.Product ...@@ -188,5 +188,11 @@ namespace Mall.Model.Entity.Product
/// 来源订单id /// 来源订单id
/// </summary> /// </summary>
public int? OrderDetailId { get; set; } public int? OrderDetailId { get; set; }
/// <summary>
/// 服务人员id
/// </summary>
public int ServicePersonalId { get; set; }
} }
} }
...@@ -23,6 +23,10 @@ namespace Mall.Model.Extend.Reserve ...@@ -23,6 +23,10 @@ namespace Mall.Model.Extend.Reserve
/// 预约数 /// 预约数
/// </summary> /// </summary>
public int OrderNum { get; set; } public int OrderNum { get; set; }
/// <summary>
/// 评价数
/// </summary>
public int CommentNum { get; set; }
/// <summary> /// <summary>
/// 订单人数 /// 订单人数
......
This diff is collapsed.
...@@ -39,6 +39,59 @@ namespace Mall.Repository.Reserve ...@@ -39,6 +39,59 @@ namespace Mall.Repository.Reserve
{ {
builder.Append($" AND a.{nameof(RB_Reserve_ServicePersonal_Extend.MallBaseId)}={query.MallBaseId}"); builder.Append($" AND a.{nameof(RB_Reserve_ServicePersonal_Extend.MallBaseId)}={query.MallBaseId}");
} }
if (query.ServiceStatus > 0)
{
builder.Append($" AND a.{nameof(RB_Reserve_ServicePersonal_Extend.ServiceStatus)}={query.ServiceStatus}");
}
if (query.StoreId > 0)
{
builder.Append($" AND a.{nameof(RB_Reserve_ServicePersonal_Extend.StoreId)}={query.StoreId}");
}
if (!string.IsNullOrWhiteSpace(query.Name))
{
builder.Append($" AND a.{nameof(RB_Reserve_ServicePersonal_Extend.Name)} like '%{query.Name}%'");
}
}
builder.Append($" order by a.{nameof(RB_Reserve_ServicePersonal_Extend.ID)} desc");
return GetPage<RB_Reserve_ServicePersonal_Extend>(pageIndex, pageSize, out rowCount, builder.ToString()).ToList();
}
/// <summary>
///小程序端服务人员信息列表
/// </summary>
/// <param name="pageIndex">页码</param>
/// <param name="pageSize">每页显示条数</param>
/// <param name="rowCount">总条数</param>
/// <param name="query">查询条件</param>
/// <returns></returns>
public List<RB_Reserve_ServicePersonal_Extend> GetMinServicePersonalList(int pageIndex, int pageSize, out long rowCount, RB_Reserve_ServicePersonal_Extend query)
{
StringBuilder builder = new StringBuilder();
builder.Append(@$" SELECT a.*,b.CommentNum FROM {TableName} as A
LEFT JOIN (SELECT ServicePersonalId,COUNT(*) as CommentNum from rb_goods_comment where Is_Show=1 and Status=0 GROUP by ServicePersonalId) as b on a.ID=b.ServicePersonalId WHERE a.{nameof(RB_Reserve_ServicePersonal_Extend.Status)}=0");
if (query != null)
{
if (query.TenantId > 0)
{
builder.Append($" AND a.{nameof(RB_Reserve_ServicePersonal_Extend.TenantId)}={query.TenantId}");
}
if (query.TenantId > 0)
{
builder.Append($" AND a.{nameof(RB_Reserve_ServicePersonal_Extend.MallBaseId)}={query.MallBaseId}");
}
if (query.ServiceStatus > 0)
{
builder.Append($" AND a.{nameof(RB_Reserve_ServicePersonal_Extend.ServiceStatus)}={query.ServiceStatus}");
}
if (query.StoreId > 0)
{
builder.Append($" AND a.{nameof(RB_Reserve_ServicePersonal_Extend.StoreId)}={query.StoreId}");
}
if (!string.IsNullOrWhiteSpace(query.Name)) if (!string.IsNullOrWhiteSpace(query.Name))
{ {
builder.Append($" AND a.{nameof(RB_Reserve_ServicePersonal_Extend.Name)} like '%{query.Name}%'"); builder.Append($" AND a.{nameof(RB_Reserve_ServicePersonal_Extend.Name)} like '%{query.Name}%'");
...@@ -49,6 +102,7 @@ namespace Mall.Repository.Reserve ...@@ -49,6 +102,7 @@ namespace Mall.Repository.Reserve
} }
/// <summary> /// <summary>
/// 服务人员信息列表 /// 服务人员信息列表
/// </summary> /// </summary>
...@@ -83,7 +137,12 @@ namespace Mall.Repository.Reserve ...@@ -83,7 +137,12 @@ namespace Mall.Repository.Reserve
{ {
builder.Append($" AND {nameof(RB_Reserve_ServicePersonal_Extend.Name)} like '%{query.Name}%'"); builder.Append($" AND {nameof(RB_Reserve_ServicePersonal_Extend.Name)} like '%{query.Name}%'");
} }
if (query.ServiceStatus > 0)
{
builder.Append($" AND {nameof(RB_Reserve_ServicePersonal_Extend.ServiceStatus)}={query.ServiceStatus}");
}
} }
return Get<RB_Reserve_ServicePersonal_Extend>(builder.ToString()).ToList(); return Get<RB_Reserve_ServicePersonal_Extend>(builder.ToString()).ToList();
} }
......
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