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
57766cba
Commit
57766cba
authored
Jul 02, 2019
by
hezhen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
123
parent
4a857c6d
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
8 deletions
+13
-8
AdminBootstrap.java
...ava/com/github/wxiaoqi/security/admin/AdminBootstrap.java
+2
-0
BaseUserMemberBiz.java
.../github/wxiaoqi/security/admin/biz/BaseUserMemberBiz.java
+11
-8
No files found.
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/AdminBootstrap.java
View file @
57766cba
...
@@ -8,6 +8,7 @@ import org.springframework.boot.builder.SpringApplicationBuilder;
...
@@ -8,6 +8,7 @@ import org.springframework.boot.builder.SpringApplicationBuilder;
import
org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker
;
import
org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker
;
import
org.springframework.cloud.client.discovery.EnableDiscoveryClient
;
import
org.springframework.cloud.client.discovery.EnableDiscoveryClient
;
import
org.springframework.cloud.openfeign.EnableFeignClients
;
import
org.springframework.cloud.openfeign.EnableFeignClients
;
import
org.springframework.context.annotation.EnableAspectJAutoProxy
;
import
org.springframework.scheduling.annotation.EnableScheduling
;
import
org.springframework.scheduling.annotation.EnableScheduling
;
import
org.springframework.transaction.annotation.EnableTransactionManagement
;
import
org.springframework.transaction.annotation.EnableTransactionManagement
;
import
tk.mybatis.spring.annotation.MapperScan
;
import
tk.mybatis.spring.annotation.MapperScan
;
...
@@ -29,6 +30,7 @@ import tk.mybatis.spring.annotation.MapperScan;
...
@@ -29,6 +30,7 @@ import tk.mybatis.spring.annotation.MapperScan;
@EnableAceCache
@EnableAceCache
@EnableTransactionManagement
@EnableTransactionManagement
@MapperScan
(
"com.github.wxiaoqi.security.admin.mapper"
)
@MapperScan
(
"com.github.wxiaoqi.security.admin.mapper"
)
@EnableAspectJAutoProxy
(
proxyTargetClass
=
true
,
exposeProxy
=
true
)
//@EnableSwagger2Doc
//@EnableSwagger2Doc
public
class
AdminBootstrap
{
public
class
AdminBootstrap
{
public
static
void
main
(
String
[]
args
)
{
public
static
void
main
(
String
[]
args
)
{
...
...
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/BaseUserMemberBiz.java
View file @
57766cba
...
@@ -7,6 +7,7 @@ import com.github.wxiaoqi.security.admin.vo.AppUserVo;
...
@@ -7,6 +7,7 @@ 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
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.commons.beanutils.BeanUtils
;
import
org.apache.commons.beanutils.BeanUtils
;
import
org.springframework.aop.framework.AopContext
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
com.github.wxiaoqi.security.admin.entity.BaseUserMember
;
import
com.github.wxiaoqi.security.admin.entity.BaseUserMember
;
...
@@ -37,7 +38,7 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper,BaseUserMemb
...
@@ -37,7 +38,7 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper,BaseUserMemb
//更新会员信息
//更新会员信息
@Override
@Override
@CacheClear
(
pre
=
"user:member{1.userId}"
)
@CacheClear
(
key
=
"user:member{1.userId}"
)
public
void
updateSelectiveById
(
BaseUserMember
userMember
){
super
.
updateSelectiveById
(
userMember
);}
public
void
updateSelectiveById
(
BaseUserMember
userMember
){
super
.
updateSelectiveById
(
userMember
);}
...
@@ -67,7 +68,7 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper,BaseUserMemb
...
@@ -67,7 +68,7 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper,BaseUserMemb
baseUserMember
.
setBuyCount
(
userMemberVo
.
getBuyCount
()+
1
);
baseUserMember
.
setBuyCount
(
userMemberVo
.
getBuyCount
()+
1
);
baseUserMember
.
setTotalNumber
(
totalNumber
);
baseUserMember
.
setTotalNumber
(
totalNumber
);
baseUserMember
.
setRentFreeDays
(
freeDays
);
baseUserMember
.
setRentFreeDays
(
freeDays
);
updateSelectiveById
(
baseUserMember
);
getMyBiz
().
updateSelectiveById
(
baseUserMember
);
}
}
AppUserVo
userVo
=
detailBiz
.
getUserInfoById
(
userId
);
AppUserVo
userVo
=
detailBiz
.
getUserInfoById
(
userId
);
if
(
userVo
!=
null
&&(
userVo
.
getIsMember
()==
null
||
userVo
.
getIsMember
()==
0
)){
if
(
userVo
!=
null
&&(
userVo
.
getIsMember
()==
null
||
userVo
.
getIsMember
()==
0
)){
...
@@ -106,7 +107,7 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper,BaseUserMemb
...
@@ -106,7 +107,7 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper,BaseUserMemb
if
(
freeDays
>
0
&&
freeDays
>=
days
){
if
(
freeDays
>
0
&&
freeDays
>=
days
){
freeDays
=
freeDays
-
days
;
freeDays
=
freeDays
-
days
;
baseUserMember
.
setRentFreeDays
(
freeDays
);
baseUserMember
.
setRentFreeDays
(
freeDays
);
updateSelectiveById
(
baseUserMember
);
getMyBiz
().
updateSelectiveById
(
baseUserMember
);
num
=
freeDays
;
num
=
freeDays
;
}
}
}
else
if
(
type
==
2
){
}
else
if
(
type
==
2
){
...
@@ -122,17 +123,17 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper,BaseUserMemb
...
@@ -122,17 +123,17 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper,BaseUserMemb
Integer
payCount
=
userMemberVo
.
getPayCount
()==
null
?
0
:
userMemberVo
.
getPayCount
();
Integer
payCount
=
userMemberVo
.
getPayCount
()==
null
?
0
:
userMemberVo
.
getPayCount
();
payCount
=
payCount
+
1
;
payCount
=
payCount
+
1
;
baseUserMember
.
setPayCount
(
payCount
);
baseUserMember
.
setPayCount
(
payCount
);
updateSelectiveById
(
baseUserMember
);
getMyBiz
().
updateSelectiveById
(
baseUserMember
);
num
=
freeDays
;
num
=
freeDays
;
}
else
{
}
else
{
/*lockDays=lockDays>0?(lockDays-days)>0?(lockDays-days):0:0;
/*lockDays=lockDays>0?(lockDays-days)>0?(lockDays-days):0:0;
baseUserMember.setLockDays(lockDays);
baseUserMember.setLockDays(lockDays);
updateSelectiveById(baseUserMember);
getMyBiz().
updateSelectiveById(baseUserMember);
num=freeDays-lockDays;*/
num=freeDays-lockDays;*/
freeDays
=(
freeDays
+
days
)>
0
?(
freeDays
+
days
):
0
;
freeDays
=(
freeDays
+
days
)>
0
?(
freeDays
+
days
):
0
;
freeDays
=
freeDays
>
totalNumber
?
totalNumber:
freeDays
;
freeDays
=
freeDays
>
totalNumber
?
totalNumber:
freeDays
;
baseUserMember
.
setRentFreeDays
(
freeDays
);
baseUserMember
.
setRentFreeDays
(
freeDays
);
updateSelectiveById
(
baseUserMember
);
getMyBiz
().
updateSelectiveById
(
baseUserMember
);
num
=
freeDays
;
num
=
freeDays
;
}
}
...
@@ -140,7 +141,9 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper,BaseUserMemb
...
@@ -140,7 +141,9 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper,BaseUserMemb
return
num
;
return
num
;
}
}
private
BaseUserMemberBiz
getMyBiz
()
{
return
AopContext
.
currentProxy
()
!=
null
?
(
BaseUserMemberBiz
)
AopContext
.
currentProxy
()
:
this
;
}
}
}
\ No newline at end of file
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