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
4016e9c7
Commit
4016e9c7
authored
Jan 06, 2020
by
libin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
会员导入添加核销时间
parent
132197a5
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
4 deletions
+14
-4
BaseUserMemberExport.java
...b/wxiaoqi/security/admin/entity/BaseUserMemberExport.java
+5
-0
BaseUserMemberExportBiz.java
...b/wxiaoqi/security/admin/biz/BaseUserMemberExportBiz.java
+6
-2
BaseUserMemberExportMapper.java
...oqi/security/admin/mapper/BaseUserMemberExportMapper.java
+1
-1
BaseUserMemberExportMapper.xml
.../src/main/resources/mapper/BaseUserMemberExportMapper.xml
+2
-1
No files found.
ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/BaseUserMemberExport.java
View file @
4016e9c7
...
...
@@ -48,6 +48,11 @@ public class BaseUserMemberExport implements Serializable {
private
Integer
beforeDiscount
;
@Column
(
name
=
"source"
)
private
Integer
source
;
/**
* 核销时间
*/
@Column
(
name
=
"verification_time"
)
private
Long
verificationTime
;
}
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/BaseUserMemberExportBiz.java
View file @
4016e9c7
...
...
@@ -91,6 +91,7 @@ public class BaseUserMemberExportBiz extends BaseBiz<BaseUserMemberExportMapper,
.
crtId
(
userId
)
.
crtName
(
name
)
.
crtTime
(
Instant
.
now
().
toEpochMilli
())
.
verificationTime
(
hasUsed
?
Instant
.
now
().
toEpochMilli
():
0
)
.
isDel
(
0
)
.
build
();
if
(
log
.
isDebugEnabled
())
{
...
...
@@ -198,6 +199,7 @@ public class BaseUserMemberExportBiz extends BaseBiz<BaseUserMemberExportMapper,
.
memberName
(
memberName
)
.
crtName
(
userName
)
.
crtTime
(
Instant
.
now
().
toEpochMilli
())
.
verificationTime
(
hasUsed
?
Instant
.
now
().
toEpochMilli
():
null
)
.
isDel
(
0
)
.
build
();
if
(
log
.
isDebugEnabled
())
{
...
...
@@ -209,7 +211,9 @@ public class BaseUserMemberExportBiz extends BaseBiz<BaseUserMemberExportMapper,
@Transactional
(
rollbackFor
=
Exception
.
class
,
propagation
=
Propagation
.
REQUIRED
)
public
void
InsertBatch
(
List
<
BaseUserMemberExport
>
baseUserMemberExports
)
{
mapper
.
insertList
(
baseUserMemberExports
);
for
(
BaseUserMemberExport
userMemberExport
:
baseUserMemberExports
)
{
mapper
.
insertSelective
(
userMemberExport
);
}
}
public
List
<
BaseUserMemberExportDTO
>
findUserMemberExportDataByPhoneAndHashEffective
(
String
phone
)
{
...
...
@@ -235,7 +239,7 @@ public class BaseUserMemberExportBiz extends BaseBiz<BaseUserMemberExportMapper,
@Transactional
(
rollbackFor
=
Exception
.
class
,
propagation
=
Propagation
.
REQUIRED
)
public
void
updateUserMemberExportDataToLoseEfficacyByPhone
(
String
phone
,
Integer
userId
)
{
mapper
.
updateUserMemberExportDataToLoseEfficacyByPhone
(
phone
,
userId
);
mapper
.
updateUserMemberExportDataToLoseEfficacyByPhone
(
phone
,
userId
,
Instant
.
now
().
toEpochMilli
()
);
}
public
PageDataVO
<
BaseUserMemberExportVo
>
findUserMemberExportDataPage
(
BaseUserMemberExportDataFindDTO
exportDataFindDTO
)
{
...
...
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/mapper/BaseUserMemberExportMapper.java
View file @
4016e9c7
...
...
@@ -18,7 +18,7 @@ import java.util.List;
public
interface
BaseUserMemberExportMapper
extends
Mapper
<
BaseUserMemberExport
>,
InsertListMapper
<
BaseUserMemberExport
>
{
void
updateUserMemberExportDataToLoseEfficacyByPhone
(
@Param
(
"phone"
)
String
phone
,
@Param
(
"userId"
)
Integer
userId
);
void
updateUserMemberExportDataToLoseEfficacyByPhone
(
@Param
(
"phone"
)
String
phone
,
@Param
(
"userId"
)
Integer
userId
,
@Param
(
"time"
)
Long
time
);
List
<
BaseUserMemberExportDTO
>
findExportDataPage
(
BaseUserMemberExportDataFindDTO
exportDataFindDTO
);
...
...
ace-modules/ace-admin/src/main/resources/mapper/BaseUserMemberExportMapper.xml
View file @
4016e9c7
...
...
@@ -14,10 +14,11 @@
<result
property=
"crtName"
column=
"crt_name"
/>
<result
property=
"crtTime"
column=
"crt_time"
/>
<result
property=
"userId"
column=
"user_id"
/>
<result
property=
"verificationTime"
column=
"verification_time"
/>
</resultMap>
<update
id=
"updateUserMemberExportDataToLoseEfficacyByPhone"
>
update `base_user_member_export` set `status`=1,`user_id`=#{userId} where `username`=#{phone}
update `base_user_member_export` set `status`=1,`user_id`=#{userId}
,`verification_time`=#{time}
where `username`=#{phone}
</update>
<select
id=
"findExportDataPage"
resultType=
"com.github.wxiaoqi.security.admin.dto.BaseUserMemberExportDTO"
>
...
...
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