记得上下班打卡 | git大法好,push需谨慎
Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
liquidnet-bus-v1
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
董敬伟
liquidnet-bus-v1
Commits
7b2f5e84
Commit
7b2f5e84
authored
Jul 30, 2021
by
张国柄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:去除MONGO,入场人、收获地址添加不了;
parent
0fdf2daf
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
21 additions
and
13 deletions
+21
-13
AdamEntersController.java
...quidnet/service/adam/controller/AdamEntersController.java
+5
-3
AdamRdmService.java
...va/com/liquidnet/service/adam/service/AdamRdmService.java
+5
-2
AdamAddressesServiceImpl.java
...t/service/adam/service/impl/AdamAddressesServiceImpl.java
+4
-2
AdamEntersServiceImpl.java
...dnet/service/adam/service/impl/AdamEntersServiceImpl.java
+6
-5
AdamUserServiceImpl.java
...uidnet/service/adam/service/impl/AdamUserServiceImpl.java
+1
-1
No files found.
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamEntersController.java
View file @
7b2f5e84
...
@@ -87,9 +87,11 @@ public class AdamEntersController {
...
@@ -87,9 +87,11 @@ public class AdamEntersController {
List
<
AdamEntersVo
>
vos
=
adamRdmService
.
getEntersVoByUid
(
CurrentUtil
.
getCurrentUid
());
List
<
AdamEntersVo
>
vos
=
adamRdmService
.
getEntersVoByUid
(
CurrentUtil
.
getCurrentUid
());
Optional
<
AdamEntersVo
>
any
=
vos
.
stream
().
filter
(
r
->
(
r
.
getIdCard
().
equals
(
parameter
.
getIdCard
()))
&&
r
.
getType
().
equals
(
parameter
.
getType
())).
findAny
();
if
(!
CollectionUtils
.
isEmpty
(
vos
))
{
if
(
any
.
isPresent
())
{
Optional
<
AdamEntersVo
>
any
=
vos
.
stream
().
filter
(
r
->
(
r
.
getIdCard
().
equals
(
parameter
.
getIdCard
()))
&&
r
.
getType
().
equals
(
parameter
.
getType
())).
findAny
();
return
ResponseDto
.
failure
(
ErrorMapping
.
get
(
"10019"
));
if
(
any
.
isPresent
())
{
return
ResponseDto
.
failure
(
ErrorMapping
.
get
(
"10019"
));
}
}
}
String
entersId
=
adamEntersService
.
add
(
parameter
);
String
entersId
=
adamEntersService
.
add
(
parameter
);
...
...
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/AdamRdmService.java
View file @
7b2f5e84
...
@@ -525,7 +525,7 @@ public class AdamRdmService {
...
@@ -525,7 +525,7 @@ public class AdamRdmService {
redisUtil
.
del
(
AdamRedisConst
.
INFO_MEMBER_CODE
.
concat
(
memberCode
));
redisUtil
.
del
(
AdamRedisConst
.
INFO_MEMBER_CODE
.
concat
(
memberCode
));
}
}
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | <AdamMemberCodeVo::buyOrderNo, MEMBER_CODE
+ STATE
> */
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | <AdamMemberCodeVo::buyOrderNo, MEMBER_CODE> */
public
boolean
setMemberCodeByBuyOrderNo
(
String
buyOrderNo
,
String
memberCode
)
{
public
boolean
setMemberCodeByBuyOrderNo
(
String
buyOrderNo
,
String
memberCode
)
{
return
redisUtil
.
set
(
buyOrderNo
,
memberCode
);
return
redisUtil
.
set
(
buyOrderNo
,
memberCode
);
...
@@ -549,7 +549,10 @@ public class AdamRdmService {
...
@@ -549,7 +549,10 @@ public class AdamRdmService {
// );
// );
// log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
// log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
// return vo;
// return vo;
return
this
.
getMemberCodeVoByCode
(
this
.
getMemberCodeByBuyOrderNo
(
buyOrderNo
));
// TODO: 2021/7/30 存在购买会员兑换码功能时,按需调整
AdamMemberCodeVo
vo
=
AdamMemberCodeVo
.
getNew
();
vo
.
setCode
(
this
.
getMemberCodeByBuyOrderNo
(
buyOrderNo
));
return
vo
;
}
}
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | TAGS:List<AdamTagVo> */
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | TAGS:List<AdamTagVo> */
...
...
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamAddressesServiceImpl.java
View file @
7b2f5e84
...
@@ -51,7 +51,7 @@ public class AdamAddressesServiceImpl implements IAdamAddressesService {
...
@@ -51,7 +51,7 @@ public class AdamAddressesServiceImpl implements IAdamAddressesService {
AdamAddressesVo
vo
=
AdamAddressesVo
.
getNew
();
AdamAddressesVo
vo
=
AdamAddressesVo
.
getNew
();
BeanUtils
.
copyProperties
(
parameter
,
vo
);
BeanUtils
.
copyProperties
(
parameter
,
vo
);
vo
.
setAddressesId
(
String
.
valueOf
(
IDGenerator
.
nextSnowId
()
));
vo
.
setAddressesId
(
IDGenerator
.
nextSnowId
(
));
vo
.
setUid
(
currentUid
);
vo
.
setUid
(
currentUid
);
vo
.
setIsDefault
(
CollectionUtils
.
isEmpty
(
vos
));
vo
.
setIsDefault
(
CollectionUtils
.
isEmpty
(
vos
));
vo
.
setState
(
1
);
vo
.
setState
(
1
);
...
@@ -62,7 +62,9 @@ public class AdamAddressesServiceImpl implements IAdamAddressesService {
...
@@ -62,7 +62,9 @@ public class AdamAddressesServiceImpl implements IAdamAddressesService {
// log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
// log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
long
s
=
System
.
currentTimeMillis
();
long
s
=
System
.
currentTimeMillis
();
adamRdmService
.
delAddressesVoByUid
(
currentUid
);
// adamRdmService.delAddressesVoByUid(currentUid);
vos
.
add
(
vo
);
adamRdmService
.
setAddressesVoByUid
(
currentUid
,
vos
);
log
.
debug
(
"#RDS耗时:{}ms"
,
System
.
currentTimeMillis
()
-
s
);
log
.
debug
(
"#RDS耗时:{}ms"
,
System
.
currentTimeMillis
()
-
s
);
s
=
System
.
currentTimeMillis
();
s
=
System
.
currentTimeMillis
();
...
...
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamEntersServiceImpl.java
View file @
7b2f5e84
...
@@ -56,6 +56,8 @@ public class AdamEntersServiceImpl implements IAdamEntersService {
...
@@ -56,6 +56,8 @@ public class AdamEntersServiceImpl implements IAdamEntersService {
if
(
1
==
parameter
.
getType
())
{
if
(
1
==
parameter
.
getType
())
{
if
(!
adamRdmService
.
isCertification
(
1
,
parameter
.
getIdCard
(),
parameter
.
getName
()))
{
if
(!
adamRdmService
.
isCertification
(
1
,
parameter
.
getIdCard
(),
parameter
.
getName
()))
{
identityHandler
(
currentUid
,
parameter
.
getName
(),
parameter
.
getIdCard
());
identityHandler
(
currentUid
,
parameter
.
getName
(),
parameter
.
getIdCard
());
adamRdmService
.
setCertification
(
1
,
parameter
.
getIdCard
(),
parameter
.
getName
());
}
}
}
}
...
@@ -64,7 +66,7 @@ public class AdamEntersServiceImpl implements IAdamEntersService {
...
@@ -64,7 +66,7 @@ public class AdamEntersServiceImpl implements IAdamEntersService {
AdamEntersVo
vo
=
AdamEntersVo
.
getNew
();
AdamEntersVo
vo
=
AdamEntersVo
.
getNew
();
BeanUtils
.
copyProperties
(
parameter
,
vo
);
BeanUtils
.
copyProperties
(
parameter
,
vo
);
vo
.
setEntersId
(
String
.
valueOf
(
IDGenerator
.
nextSnowId
()
));
vo
.
setEntersId
(
IDGenerator
.
nextSnowId
(
));
vo
.
setUid
(
currentUid
);
vo
.
setUid
(
currentUid
);
vo
.
setIsDefault
(
CollectionUtils
.
isEmpty
(
vos
));
vo
.
setIsDefault
(
CollectionUtils
.
isEmpty
(
vos
));
vo
.
setState
(
1
);
vo
.
setState
(
1
);
...
@@ -75,10 +77,9 @@ public class AdamEntersServiceImpl implements IAdamEntersService {
...
@@ -75,10 +77,9 @@ public class AdamEntersServiceImpl implements IAdamEntersService {
// log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
// log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
long
s
=
System
.
currentTimeMillis
();
long
s
=
System
.
currentTimeMillis
();
adamRdmService
.
delEntersVoByUid
(
currentUid
);
// adamRdmService.delEntersVoByUid(currentUid);
if
(
1
==
parameter
.
getType
())
{
vos
.
add
(
vo
);
adamRdmService
.
setCertification
(
1
,
parameter
.
getIdCard
(),
parameter
.
getName
());
adamRdmService
.
setEntersVoByUid
(
currentUid
,
vos
);
}
log
.
debug
(
"#RDS耗时:{}ms"
,
System
.
currentTimeMillis
()
-
s
);
log
.
debug
(
"#RDS耗时:{}ms"
,
System
.
currentTimeMillis
()
-
s
);
s
=
System
.
currentTimeMillis
();
s
=
System
.
currentTimeMillis
();
...
...
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamUserServiceImpl.java
View file @
7b2f5e84
...
@@ -404,6 +404,7 @@ public class AdamUserServiceImpl implements IAdamUserService {
...
@@ -404,6 +404,7 @@ public class AdamUserServiceImpl implements IAdamUserService {
ErrorMapping
.
ErrorMessage
errorMessage
=
ErrorMapping
.
get
(
"10102"
);
ErrorMapping
.
ErrorMessage
errorMessage
=
ErrorMapping
.
get
(
"10102"
);
throw
new
LiquidnetServiceException
(
errorMessage
.
getCode
(),
errorMessage
.
getMessage
());
throw
new
LiquidnetServiceException
(
errorMessage
.
getCode
(),
errorMessage
.
getMessage
());
}
}
adamRdmService
.
setCertification
(
1
,
idCard
,
name
);
}
}
AdamRealName
realName
=
new
AdamRealName
();
AdamRealName
realName
=
new
AdamRealName
();
...
@@ -425,7 +426,6 @@ public class AdamUserServiceImpl implements IAdamUserService {
...
@@ -425,7 +426,6 @@ public class AdamUserServiceImpl implements IAdamUserService {
long
s
=
System
.
currentTimeMillis
();
long
s
=
System
.
currentTimeMillis
();
adamRdmService
.
setRealInfoVoByUid
(
uid
,
vo
);
adamRdmService
.
setRealInfoVoByUid
(
uid
,
vo
);
adamRdmService
.
setCertification
(
1
,
idCard
,
name
);
log
.
debug
(
"#RDS耗时:{}ms"
,
System
.
currentTimeMillis
()
-
s
);
log
.
debug
(
"#RDS耗时:{}ms"
,
System
.
currentTimeMillis
()
-
s
);
// }
// }
// RedisLockUtil.unlock(AdamRedisConst.LOCK_KEY_UIDENTITY + uid);
// RedisLockUtil.unlock(AdamRedisConst.LOCK_KEY_UIDENTITY + uid);
...
...
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