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
9f64ad48
Commit
9f64ad48
authored
Jun 24, 2020
by
xiaoer.li@freemud.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'remotes/origin/feature/1.9.28_单接受scene保存' into qa
parents
5b7c272d
9b2e111b
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
0 deletions
+9
-0
order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderVo.java
+2
-0
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
+3
-0
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderExtInfoDto.java
+4
-0
No files found.
order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderVo.java
View file @
9f64ad48
...
@@ -195,6 +195,8 @@ public class CreateOrderVo {
...
@@ -195,6 +195,8 @@ public class CreateOrderVo {
@ApiModelProperty
(
hidden
=
true
)
@ApiModelProperty
(
hidden
=
true
)
private
String
sessionKey
;
// 存储sessionKey,异常补退使用
private
String
sessionKey
;
// 存储sessionKey,异常补退使用
@ApiModelProperty
(
hidden
=
true
)
private
String
scene
;
// 打开小程序的场景值
@Builder
.
Default
@Builder
.
Default
private
String
menuType
=
"saas"
;
private
String
menuType
=
"saas"
;
...
...
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
View file @
9f64ad48
...
@@ -1928,6 +1928,9 @@ public class OrderServiceImpl implements Orderservice {
...
@@ -1928,6 +1928,9 @@ public class OrderServiceImpl implements Orderservice {
orderExtInfoDto
.
setSessionKey
(
createOrderVo
.
getSessionKey
());
orderExtInfoDto
.
setSessionKey
(
createOrderVo
.
getSessionKey
());
orderExtInfoDto
.
setFormId
(
createOrderVo
.
getFormId
());
orderExtInfoDto
.
setFormId
(
createOrderVo
.
getFormId
());
orderExtInfoDto
.
setFromAppId
(
userLoginInfoDto
.
getWxAppId
());
orderExtInfoDto
.
setFromAppId
(
userLoginInfoDto
.
getWxAppId
());
if
(
StringUtils
.
isNotBlank
(
createOrderVo
.
getScene
()))
{
orderExtInfoDto
.
setScene
(
createOrderVo
.
getScene
());
}
return
orderExtInfoDto
;
return
orderExtInfoDto
;
}
}
...
...
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderExtInfoDto.java
View file @
9f64ad48
...
@@ -119,4 +119,8 @@ public class OrderExtInfoDto {
...
@@ -119,4 +119,8 @@ public class OrderExtInfoDto {
* 扫呗商户号 新支付服务做中转使用
* 扫呗商户号 新支付服务做中转使用
*/
*/
private
String
terminalId
;
private
String
terminalId
;
/**
* 打开小程序的场景值。
*/
private
String
scene
;
}
}
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