记得上下班打卡 | 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
1bf010ed
Commit
1bf010ed
authored
Sep 27, 2021
by
张国柄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:会员购买价格使用及回调处理规则;
parent
73ecf2b3
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
AdamMemberOrderServiceImpl.java
...service/adam/service/impl/AdamMemberOrderServiceImpl.java
+5
-5
No files found.
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamMemberOrderServiceImpl.java
View file @
1bf010ed
...
@@ -139,6 +139,7 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
...
@@ -139,6 +139,7 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
memberOrderVo
.
setState
(
0
);
// 0-待支付
memberOrderVo
.
setState
(
0
);
// 0-待支付
memberOrderVo
.
setUid
(
currentUid
);
memberOrderVo
.
setUid
(
currentUid
);
memberOrderVo
.
setPrice
(
param
.
getPrice
());
memberOrderVo
.
setPrice
(
param
.
getPrice
());
memberOrderVo
.
setPricePaid
(
paymentPrice
);
memberOrderVo
.
setClientIp
(
clientIp
);
memberOrderVo
.
setClientIp
(
clientIp
);
String
headerCliVersion
=
CurrentUtil
.
getHeaderCliVersion
(),
headerCliSource
=
CurrentUtil
.
getHeaderCliSource
();
String
headerCliVersion
=
CurrentUtil
.
getHeaderCliVersion
(),
headerCliSource
=
CurrentUtil
.
getHeaderCliSource
();
memberOrderVo
.
setSource
(
null
==
headerCliSource
?
""
:
headerCliSource
);
memberOrderVo
.
setSource
(
null
==
headerCliSource
?
""
:
headerCliSource
);
...
@@ -201,11 +202,10 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
...
@@ -201,11 +202,10 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
if
(
1
==
shotMemberOrderVo
.
getState
()
||
3
==
shotMemberOrderVo
.
getState
())
{
if
(
1
==
shotMemberOrderVo
.
getState
()
||
3
==
shotMemberOrderVo
.
getState
())
{
return
ResponseDto
.
failure
(
ErrorMapping
.
get
(
"10502"
),
parameter
);
return
ResponseDto
.
failure
(
ErrorMapping
.
get
(
"10502"
),
parameter
);
}
}
// 因不同阶段用户购买金额不一样,这里不方便判断实际取值,停用金额校验
if
(
parameter
.
getPrice
().
compareTo
(
shotMemberOrderVo
.
getPricePaid
())
!=
0
)
{
// if (parameter.getPrice().compareTo(shotMemberOrderVo.getPrice()) != 0) {
// 订单金额比对
// // 订单金额比对
return
ResponseDto
.
failure
(
ErrorMapping
.
get
(
"10503"
),
parameter
);
// return ResponseDto.failure(ErrorMapping.get("10503"), parameter);
}
// }
AdamMemberPriceVo
memberPriceVo
=
adamRdmService
.
getMemberPriceVoByPriceId
(
AdamMemberPriceVo
memberPriceVo
=
adamRdmService
.
getMemberPriceVoByPriceId
(
shotMemberOrderVo
.
getMemberId
(),
shotMemberOrderVo
.
getMemberPriceId
());
shotMemberOrderVo
.
getMemberId
(),
shotMemberOrderVo
.
getMemberPriceId
());
if
(
null
==
memberPriceVo
)
{
if
(
null
==
memberPriceVo
)
{
...
...
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