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
191ba682
Commit
191ba682
authored
Nov 18, 2020
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
接口修改
parent
eb654cca
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
10 deletions
+4
-10
RB_Goods_OrderRepository.cs
Mall.Repository/Product/RB_Goods_OrderRepository.cs
+0
-2
RB_Member_UserRepository2.cs
Mall.Repository/User/RB_Member_UserRepository2.cs
+4
-8
No files found.
Mall.Repository/Product/RB_Goods_OrderRepository.cs
View file @
191ba682
...
@@ -1123,8 +1123,6 @@ INNER JOIN
...
@@ -1123,8 +1123,6 @@ INNER JOIN
return
obj
;
return
obj
;
}
}
/// <summary>
/// <summary>
/// 获取已退款 待制单的订单列表
/// 获取已退款 待制单的订单列表
/// </summary>
/// </summary>
...
...
Mall.Repository/User/RB_Member_UserRepository2.cs
View file @
191ba682
...
@@ -51,7 +51,6 @@ WHERE 1=1
...
@@ -51,7 +51,6 @@ WHERE 1=1
public
object
GetMemberUserStatisticsRepository
(
RB_Member_User_Extend
dmodel
)
public
object
GetMemberUserStatisticsRepository
(
RB_Member_User_Extend
dmodel
)
{
{
StringBuilder
where
=
new
StringBuilder
();
StringBuilder
where
=
new
StringBuilder
();
if
(
dmodel
.
TenantId
>
0
)
if
(
dmodel
.
TenantId
>
0
)
{
{
where
.
AppendFormat
(
$@" and A.
{
nameof
(
RB_Member_User
.
TenantId
)}
=
{
dmodel
.
TenantId
}
"
);
where
.
AppendFormat
(
$@" and A.
{
nameof
(
RB_Member_User
.
TenantId
)}
=
{
dmodel
.
TenantId
}
"
);
...
@@ -60,7 +59,6 @@ WHERE 1=1
...
@@ -60,7 +59,6 @@ WHERE 1=1
{
{
where
.
AppendFormat
(
$@" and A.
{
nameof
(
RB_Member_User
.
MallBaseId
)}
=
{
dmodel
.
MallBaseId
}
"
);
where
.
AppendFormat
(
$@" and A.
{
nameof
(
RB_Member_User
.
MallBaseId
)}
=
{
dmodel
.
MallBaseId
}
"
);
}
}
StringBuilder
builder
=
new
StringBuilder
();
StringBuilder
builder
=
new
StringBuilder
();
builder
.
AppendFormat
(
@"
builder
.
AppendFormat
(
@"
SELECT * FROM rb_member_user AS A
SELECT * FROM rb_member_user AS A
...
@@ -68,22 +66,21 @@ INNER JOIN
...
@@ -68,22 +66,21 @@ INNER JOIN
(
(
SELECT DISTINCT UserId
SELECT DISTINCT UserId
FROM rb_login_log
FROM rb_login_log
WHERE DATE_FORMAT(LoginTime,'%y/%m/%d')=DATE_FORMAT('
2020-11-18
','%y/%m/%d')
WHERE DATE_FORMAT(LoginTime,'%y/%m/%d')=DATE_FORMAT('
{1}
','%y/%m/%d')
) AS B ON A.Id=B.UserId
) AS B ON A.Id=B.UserId
WHERE A.SuperiorId>0 AND A.SuperiorId<20 AND A.PostId=0 {0}
WHERE A.SuperiorId>0 AND A.SuperiorId<20 AND A.PostId=0 {0}
UNION ALL
UNION ALL
SELECT * FROM rb_member_user AS A
SELECT * FROM rb_member_user AS A
INNER JOIN
INNER JOIN
(
(
SELECT DISTINCT UserId
SELECT DISTINCT UserId
FROM rb_login_log
FROM rb_login_log
WHERE DATE_FORMAT(LoginTime,'%y/%m/%d')=DATE_FORMAT('
2020-11-18
','%y/%m/%d')
WHERE DATE_FORMAT(LoginTime,'%y/%m/%d')=DATE_FORMAT('
{1}
','%y/%m/%d')
) AS B ON A.Id=B.UserId
) AS B ON A.Id=B.UserId
WHERE A.PostId=1 {0}
WHERE A.PostId=1 {0}
"
,
where
.
ToString
());
"
,
where
.
ToString
()
,
DateTime
.
Now
.
ToString
(
"yyyy-MM-dd"
)
);
var
list
=
Get
<
RB_Member_User_Extend
>(
builder
.
ToString
()).
ToList
();
var
list
=
Get
<
RB_Member_User_Extend
>(
builder
.
ToString
()).
ToList
();
var
obj
=
new
var
obj
=
new
{
{
LoginTotal
=
list
?.
Count
??
0
,
LoginTotal
=
list
?.
Count
??
0
,
...
@@ -92,6 +89,5 @@ WHERE A.PostId=1 {0}
...
@@ -92,6 +89,5 @@ WHERE A.PostId=1 {0}
};
};
return
obj
;
return
obj
;
}
}
}
}
}
}
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