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
6742a15b
Commit
6742a15b
authored
Sep 24, 2020
by
吴春
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'sdzq-ld' of
http://gitlab.oytour.com/Kui2/mall.oytour.com
into sdzq
parents
99b3a7d3
45380d63
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
51 additions
and
5 deletions
+51
-5
ProductModule.cs
Mall.Module.Product/ProductModule.cs
+2
-0
UserModule.cs
Mall.Module.User/UserModule.cs
+28
-2
RB_Member_UserRepository.cs
Mall.Repository/User/RB_Member_UserRepository.cs
+20
-0
OrderController.cs
Mall.WebApi/Controllers/Product/OrderController.cs
+1
-3
No files found.
Mall.Module.Product/ProductModule.cs
View file @
6742a15b
...
...
@@ -563,6 +563,7 @@ namespace Mall.Module.Product
RList
=
list
;
}
else
{
demodel
.
GoodsId
=
0
;
list
=
goodsRepository
.
GetAppletGoodsPageList
(
pageIndex
,
pageSize
,
out
long
count
,
demodel
);
RList
=
list
;
}
...
...
@@ -710,6 +711,7 @@ namespace Mall.Module.Product
}
else
{
demodel
.
GoodsId
=
0
;
list
=
goodsRepository
.
GetAppletGoodsPageList
(
pageIndex
,
pageSize
,
out
long
count
,
demodel
);
RList
=
list
;
}
...
...
Mall.Module.User/UserModule.cs
View file @
6742a15b
...
...
@@ -4017,9 +4017,35 @@ namespace Mall.Module.User
if
(
mymodel
==
null
)
{
return
ApiResult
.
ParamIsNull
(
"用户不存在"
);
}
string
userIds
=
member_UserRepository
.
GetMyUserHierarchicalRelationList
(
userId1
,
userId2
);
List
<
object
>
RList
=
new
List
<
object
>();
if
(!
string
.
IsNullOrEmpty
(
userIds
))
{
var
list
=
member_UserRepository
.
GetList
(
new
RB_Member_User_Extend
()
{
UserIds
=
userIds
});
int
pId
=
userId1
;
for
(
var
i
=
1
;
i
<=
list
.
Count
();
i
++)
{
var
member
=
list
.
Where
(
x
=>
x
.
Id
==
pId
).
FirstOrDefault
();
if
(
member
!=
null
)
{
RList
.
Add
(
new
{
Sort
=
i
,
MySelf
=
member
.
Id
==
userId2
?
true
:
false
,
UserInfo
=
new
{
member
.
Name
,
CreateDate
=
member
.
CreateDate
.
HasValue
?
member
.
CreateDate
.
Value
.
ToString
(
"yyyy-MM-dd HH:mm:ss"
)
:
""
,
member
.
Photo
}
});
pId
=
member
.
SuperiorId
??
0
;
}
else
{
break
;
}
}
}
return
ApiResult
.
Success
();
return
ApiResult
.
Success
(
""
,
RList
);
}
/// <summary>
...
...
Mall.Repository/User/RB_Member_UserRepository.cs
View file @
6742a15b
...
...
@@ -1152,5 +1152,25 @@ FROM
"
,
where
);
return
Get
<
RB_Member_User_Extend
>(
builder
.
ToString
()).
ToList
();
}
/// <summary>
/// 获取用户层级
/// </summary>
/// <param name="userId1"></param>
/// <param name="userId2"></param>
/// <returns></returns>
public
string
GetMyUserHierarchicalRelationList
(
int
userId1
,
int
userId2
)
{
string
sql
=
$@"SELECT GetMemberParentrenList_MyRelation(
{
userId1
}
,'
{
userId2
}
')"
;
var
obj
=
ExecuteScalar
(
sql
);
if
(
obj
!=
null
)
{
return
obj
.
ToString
();
}
else
{
return
""
;
}
}
}
}
Mall.WebApi/Controllers/Product/OrderController.cs
View file @
6742a15b
...
...
@@ -468,9 +468,7 @@ namespace Mall.WebApi.Controllers.MallBase
x
.
MallBaseId
,
x
.
SmallShopsId
,
x
.
SmallShopsName
,
CreateDate
=
x
.
CreateDate
.
HasValue
?
x
.
CreateDate
.
Value
.
ToString
(
"yyyy-MM-dd HH:mm:ss"
)
:
""
,
TripETime
=
x
.
TripETime
.
HasValue
?
x
.
TripETime
.
Value
.
ToString
(
"yyyy-MM-dd HH:mm:ss"
)
:
""
,
TripSTime
=
x
.
TripSTime
.
HasValue
?
x
.
TripSTime
.
Value
.
ToString
(
"yyyy-MM-dd HH:mm:ss"
)
:
""
CreateDate
=
x
.
CreateDate
.
HasValue
?
x
.
CreateDate
.
Value
.
ToString
(
"yyyy-MM-dd HH:mm:ss"
)
:
""
});
return
ApiResult
.
Success
(
""
,
pagelist
);
}
...
...
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