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
f3cb8537
Commit
f3cb8537
authored
Sep 27, 2019
by
hanfeng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改会员列表
parent
8e7b6ad6
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
29 additions
and
6 deletions
+29
-6
BaseUserMemberBiz.java
.../github/wxiaoqi/security/admin/biz/BaseUserMemberBiz.java
+27
-6
BaseUserMemberLevelMapper.java
...aoqi/security/admin/mapper/BaseUserMemberLevelMapper.java
+2
-0
No files found.
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/BaseUserMemberBiz.java
View file @
f3cb8537
...
@@ -4,6 +4,8 @@ import com.ace.cache.annotation.Cache;
...
@@ -4,6 +4,8 @@ import com.ace.cache.annotation.Cache;
import
com.ace.cache.annotation.CacheClear
;
import
com.ace.cache.annotation.CacheClear
;
import
com.github.wxiaoqi.security.admin.dto.BaseUserMemberVO
;
import
com.github.wxiaoqi.security.admin.dto.BaseUserMemberVO
;
import
com.github.wxiaoqi.security.admin.dto.UserMemberDTO
;
import
com.github.wxiaoqi.security.admin.dto.UserMemberDTO
;
import
com.github.wxiaoqi.security.admin.entity.BaseUserMemberLevel
;
import
com.github.wxiaoqi.security.admin.mapper.BaseUserMemberLevelMapper
;
import
com.github.wxiaoqi.security.admin.vo.AppUserVo
;
import
com.github.wxiaoqi.security.admin.vo.AppUserVo
;
import
com.github.wxiaoqi.security.admin.vo.UserMemberVo
;
import
com.github.wxiaoqi.security.admin.vo.UserMemberVo
;
import
com.github.wxiaoqi.security.common.exception.BaseException
;
import
com.github.wxiaoqi.security.common.exception.BaseException
;
...
@@ -43,6 +45,9 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper, BaseUserMem
...
@@ -43,6 +45,9 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper, BaseUserMem
@Autowired
@Autowired
AppUserDetailBiz
detailBiz
;
AppUserDetailBiz
detailBiz
;
@Autowired
private
BaseUserMemberLevelMapper
BaseUserMemberLevelMapper
;
// @Autowired
// @Autowired
// private TaskExecutor taskExecutor;
// private TaskExecutor taskExecutor;
//
//
...
@@ -213,7 +218,6 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper, BaseUserMem
...
@@ -213,7 +218,6 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper, BaseUserMem
}
}
/**
/**
* 设置用户会员
* 设置用户会员
*
*
...
@@ -230,7 +234,25 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper, BaseUserMem
...
@@ -230,7 +234,25 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper, BaseUserMem
if
(
totalNumber
<
freeDays
)
{
if
(
totalNumber
<
freeDays
)
{
freeDays
=
totalNumber
;
freeDays
=
totalNumber
;
}
}
Integer
buyCount
=
userMemberDTO
.
getBuyCount
()
==
null
?
1
:
userMemberDTO
.
getBuyCount
()
;
if
(
userMemberDTO
.
getMemberLevel
()
!=
null
)
{
Example
exa
=
new
Example
(
BaseUserMember
.
class
);
Example
.
Criteria
criteria
=
exa
.
createCriteria
();
criteria
.
andEqualTo
(
"isDel"
,
0
);
criteria
.
andEqualTo
(
userMemberDTO
.
getMemberLevel
());
List
<
BaseUserMemberLevel
>
levels
=
BaseUserMemberLevelMapper
.
selectByExample
(
exa
);
if
(
CollectionUtils
.
isEmpty
(
levels
))
{
log
.
error
(
"错误!设置的该等级会员不存在."
);
throw
new
BaseException
(
"错误!设置的该等级会员不存在。"
);
}
else
if
(
levels
.
size
()>
1
){
log
.
error
(
"错误!该等级的会员存在多个。"
);
throw
new
BaseException
(
"错误!该等级的会员存在多个。"
);
}
else
{
baseUserMember
.
setDiscount
(
levels
.
get
(
0
).
getDiscount
());
}
}
Integer
buyCount
=
userMemberDTO
.
getBuyCount
()
==
null
?
1
:
userMemberDTO
.
getBuyCount
();
UserMemberVo
userMemberVo
=
getMemberInfoByUserId
(
userMemberDTO
.
getUserId
());
UserMemberVo
userMemberVo
=
getMemberInfoByUserId
(
userMemberDTO
.
getUserId
());
if
(
userMemberVo
==
null
)
{
if
(
userMemberVo
==
null
)
{
baseUserMember
.
setRentFreeDays
(
freeDays
);
baseUserMember
.
setRentFreeDays
(
freeDays
);
...
@@ -241,8 +263,8 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper, BaseUserMem
...
@@ -241,8 +263,8 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper, BaseUserMem
Integer
number
=
userMemberVo
.
getTotalNumber
()
==
null
?
0
:
userMemberVo
.
getTotalNumber
();
Integer
number
=
userMemberVo
.
getTotalNumber
()
==
null
?
0
:
userMemberVo
.
getTotalNumber
();
Integer
days
=
userMemberVo
.
getRentFreeDays
()
==
null
?
0
:
userMemberVo
.
getRentFreeDays
();
Integer
days
=
userMemberVo
.
getRentFreeDays
()
==
null
?
0
:
userMemberVo
.
getRentFreeDays
();
baseUserMember
.
setBuyCount
(
userMemberVo
.
getBuyCount
()
+
buyCount
);
baseUserMember
.
setBuyCount
(
userMemberVo
.
getBuyCount
()
+
buyCount
);
number
=(
totalNumber
-
number
)+
number
;
number
=
(
totalNumber
-
number
)
+
number
;
days
=(
freeDays
-
days
)+
days
;
days
=
(
freeDays
-
days
)
+
days
;
baseUserMember
.
setTotalNumber
(
number
);
baseUserMember
.
setTotalNumber
(
number
);
baseUserMember
.
setRentFreeDays
(
days
);
baseUserMember
.
setRentFreeDays
(
days
);
getMyBiz
().
updateSelectiveById
(
baseUserMember
);
getMyBiz
().
updateSelectiveById
(
baseUserMember
);
...
@@ -255,14 +277,13 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper, BaseUserMem
...
@@ -255,14 +277,13 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper, BaseUserMem
userVo1
.
setIsMember
(
1
);
userVo1
.
setIsMember
(
1
);
detailBiz
.
updUuserInfoById
(
userVo1
);
detailBiz
.
updUuserInfoById
(
userVo1
);
}
}
}
}
public
void
deleteByUserIds
(
Collection
<
Integer
>
userIds
)
{
public
void
deleteByUserIds
(
Collection
<
Integer
>
userIds
)
{
Example
example
=
new
Example
(
BaseUserMember
.
class
);
Example
example
=
new
Example
(
BaseUserMember
.
class
);
Example
.
Criteria
criteria
=
example
.
createCriteria
();
Example
.
Criteria
criteria
=
example
.
createCriteria
();
criteria
.
andIn
(
"userId"
,
userIds
);
criteria
.
andIn
(
"userId"
,
userIds
);
mapper
.
deleteByExample
(
example
);
mapper
.
deleteByExample
(
example
);
}
}
}
}
\ No newline at end of file
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/mapper/BaseUserMemberLevelMapper.java
View file @
f3cb8537
...
@@ -2,6 +2,7 @@ package com.github.wxiaoqi.security.admin.mapper;
...
@@ -2,6 +2,7 @@ package com.github.wxiaoqi.security.admin.mapper;
import
com.github.wxiaoqi.security.admin.entity.BaseUserMemberLevel
;
import
com.github.wxiaoqi.security.admin.entity.BaseUserMemberLevel
;
import
org.apache.ibatis.annotations.Param
;
import
org.apache.ibatis.annotations.Param
;
import
org.apache.ibatis.annotations.Select
;
import
org.apache.ibatis.annotations.Select
;
import
org.springframework.stereotype.Repository
;
import
tk.mybatis.mapper.common.Mapper
;
import
tk.mybatis.mapper.common.Mapper
;
import
java.util.List
;
import
java.util.List
;
...
@@ -13,6 +14,7 @@ import java.util.List;
...
@@ -13,6 +14,7 @@ import java.util.List;
* @email nishijjo@qq.com
* @email nishijjo@qq.com
* @date 2019-06-11 11:06:45
* @date 2019-06-11 11:06:45
*/
*/
@Repository
public
interface
BaseUserMemberLevelMapper
extends
Mapper
<
BaseUserMemberLevel
>
{
public
interface
BaseUserMemberLevelMapper
extends
Mapper
<
BaseUserMemberLevel
>
{
List
<
BaseUserMemberLevel
>
selectUserMembersLevelByLevels
(
@Param
(
"levels"
)
List
<
Integer
>
levels
);
List
<
BaseUserMemberLevel
>
selectUserMembersLevelByLevels
(
@Param
(
"levels"
)
List
<
Integer
>
levels
);
...
...
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