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
a130fc2a
Commit
a130fc2a
authored
Jan 08, 2020
by
libin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
会员新增前后空格处理
parent
fb7844a3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
0 deletions
+7
-0
UserMemberSaveDTO.java
.../github/wxiaoqi/security/admin/dto/UserMemberSaveDTO.java
+5
-0
BaseUserMemberExportBiz.java
...b/wxiaoqi/security/admin/biz/BaseUserMemberExportBiz.java
+2
-0
No files found.
ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/UserMemberSaveDTO.java
View file @
a130fc2a
...
...
@@ -2,6 +2,7 @@ package com.github.wxiaoqi.security.admin.dto;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
org.springframework.util.StringUtils
;
/**
* @author libin
...
...
@@ -43,4 +44,8 @@ public class UserMemberSaveDTO {
*/
@ApiModelProperty
(
value
=
"剩余天数"
)
private
Integer
source
;
public
String
getPhone
()
{
return
StringUtils
.
hasText
(
phone
)?
phone
.
trim
():
""
;
}
}
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/BaseUserMemberExportBiz.java
View file @
a130fc2a
...
...
@@ -88,6 +88,7 @@ public class BaseUserMemberExportBiz extends BaseBiz<BaseUserMemberExportMapper,
.
discount
(
level
==
null
?
0
:
level
.
getDiscount
()
==
null
?
0
:
level
.
getDiscount
())
.
status
(
hasUsed
?
1
:
0
)
.
userId
(
hasUsed
?
phoneAndUserIdMap
.
get
(
userMemberSaveDTO
.
getPhone
()):
null
)
.
source
(
0
)
.
crtId
(
userId
)
.
crtName
(
name
)
.
crtTime
(
Instant
.
now
().
toEpochMilli
())
...
...
@@ -196,6 +197,7 @@ public class BaseUserMemberExportBiz extends BaseBiz<BaseUserMemberExportMapper,
.
userId
(
hasUsed
?
phoneAndUserIdMap
.
get
(
phone
):
null
)
.
crtId
(
userId
)
.
memberName
(
memberName
)
.
source
(
0
)
.
crtName
(
userName
)
.
crtTime
(
Instant
.
now
().
toEpochMilli
())
.
isDel
(
0
)
...
...
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