记得上下班打卡 | 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
934096ed
Commit
934096ed
authored
Jun 15, 2021
by
张国柄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:member.ex.handler;
parent
833c33da
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
34 additions
and
46 deletions
+34
-46
IAdamMemberOrderService.java
...quidnet/service/adam/service/IAdamMemberOrderService.java
+1
-1
AdamMemberOrderController.java
...et/service/adam/controller/AdamMemberOrderController.java
+33
-45
No files found.
liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/service/IAdamMemberOrderService.java
View file @
934096ed
...
@@ -22,7 +22,7 @@ public interface IAdamMemberOrderService extends IService<AdamMemberOrder> {
...
@@ -22,7 +22,7 @@ public interface IAdamMemberOrderService extends IService<AdamMemberOrder> {
*
*
* @param param
* @param param
*/
*/
ResponseDto
<
AdamMemberOrderResult
>
buyMemberOrMemberCode
(
AdamMemberOrderParam
param
)
throws
Exception
;
ResponseDto
<
AdamMemberOrderResult
>
buyMemberOrMemberCode
(
AdamMemberOrderParam
param
);
/**
/**
* 支付回调
* 支付回调
...
...
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamMemberOrderController.java
View file @
934096ed
...
@@ -73,7 +73,6 @@ public class AdamMemberOrderController {
...
@@ -73,7 +73,6 @@ public class AdamMemberOrderController {
@ApiOperation
(
value
=
"购买会员或会员码"
)
@ApiOperation
(
value
=
"购买会员或会员码"
)
@PostMapping
(
"buy"
)
@PostMapping
(
"buy"
)
public
ResponseDto
<
AdamMemberOrderResult
>
buyMemberOrCode
(
@Valid
@RequestBody
AdamMemberOrderParam
param
)
{
public
ResponseDto
<
AdamMemberOrderResult
>
buyMemberOrCode
(
@Valid
@RequestBody
AdamMemberOrderParam
param
)
{
try
{
log
.
debug
(
"member/order/buy:param:{}"
,
JsonUtils
.
toJson
(
param
));
log
.
debug
(
"member/order/buy:param:{}"
,
JsonUtils
.
toJson
(
param
));
String
currentUid
=
CurrentUtil
.
getCurrentUid
();
String
currentUid
=
CurrentUtil
.
getCurrentUid
();
...
@@ -81,7 +80,6 @@ public class AdamMemberOrderController {
...
@@ -81,7 +80,6 @@ public class AdamMemberOrderController {
// TODO: 2021/6/9 判断黑名单,待定(暂不做)
// TODO: 2021/6/9 判断黑名单,待定(暂不做)
AdamRealInfoVo
realInfoVo
=
adamRdmService
.
getRealInfoVoByUid
(
currentUid
);
AdamRealInfoVo
realInfoVo
=
adamRdmService
.
getRealInfoVoByUid
(
currentUid
);
if
(
null
==
realInfoVo
)
{
if
(
null
==
realInfoVo
)
{
if
(
StringUtils
.
isBlank
(
param
.
getName
())
||
StringUtils
.
isBlank
(
param
.
getIdCard
()))
{
if
(
StringUtils
.
isBlank
(
param
.
getName
())
||
StringUtils
.
isBlank
(
param
.
getIdCard
()))
{
...
@@ -91,10 +89,6 @@ public class AdamMemberOrderController {
...
@@ -91,10 +89,6 @@ public class AdamMemberOrderController {
}
}
return
adamMemberOrderService
.
buyMemberOrMemberCode
(
param
);
return
adamMemberOrderService
.
buyMemberOrMemberCode
(
param
);
}
catch
(
Exception
e
)
{
log
.
error
(
"购买会员或会员码异常"
,
e
);
return
ResponseDto
.
failure
();
}
}
}
/**
/**
...
@@ -151,7 +145,6 @@ public class AdamMemberOrderController {
...
@@ -151,7 +145,6 @@ public class AdamMemberOrderController {
@ApiOperation
(
value
=
"使用兑换码"
)
@ApiOperation
(
value
=
"使用兑换码"
)
@PostMapping
(
"exchange"
)
@PostMapping
(
"exchange"
)
public
ResponseDto
<
AdamMemberOrderResult
>
exchangeMemberCode
(
@Valid
@RequestBody
AdamMemberOrderCodeParam
param
)
{
public
ResponseDto
<
AdamMemberOrderResult
>
exchangeMemberCode
(
@Valid
@RequestBody
AdamMemberOrderCodeParam
param
)
{
try
{
log
.
debug
(
"member/order/exchange:param:{}"
,
JsonUtils
.
toJson
(
param
));
log
.
debug
(
"member/order/exchange:param:{}"
,
JsonUtils
.
toJson
(
param
));
String
currentUid
=
CurrentUtil
.
getCurrentUid
();
String
currentUid
=
CurrentUtil
.
getCurrentUid
();
if
(
null
!=
adamRdmService
.
getUserMemberVoByUid
(
currentUid
))
{
// 仅限从未购买过会员的用户使用
if
(
null
!=
adamRdmService
.
getUserMemberVoByUid
(
currentUid
))
{
// 仅限从未购买过会员的用户使用
...
@@ -161,7 +154,6 @@ public class AdamMemberOrderController {
...
@@ -161,7 +154,6 @@ public class AdamMemberOrderController {
// TODO: 2021/6/9 判断黑名单,待定(暂不做)
// TODO: 2021/6/9 判断黑名单,待定(暂不做)
AdamRealInfoVo
realInfoVo
=
adamRdmService
.
getRealInfoVoByUid
(
currentUid
);
AdamRealInfoVo
realInfoVo
=
adamRdmService
.
getRealInfoVoByUid
(
currentUid
);
if
(
null
==
realInfoVo
)
{
if
(
null
==
realInfoVo
)
{
if
(
StringUtils
.
isBlank
(
param
.
getName
())
||
StringUtils
.
isBlank
(
param
.
getIdCard
()))
{
if
(
StringUtils
.
isBlank
(
param
.
getName
())
||
StringUtils
.
isBlank
(
param
.
getIdCard
()))
{
...
@@ -171,10 +163,6 @@ public class AdamMemberOrderController {
...
@@ -171,10 +163,6 @@ public class AdamMemberOrderController {
}
}
return
adamMemberOrderService
.
exchangeMemberCode
(
param
);
return
adamMemberOrderService
.
exchangeMemberCode
(
param
);
}
catch
(
Exception
e
)
{
log
.
error
(
"使用兑换码异常"
,
e
);
return
ResponseDto
.
failure
();
}
}
}
@ApiOperationSupport
(
order
=
4
)
@ApiOperationSupport
(
order
=
4
)
...
...
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