Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
O
order-group
Overview
Overview
Details
Activity
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
order-group-application
order-group
Commits
8ceec659
Commit
8ceec659
authored
Dec 08, 2020
by
xiaoer.li
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'remotes/origin/feature/混合支付增加门店名称'
parents
4ba35019
c0ba56ad
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
0 deletions
+2
-0
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/payment/CombPayRequest.java
+1
-0
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
+1
-0
No files found.
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/payment/CombPayRequest.java
View file @
8ceec659
...
@@ -70,5 +70,6 @@ public class CombPayRequest {
...
@@ -70,5 +70,6 @@ public class CombPayRequest {
private
Boolean
disable_service_goods_tag
=
false
;
private
Boolean
disable_service_goods_tag
=
false
;
private
String
request_source
=
"V1"
;
private
String
request_source
=
"V1"
;
private
String
ver
=
"10"
;
private
String
ver
=
"10"
;
private
String
storeName
;
}
}
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
View file @
8ceec659
...
@@ -3567,6 +3567,7 @@ public class OrderAdapter {
...
@@ -3567,6 +3567,7 @@ public class OrderAdapter {
orderPayDto
.
setAppId
(
paymentRequest
.
getWxAppId
());
orderPayDto
.
setAppId
(
paymentRequest
.
getWxAppId
());
orderPayDto
.
setPayCode
(
paymentRequest
.
getPayCode
());
orderPayDto
.
setPayCode
(
paymentRequest
.
getPayCode
());
orderPayDto
.
setVer
(
"V1"
);
orderPayDto
.
setVer
(
"V1"
);
orderPayDto
.
setStoreName
(
orderBean
.
getShopName
());
orderPayDto
.
setPayTimeOutTime
(
StringUtils
.
defaultIfBlank
(
partnerPayOvertime
,
"30"
));
orderPayDto
.
setPayTimeOutTime
(
StringUtils
.
defaultIfBlank
(
partnerPayOvertime
,
"30"
));
List
<
ProductVO
>
productVOS
=
new
ArrayList
<
ProductVO
>();
List
<
ProductVO
>
productVOS
=
new
ArrayList
<
ProductVO
>();
if
(
CollectionUtils
.
isNotEmpty
(
orderBean
.
getProductList
()))
{
if
(
CollectionUtils
.
isNotEmpty
(
orderBean
.
getProductList
()))
{
...
...
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