Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
cloud-platform
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
youjj
cloud-platform
Commits
2ad42c9e
Commit
2ad42c9e
authored
Oct 21, 2019
by
libin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
支付宝绑定
parent
c3118259
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
2 deletions
+12
-2
AppUserVo.java
.../java/com/github/wxiaoqi/security/admin/vo/AppUserVo.java
+2
-1
AppUserController.java
...github/wxiaoqi/security/admin/rest/AppUserController.java
+10
-1
No files found.
ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/vo/AppUserVo.java
View file @
2ad42c9e
...
...
@@ -84,5 +84,6 @@ public class AppUserVo {
@ApiModelProperty
(
value
=
"1-未激活;2-激活:"
)
private
Integer
state
;
@ApiModelProperty
(
value
=
"支付宝授权返回的code"
)
private
String
aliCode
;
}
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/AppUserController.java
View file @
2ad42c9e
...
...
@@ -22,6 +22,7 @@ import com.xxfc.platform.order.feign.OrderFeign;
import
io.swagger.annotations.ApiOperation
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.commons.beanutils.BeanUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.*
;
...
...
@@ -69,6 +70,9 @@ public class AppUserController extends CommonBaseController{
@Autowired
private
OrderFeign
orderFeign
;
@Autowired
private
AppUserAlipayBiz
appUserAlipayBiz
;
@GetMapping
(
"page"
)
...
...
@@ -198,7 +202,7 @@ public class AppUserController extends CommonBaseController{
* @throws Exception
*/
@PostMapping
(
"/edit"
)
public
ObjectRestResponse
edit
(
@RequestBody
AppUserVo
userVo
)
throws
Exception
{
public
ObjectRestResponse
edit
(
@RequestBody
AppUserVo
userVo
,
HttpServletRequest
request
)
throws
Exception
{
if
(
userVo
==
null
||
userVo
.
getId
()==
null
){
return
ObjectRestResponse
.
createFailedResult
(
ResultCode
.
NULL_CODE
,
"参数为空"
);
}
...
...
@@ -212,7 +216,12 @@ public class AppUserController extends CommonBaseController{
appUserLogin
.
setId
(
userid
);
appUserLogin
.
setUsername
(
userVo
.
getUsername
());
appUserLoginBiz
.
bindOpenid
(
appUserLogin
);
//支付宝绑定
if
(
StringUtils
.
isNotEmpty
(
userVo
.
getAliCode
())
&&
userVo
.
getAliCode
().
trim
().
length
()>
0
){
appUserAlipayBiz
.
getUserInfo
(
userVo
.
getAliCode
(),
request
);
}
}
return
ObjectRestResponse
.
succ
();
}
...
...
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