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
437b1018
Commit
437b1018
authored
Sep 02, 2020
by
徐康
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature/20200727_麦咖啡p1v2支付券码路由' into qa
# Conflicts: # order-application-service/pom.xml
parents
b82bdf47
1c7071f2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
0 deletions
+6
-0
order-application-service/src/main/java/cn/freemud/service/impl/MCCafeOrderServiceImpl.java
+1
-0
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderExtInfoDto.java
+5
-0
No files found.
order-application-service/src/main/java/cn/freemud/service/impl/MCCafeOrderServiceImpl.java
View file @
437b1018
...
@@ -745,6 +745,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
...
@@ -745,6 +745,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
orderExtInfoDto
.
setIsInvoice
(
createOrderVo
.
getIsInvoice
());
orderExtInfoDto
.
setIsInvoice
(
createOrderVo
.
getIsInvoice
());
orderExtInfoDto
.
setInvoiceTitle
(
createOrderVo
.
getInvoiceTitle
());
orderExtInfoDto
.
setInvoiceTitle
(
createOrderVo
.
getInvoiceTitle
());
orderExtInfoDto
.
setNeedTableware
(
createOrderVo
.
getNeedTableware
());
orderExtInfoDto
.
setNeedTableware
(
createOrderVo
.
getNeedTableware
());
orderExtInfoDto
.
setThirdPartyMemberId
(
userLoginInfoDto
.
getThirdPartyMemberID
());
if
(
StringUtils
.
isNotBlank
(
createOrderVo
.
getScene
()))
{
if
(
StringUtils
.
isNotBlank
(
createOrderVo
.
getScene
()))
{
orderExtInfoDto
.
setScene
(
createOrderVo
.
getScene
());
orderExtInfoDto
.
setScene
(
createOrderVo
.
getScene
());
}
}
...
...
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderExtInfoDto.java
View file @
437b1018
...
@@ -170,4 +170,9 @@ public class OrderExtInfoDto {
...
@@ -170,4 +170,9 @@ public class OrderExtInfoDto {
* 发票抬头
* 发票抬头
*/
*/
private
String
invoiceTitle
;
private
String
invoiceTitle
;
/**
* 麦咖啡会员号
*/
private
String
thirdPartyMemberId
;
}
}
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