Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
youka-api
Overview
Overview
Details
Activity
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
java-youka-wallet
youka-api
Commits
18f41bcf
Commit
18f41bcf
authored
Mar 19, 2018
by
Java-聂换换
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改用户
parent
4bb63613
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
91 additions
and
1 deletions
+91
-1
OrderApiController.java
src/main/java/com/thinkgem/jeesite/modules/pay/api/OrderApiController.java
+9
-0
PayApiController.java
src/main/java/com/thinkgem/jeesite/modules/pay/api/PayApiController.java
+5
-0
UserApiController.java
src/main/java/com/thinkgem/jeesite/modules/user/api/UserApiController.java
+28
-0
UserRequest.java
src/main/java/com/thinkgem/jeesite/modules/user/bean/UserRequest.java
+22
-0
UserApiDao.java
src/main/java/com/thinkgem/jeesite/modules/user/dao/UserApiDao.java
+2
-0
UserApiService.java
src/main/java/com/thinkgem/jeesite/modules/user/service/UserApiService.java
+10
-0
UserDao.xml
src/main/resources/mappings/modules/user/UserDao.xml
+15
-1
No files found.
src/main/java/com/thinkgem/jeesite/modules/pay/api/OrderApiController.java
View file @
18f41bcf
...
...
@@ -31,6 +31,11 @@ public class OrderApiController {
@Autowired
private
DictService
dictService
;
/**
* 获取订单列表
* @param request
* @return
*/
@PostMapping
(
"/getOrderList"
)
public
Response
getOrderList
(
OrderRequest
request
){
Response
res
=
new
Response
();
...
...
@@ -56,6 +61,10 @@ public class OrderApiController {
}
/**
* 获取支付方式
* @return
*/
@PostMapping
(
"/getPayMethod"
)
public
Response
getPayMethod
(){
Response
response
=
new
Response
();
...
...
src/main/java/com/thinkgem/jeesite/modules/pay/api/PayApiController.java
View file @
18f41bcf
...
...
@@ -54,6 +54,11 @@ public class PayApiController {
}
/**
* 回调
* @param request
* @param response
*/
@RequestMapping
(
"/notifyPay"
)
public
void
notifyPay
(
HttpServletRequest
request
,
HttpServletResponse
response
)
{
System
.
out
.
println
(
"。。。。。。回调。。。。。"
);
...
...
src/main/java/com/thinkgem/jeesite/modules/user/api/UserApiController.java
View file @
18f41bcf
...
...
@@ -4,6 +4,8 @@ import com.thinkgem.jeesite.common.baseBean.Response;
import
com.thinkgem.jeesite.common.constant.ComCode
;
import
com.thinkgem.jeesite.common.utils.StringUtils
;
import
com.thinkgem.jeesite.modules.commonError.MyException
;
import
com.thinkgem.jeesite.modules.img.bean.ImgRequest
;
import
com.thinkgem.jeesite.modules.sys.entity.User
;
import
com.thinkgem.jeesite.modules.user.bean.IdentityCodeRequest
;
import
com.thinkgem.jeesite.modules.user.bean.UserRequest
;
import
com.thinkgem.jeesite.modules.user.entity.IdentityCodeEntity
;
...
...
@@ -520,4 +522,30 @@ public class UserApiController {
return
resp
;
}
/**
* 修改用户信息
*
* @param request
* @return
*/
@PostMapping
(
"/modifyUser"
)
public
Response
modifyUser
(
UserRequest
request
){
Response
resp
=
new
Response
();
if
(
request
==
null
||
StringUtils
.
isBlank
(
request
.
getSubMerchantCode
())){
resp
.
setStatus
(
ComCode
.
STATUS_CODE_4001
);
resp
.
setMessage
(
ComCode
.
STATUS_CODE_4001_DESC
);
return
resp
;
}
try
{
userService
.
updateUser
(
request
);
resp
.
setStatus
(
ComCode
.
STATUS_CODE_2000
);
resp
.
setMessage
(
ComCode
.
STATUS_CODE_2000_DESC
);
}
catch
(
Exception
e
){
resp
.
setStatus
(
ComCode
.
STATUS_CODE_9998
);
resp
.
setMessage
(
ComCode
.
STATUS_CODE_9998_DESC
);
resp
.
setError
(
e
.
getMessage
());
}
return
resp
;
}
}
src/main/java/com/thinkgem/jeesite/modules/user/bean/UserRequest.java
View file @
18f41bcf
...
...
@@ -33,6 +33,12 @@ public class UserRequest extends Request {
private
String
pid
;
// 父级id
private
String
debitCardCode
;
// 结算卡code
private
String
avatar
;
private
String
nickname
;
public
String
getMobile
()
{
return
mobile
;
}
...
...
@@ -248,4 +254,20 @@ public class UserRequest extends Request {
public
void
setDebitCardCode
(
String
debitCardCode
)
{
this
.
debitCardCode
=
debitCardCode
;
}
public
String
getAvatar
()
{
return
avatar
;
}
public
void
setAvatar
(
String
avatar
)
{
this
.
avatar
=
avatar
;
}
public
String
getNickname
()
{
return
nickname
;
}
public
void
setNickname
(
String
nickname
)
{
this
.
nickname
=
nickname
;
}
}
src/main/java/com/thinkgem/jeesite/modules/user/dao/UserApiDao.java
View file @
18f41bcf
...
...
@@ -53,6 +53,8 @@ public interface UserApiDao {
void
updateUserInfo
(
UserEntity
userEntity
);
void
updateUser
(
UserRequest
userRequest
);
RateEntity
getRateByLevel
(
RateEntity
rateEntityParam
);
List
<
UserEntity
>
getUserInfoBySameRecommend
(
UserEntity
queryUserRecommendEntity
);
...
...
src/main/java/com/thinkgem/jeesite/modules/user/service/UserApiService.java
View file @
18f41bcf
...
...
@@ -353,4 +353,14 @@ public class UserApiService {
public
CardEntity
getDebitCardByUserCode
(
UserRequest
request
){
return
userDao
.
getDebitCardByUserCode
(
request
);
}
@Transactional
(
readOnly
=
false
)
public
void
updateUser
(
UserRequest
request
){
if
(
StringUtils
.
isNotBlank
(
request
.
getAvatar
())){
request
.
setAvatar
(
StringUtils
.
replace
(
request
.
getAvatar
(),
Global
.
getConfig
(
"image.save.url"
),
""
));
}
userDao
.
updateUser
(
request
);
}
}
src/main/resources/mappings/modules/user/UserDao.xml
View file @
18f41bcf
...
...
@@ -399,7 +399,20 @@
</if>
WHERE code = #{code}
</update>
<update
id=
"updateUser"
>
UPDATE youka_users
SET code = #{subMerchantCode}
<if
test=
"avatar != null and avatar !=''"
>
, avatar = #{avatar}
</if>
<if
test=
"mobile != null and mobile !=''"
>
, mobile = #{mobile}
</if>
<if
test=
"nickname != null and nickname !=''"
>
, nickname = #{nickname}
</if>
WHERE code = #{subMerchantCode}
</update>
<select
id=
"getRateByLevel"
resultType=
"com.thinkgem.jeesite.modules.pay.entity.RateEntity"
>
SELECT
yr.id,
...
...
@@ -528,6 +541,7 @@
code = #{debitCardCode}
</update>
<select
id=
"getDebitCard"
resultType=
"com.thinkgem.jeesite.modules.user.entity.CardEntity"
>
SELECT
yc.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