Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mall.oytour.com
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
黄奎
mall.oytour.com
Commits
83406134
Commit
83406134
authored
Oct 30, 2020
by
吴春
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交优惠券
parent
6d869f63
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
710 additions
and
4 deletions
+710
-4
RB_Goods_Comment.cs
Mall.Model/Entity/Product/RB_Goods_Comment.cs
+7
-1
RB_Reserve_ServicePersonal_Extend.cs
...Model/Extend/Reserve/RB_Reserve_ServicePersonal_Extend.cs
+4
-0
ReserveModule.cs
Mall.Module.Reserve/ReserveModule.cs
+200
-1
RB_Reserve_ServicePersonalRepository.cs
...epository/Reserve/RB_Reserve_ServicePersonalRepository.cs
+60
-1
AppletStoresController.cs
Mall.WebApi/Controllers/Reserve/AppletStoresController.cs
+439
-1
No files found.
Mall.Model/Entity/Product/RB_Goods_Comment.cs
View file @
83406134
...
...
@@ -188,5 +188,11 @@ namespace Mall.Model.Entity.Product
/// 来源订单id
/// </summary>
public
int
?
OrderDetailId
{
get
;
set
;
}
/// <summary>
/// 服务人员id
/// </summary>
public
int
ServicePersonalId
{
get
;
set
;
}
}
}
Mall.Model/Extend/Reserve/RB_Reserve_ServicePersonal_Extend.cs
View file @
83406134
...
...
@@ -23,6 +23,10 @@ namespace Mall.Model.Extend.Reserve
/// 预约数
/// </summary>
public
int
OrderNum
{
get
;
set
;
}
/// <summary>
/// 评价数
/// </summary>
public
int
CommentNum
{
get
;
set
;
}
/// <summary>
/// 订单人数
...
...
Mall.Module.Reserve/ReserveModule.cs
View file @
83406134
This diff is collapsed.
Click to expand it.
Mall.Repository/Reserve/RB_Reserve_ServicePersonalRepository.cs
View file @
83406134
...
...
@@ -39,6 +39,14 @@ namespace Mall.Repository.Reserve
{
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
}
%'"
);
...
...
@@ -49,6 +57,52 @@ namespace Mall.Repository.Reserve
}
/// <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
))
{
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>
...
...
@@ -84,6 +138,11 @@ namespace Mall.Repository.Reserve
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
();
}
...
...
Mall.WebApi/Controllers/Reserve/AppletStoresController.cs
View file @
83406134
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment