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
d6921e0e
Commit
d6921e0e
authored
Mar 16, 2022
by
liudong1993
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
633b55ee
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
AppletLoginController.cs
Mall.WebApi/Controllers/User/AppletLoginController.cs
+5
-5
No files found.
Mall.WebApi/Controllers/User/AppletLoginController.cs
View file @
d6921e0e
...
@@ -303,7 +303,7 @@ namespace Mall.WebApi.Controllers.User
...
@@ -303,7 +303,7 @@ namespace Mall.WebApi.Controllers.User
try
try
{
{
//教育 甲小鹤跳转至甲鹤小程序 自动绑定账号信息
//教育 甲小鹤跳转至甲鹤小程序 自动绑定账号信息
var
eduModel
=
activityModule
.
GetEducationSell
BaseInfo
(
new
Model
.
Extend
.
Education
.
RB_Education_EduSell_Extend
{
TenantId
=
demodel
.
TenantId
,
MallBaseId
=
demodel
.
MallBaseId
,
EduSellId
=
EduId
}).
FirstOrDefault
();
var
eduModel
=
activityModule
.
GetEducationSell
List
(
new
Model
.
Extend
.
Education
.
RB_Education_EduSell_Extend
{
TenantId
=
demodel
.
TenantId
,
MallBaseId
=
demodel
.
MallBaseId
,
EduSellId
=
EduId
}).
FirstOrDefault
();
if
(
eduModel
!=
null
&&
eduModel
.
UserId
!=
UserId
)
if
(
eduModel
!=
null
&&
eduModel
.
UserId
!=
UserId
)
{
{
LogHelper
.
Write
(
"账户已绑定其他用户(甲小鹤跳甲鹤自动绑学员账号)EduId:"
+
EduId
+
",UserId:"
+
UserId
);
LogHelper
.
Write
(
"账户已绑定其他用户(甲小鹤跳甲鹤自动绑学员账号)EduId:"
+
EduId
+
",UserId:"
+
UserId
);
...
@@ -448,12 +448,12 @@ namespace Mall.WebApi.Controllers.User
...
@@ -448,12 +448,12 @@ namespace Mall.WebApi.Controllers.User
}
}
UserReidsCache
.
AppletUserInfoSet
(
UserModuleCacheKeyConfig
.
Applet_Login_Info
+
umodel
.
Id
,
appletUserInfo
,
Config
.
JwtExpirTime
);
UserReidsCache
.
AppletUserInfoSet
(
UserModuleCacheKeyConfig
.
Applet_Login_Info
+
umodel
.
Id
,
appletUserInfo
,
Config
.
JwtExpirTime
);
if
(
EduId
>
0
&&
de
model
.
MallBaseId
==
5
)
if
(
EduId
>
0
&&
u
model
.
MallBaseId
==
5
)
{
{
try
try
{
{
//教育 甲小鹤跳转至甲鹤小程序 自动绑定账号信息
//教育 甲小鹤跳转至甲鹤小程序 自动绑定账号信息
var
eduModel
=
activityModule
.
GetEducationSell
BaseInfo
(
new
Model
.
Extend
.
Education
.
RB_Education_EduSell_Extend
{
TenantId
=
demodel
.
TenantId
,
MallBaseId
=
de
model
.
MallBaseId
,
EduSellId
=
EduId
}).
FirstOrDefault
();
var
eduModel
=
activityModule
.
GetEducationSell
List
(
new
Model
.
Extend
.
Education
.
RB_Education_EduSell_Extend
{
TenantId
=
umodel
.
TenantId
,
MallBaseId
=
u
model
.
MallBaseId
,
EduSellId
=
EduId
}).
FirstOrDefault
();
if
(
eduModel
!=
null
&&
eduModel
.
UserId
!=
umodel
.
Id
)
if
(
eduModel
!=
null
&&
eduModel
.
UserId
!=
umodel
.
Id
)
{
{
LogHelper
.
Write
(
"账户已绑定其他用户(甲小鹤跳甲鹤自动绑学员账号)EduId:"
+
EduId
+
",UserId:"
+
umodel
.
Id
);
LogHelper
.
Write
(
"账户已绑定其他用户(甲小鹤跳甲鹤自动绑学员账号)EduId:"
+
EduId
+
",UserId:"
+
umodel
.
Id
);
...
@@ -465,8 +465,8 @@ namespace Mall.WebApi.Controllers.User
...
@@ -465,8 +465,8 @@ namespace Mall.WebApi.Controllers.User
eduModel
=
new
Model
.
Extend
.
Education
.
RB_Education_EduSell_Extend
eduModel
=
new
Model
.
Extend
.
Education
.
RB_Education_EduSell_Extend
{
{
Id
=
0
,
Id
=
0
,
TenantId
=
de
model
.
TenantId
,
TenantId
=
u
model
.
TenantId
,
MallBaseId
=
de
model
.
MallBaseId
,
MallBaseId
=
u
model
.
MallBaseId
,
CreateDate
=
DateTime
.
Now
,
CreateDate
=
DateTime
.
Now
,
Status
=
0
,
Status
=
0
,
UserId
=
umodel
.
Id
,
UserId
=
umodel
.
Id
,
...
...
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