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
9e0ee2f6
Commit
9e0ee2f6
authored
Aug 27, 2020
by
吴春
Browse files
Options
Browse Files
Download
Plain Diff
解决冲突
parents
dd1ced72
8fd8dd70
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
4 deletions
+16
-4
MiniProgramMsgModule.cs
Mall.Module.User/MiniProgramMsgModule.cs
+1
-1
UserModule.cs
Mall.Module.User/UserModule.cs
+3
-2
AppletUserController.cs
Mall.WebApi/Controllers/User/AppletUserController.cs
+12
-1
No files found.
Mall.Module.User/MiniProgramMsgModule.cs
View file @
9e0ee2f6
...
...
@@ -185,7 +185,7 @@ namespace Mall.Module.User
}
else
{
LogHelper
.
Write
(
string
.
Format
(
"SendOrderSucceedMsg:wenXinResult:{0}"
,
wenXinResult
));
LogHelper
.
Write
Info
(
string
.
Format
(
"SendOrderSucceedMsg:wenXinResult:{0}"
,
wenXinResult
));
}
}
return
false
;
...
...
Mall.Module.User/UserModule.cs
View file @
9e0ee2f6
...
...
@@ -4004,8 +4004,9 @@ namespace Mall.Module.User
/// <param name="pageSize"></param>
/// <param name="count"></param>
/// <param name="demodel"></param>
/// <param name="NewUserId"></param>
/// <returns></returns>
public
object
GetUserMyTeamPageListForFX
(
int
pageIndex
,
int
pageSize
,
out
long
count
,
RB_Distributor_Info_Extend
demodel
)
public
object
GetUserMyTeamPageListForFX
(
int
pageIndex
,
int
pageSize
,
out
long
count
,
RB_Distributor_Info_Extend
demodel
,
int
NewUserId
=
0
)
{
string
UserIds
=
member_UserRepository
.
GetMemberChildIdStr
(
demodel
.
UserId
??
0
);
...
...
@@ -4028,7 +4029,7 @@ namespace Mall.Module.User
//获取消费金额 + 订单数量
var
oList
=
goods_OrderRepository
.
GetUserOrderNumAndMoney
(
userIds
,
demodel
.
TenantId
,
demodel
.
MallBaseId
);
foreach
(
var
item
in
list
)
foreach
(
var
item
in
list
.
Where
(
qitem
=>
qitem
.
Id
!=
NewUserId
)
)
{
int
tgNum
=
tList
.
Where
(
x
=>
x
.
SuperiorId
==
item
.
Id
).
FirstOrDefault
()?.
ReferralsNum
??
0
;
var
orderModel
=
oList
.
Where
(
x
=>
x
.
UserId
==
item
.
Id
).
FirstOrDefault
();
...
...
Mall.WebApi/Controllers/User/AppletUserController.cs
View file @
9e0ee2f6
...
...
@@ -690,8 +690,19 @@ namespace Mall.WebApi.Controllers.User
demodel
.
TenantId
=
userInfo
.
TenantId
;
demodel
.
MallBaseId
=
userInfo
.
MallBaseId
;
demodel
.
UserId
=
userInfo
.
UserId
;
//var list = userModule.GetUserMyTeamPageListForFX(pageModel.pageIndex, pageModel.pageSize, out long count, demodel);
var
list
=
userModule
.
GetUserMyTeamPageListForFX
(
pageModel
.
pageIndex
,
pageModel
.
pageSize
,
out
long
count
,
demodel
);
int
NewUserId
=
0
;
//HK 2020-08-27新增
JObject
parms
=
JObject
.
Parse
(
req
.
msg
.
ToString
());
if
(
parms
.
GetInt
(
"NewUserId"
)
>
0
)
{
demodel
.
UserId
=
parms
.
GetInt
(
"NewUserId"
);
NewUserId
=
parms
.
GetInt
(
"NewUserId"
);
}
var
list
=
userModule
.
GetUserMyTeamPageListForFX
(
pageModel
.
pageIndex
,
pageModel
.
pageSize
,
out
long
count
,
demodel
,
NewUserId
:
NewUserId
);
pageModel
.
count
=
Convert
.
ToInt32
(
count
);
pageModel
.
pageData
=
list
;
...
...
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