记得上下班打卡 | 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
2f08cac3
Commit
2f08cac3
authored
Oct 31, 2022
by
胡佳晨
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加 pos_crash 支付方式
parent
d25ee55b
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
2 deletions
+13
-2
GoblinOrderPreParam.java
...m/liquidnet/service/goblin/param/GoblinOrderPreParam.java
+3
-0
GoblinOrderServiceImpl.java
...et/service/order/service/impl/GoblinOrderServiceImpl.java
+10
-2
No files found.
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/GoblinOrderPreParam.java
View file @
2f08cac3
...
...
@@ -35,6 +35,9 @@ public class GoblinOrderPreParam implements Cloneable{
private
String
deviceFrom
;
private
String
authCode
;
@ApiModelProperty
(
required
=
true
,
value
=
"支付方式[pos_crash-现金支付|]"
)
private
String
payType
;
private
String
openId
;
private
String
returnUrl
;
...
...
liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/GoblinOrderServiceImpl.java
View file @
2f08cac3
...
...
@@ -424,7 +424,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
boolean
isFree
=
false
;
GoblinPayInnerResultVo
payInnerResultVo
;
String
payCode
;
if
(
preParam
.
getPriceActual
().
compareTo
(
BigDecimal
.
valueOf
(
0
))
>
0
&&
!
preParam
.
getPayType
().
equals
(
"huifu"
))
{
if
(
preParam
.
getPriceActual
().
compareTo
(
BigDecimal
.
valueOf
(
0
))
>
0
&&
!
preParam
.
getPayType
().
equals
(
"huifu"
)
&&
!
preParam
.
getPayType
().
equals
(
"pos_crash"
)
)
{
// 调用支付
// if (preParam.getPayType().equalsIgnoreCase(DragonConstant.PayChannelEnum.WEPAY.getCode())) {
// if (preParam.getDeviceFrom().equalsIgnoreCase(DragonConstant.DeviceFromEnum.JS.getCode()) || preParam.getDeviceFrom().equalsIgnoreCase(DragonConstant.DeviceFromEnum.APPLET.getCode())) {
...
...
@@ -501,7 +501,15 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
payCode
=
payInnerResultVo
.
getCode
();
payInnerResultVo
.
setShowUrl
(
preParam
.
getShowUrl
());
payInnerResultVo
.
setReturnUrl
(
preParam
.
getReturnUrl
());
}
else
{
}
else
if
(
preParam
.
getPayType
().
equals
(
"pos_crash"
))
{
isFree
=
true
;
preParam
.
setPayType
(
"POS_CRASH"
);
payCode
=
"POS_CRASH_PAY_CODE"
;
payInnerResultVo
=
GoblinPayInnerResultVo
.
getNew
();
payInnerResultVo
.
setPrice
(
BigDecimal
.
valueOf
(
0
));
payInnerResultVo
.
setPayType
(
preParam
.
getPayType
());
}
else
{
isFree
=
true
;
preParam
.
setPayType
(
"FREE"
);
payCode
=
"FREE_PAY_CODE"
;
...
...
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