记得上下班打卡 | 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
556c65fa
Commit
556c65fa
authored
Dec 08, 2021
by
张国柄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
~购买会员+抖音|银联支付;
parent
c3b7035f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
2 deletions
+10
-2
AdamMemberOrderParam.java
.../com/liquidnet/service/adam/dto/AdamMemberOrderParam.java
+1
-1
LnsRegex.java
...in/java/com/liquidnet/commons/lang/constant/LnsRegex.java
+1
-1
AdamMemberOrderServiceImpl.java
...service/adam/service/impl/AdamMemberOrderServiceImpl.java
+8
-0
No files found.
liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/AdamMemberOrderParam.java
View file @
556c65fa
...
@@ -44,7 +44,7 @@ public class AdamMemberOrderParam implements Serializable {
...
@@ -44,7 +44,7 @@ public class AdamMemberOrderParam implements Serializable {
@Pattern
(
regexp
=
LnsRegex
.
Valid
.
TRIPLE_PF_FOR_PAY_TERMINAL
,
message
=
"支付终端类型无效"
)
@Pattern
(
regexp
=
LnsRegex
.
Valid
.
TRIPLE_PF_FOR_PAY_TERMINAL
,
message
=
"支付终端类型无效"
)
@NotBlank
(
message
=
"支付终端不能为空"
)
@NotBlank
(
message
=
"支付终端不能为空"
)
private
String
deviceFrom
;
private
String
deviceFrom
;
@ApiModelProperty
(
position
=
20
,
required
=
true
,
value
=
"支付方式"
,
allowableValues
=
"alipay,wepay"
)
@ApiModelProperty
(
position
=
20
,
required
=
true
,
value
=
"支付方式"
,
allowableValues
=
"alipay,wepay
,douyinpay,unionpay
"
)
@Pattern
(
regexp
=
LnsRegex
.
Valid
.
TRIPLE_PF_FOR_PAY
,
message
=
"支付方式无效"
)
@Pattern
(
regexp
=
LnsRegex
.
Valid
.
TRIPLE_PF_FOR_PAY
,
message
=
"支付方式无效"
)
@NotBlank
(
message
=
"支付方式不能为空"
)
@NotBlank
(
message
=
"支付方式不能为空"
)
private
String
payType
;
private
String
payType
;
...
...
liquidnet-bus-common/liquidnet-common-base/src/main/java/com/liquidnet/commons/lang/constant/LnsRegex.java
View file @
556c65fa
...
@@ -79,7 +79,7 @@ public class LnsRegex {
...
@@ -79,7 +79,7 @@ public class LnsRegex {
/**
/**
* 支持的支付方式
* 支持的支付方式
*/
*/
public
static
final
String
TRIPLE_PF_FOR_PAY
=
"\\b(alipay|wepay)\\b"
;
public
static
final
String
TRIPLE_PF_FOR_PAY
=
"\\b(alipay|wepay
|douyinpay|unionpay
)\\b"
;
/* ======================================================================= | */
/* ======================================================================= | */
...
...
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamMemberOrderServiceImpl.java
View file @
556c65fa
...
@@ -117,6 +117,14 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
...
@@ -117,6 +117,14 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
payParam
.
add
(
"productId"
,
param
.
getProductId
());
payParam
.
add
(
"productId"
,
param
.
getProductId
());
break
;
break
;
}
}
if
(
param
.
getPayType
().
equals
(
"douyinpay"
))
{
payParam
.
add
(
"showUrl"
,
param
.
getShowUrl
());
payParam
.
add
(
"returnUrl"
,
param
.
getReturnUrl
()
+
orderNo
);
}
if
(
param
.
getPayType
().
equals
(
"unionpay"
))
{
payParam
.
add
(
"returnUrl"
,
param
.
getReturnUrl
()
+
orderNo
);
}
payParam
.
add
(
"createDate"
,
nowStr
);
payParam
.
add
(
"createDate"
,
nowStr
);
payParam
.
add
(
"expireTime"
,
"5"
);
// 过期时间,单位分钟,默认5
payParam
.
add
(
"expireTime"
,
"5"
);
// 过期时间,单位分钟,默认5
...
...
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