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
jenkins
order-group
Commits
6108d218
Commit
6108d218
authored
Jan 03, 2020
by
胡超
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
sessionKey
parent
91a608e6
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
2 deletions
+9
-2
order-application-service/pom.xml
+1
-1
order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderVo.java
+4
-1
order-application-service/src/main/java/cn/freemud/service/impl/OrderAdapterServiceImpl.java
+2
-0
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
+2
-0
No files found.
order-application-service/pom.xml
View file @
6108d218
...
@@ -35,7 +35,7 @@
...
@@ -35,7 +35,7 @@
<dependency>
<dependency>
<groupId>
cn.freemud
</groupId>
<groupId>
cn.freemud
</groupId>
<artifactId>
assortment-ordercenter-sdk
</artifactId>
<artifactId>
assortment-ordercenter-sdk
</artifactId>
<version>
1.1.
0.RELEASE
</version>
<version>
1.1.
1-SNAPSHOT
</version>
</dependency>
</dependency>
<dependency>
<dependency>
<groupId>
com.freemud.application.service.sdk
</groupId>
<groupId>
com.freemud.application.service.sdk
</groupId>
...
...
order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderVo.java
View file @
6108d218
...
@@ -13,8 +13,8 @@
...
@@ -13,8 +13,8 @@
package
cn
.
freemud
.
entities
.
vo
;
package
cn
.
freemud
.
entities
.
vo
;
import
cn.freemud.entities.dto.UserDeliveryInfoDto
;
import
cn.freemud.entities.dto.UserDeliveryInfoDto
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
lombok.Data
;
import
org.hibernate.validator.constraints.NotEmpty
;
import
javax.validation.Valid
;
import
javax.validation.Valid
;
import
javax.validation.constraints.NotNull
;
import
javax.validation.constraints.NotNull
;
...
@@ -170,6 +170,9 @@ public class CreateOrderVo {
...
@@ -170,6 +170,9 @@ public class CreateOrderVo {
*/
*/
private
String
cardCode
;
private
String
cardCode
;
@ApiModelProperty
(
hidden
=
true
)
private
String
sessionKey
;
// 存储sessionKey,异常补退使用
@Data
@Data
public
static
class
PremiumExchangeActivity
{
public
static
class
PremiumExchangeActivity
{
@NotNull
(
message
=
"activityCode 不能为空"
)
@NotNull
(
message
=
"activityCode 不能为空"
)
...
...
order-application-service/src/main/java/cn/freemud/service/impl/OrderAdapterServiceImpl.java
View file @
6108d218
...
@@ -73,6 +73,8 @@ public class OrderAdapterServiceImpl implements OrderAdapterService {
...
@@ -73,6 +73,8 @@ public class OrderAdapterServiceImpl implements OrderAdapterService {
if
(
ObjectUtils
.
notEqual
(
baseResponse
.
getCode
(),
ResponseResult
.
SUCCESS
.
getCode
())){
if
(
ObjectUtils
.
notEqual
(
baseResponse
.
getCode
(),
ResponseResult
.
SUCCESS
.
getCode
())){
return
baseResponse
;
return
baseResponse
;
}
}
// 扩展字段中存储 sessionKey
createOrderVo
.
setSessionKey
(
assortmentCustomerInfoVo
.
getSessionKey
());
return
orderservice
.
createOrderNew
(
createOrderVo
);
return
orderservice
.
createOrderNew
(
createOrderVo
);
}
}
...
...
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
View file @
6108d218
...
@@ -1935,6 +1935,8 @@ public class OrderServiceImpl implements Orderservice {
...
@@ -1935,6 +1935,8 @@ public class OrderServiceImpl implements Orderservice {
if
(
memberCard
!=
null
&&
memberCard
.
getRuleId
()
!=
null
)
{
if
(
memberCard
!=
null
&&
memberCard
.
getRuleId
()
!=
null
)
{
orderExtInfoDto
.
setRuleId
(
memberCard
.
getRuleId
());
orderExtInfoDto
.
setRuleId
(
memberCard
.
getRuleId
());
}
}
// 扩展字段中存储 sessionKey
orderExtInfoDto
.
setSessionKey
(
createOrderVo
.
getSessionKey
());
return
orderExtInfoDto
;
return
orderExtInfoDto
;
}
}
...
...
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