记得上下班打卡 | git大法好,push需谨慎
Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
liquidnet-bus-v1
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
董敬伟
liquidnet-bus-v1
Commits
8c2086db
Commit
8c2086db
authored
Jul 31, 2021
by
张国柄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
无此功能;
parent
b3ec26a9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
AdamThirdPartParam.java
...va/com/liquidnet/service/adam/dto/AdamThirdPartParam.java
+2
-2
AdamUserController.java
...liquidnet/service/adam/controller/AdamUserController.java
+5
-5
No files found.
liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/AdamThirdPartParam.java
View file @
8c2086db
...
...
@@ -30,6 +30,6 @@ public class AdamThirdPartParam implements Serializable {
private
String
mobile
;
@ApiModelProperty
(
position
=
16
,
required
=
false
,
value
=
"验证码[新账号时必传]"
)
private
String
code
;
@ApiModelProperty
(
position
=
17
,
required
=
false
,
value
=
"强制绑定[第三方账号已绑定其他手机号时]"
,
example
=
"false"
)
private
Boolean
force
;
//
@ApiModelProperty(position = 17, required = false, value = "强制绑定[第三方账号已绑定其他手机号时]", example = "false")
//
private Boolean force;
}
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamUserController.java
View file @
8c2086db
...
...
@@ -256,11 +256,11 @@ public class AdamUserController {
if
(
existUid
.
equals
(
currentUid
))
{
return
ResponseDto
.
success
(
adamRdmService
.
getThirdPartVoListByUid
(
currentUid
));
}
Boolean
force
=
parameter
.
getForce
();
if
(
null
!=
force
&&
force
)
{
// 强制解绑,并重新绑定当前账号
adamUserService
.
bindTpaForce
(
currentUid
,
existUid
,
parameter
);
return
ResponseDto
.
success
();
}
//
Boolean force = parameter.getForce();
//
if (null != force && force) {// 强制解绑,并重新绑定当前账号
//
adamUserService.bindTpaForce(currentUid, existUid, parameter);
//
return ResponseDto.success();
//
}
return
ResponseDto
.
failure
(
ErrorMapping
.
get
(
"10007"
));
}
...
...
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