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
436d77c7
Commit
436d77c7
authored
Jan 10, 2020
by
姜海波
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'remotes/origin/feature/1.9.10-购物车接口修改渠道字段-海波' into qa
parents
8e8ea45f
8d97fe08
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
0 deletions
+5
-0
order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderVo.java
+2
-0
order-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartInfoRequestVo.java
+2
-0
order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java
+1
-0
No files found.
order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderVo.java
View file @
436d77c7
...
@@ -178,6 +178,8 @@ public class CreateOrderVo {
...
@@ -178,6 +178,8 @@ public class CreateOrderVo {
@ApiModelProperty
(
hidden
=
true
)
@ApiModelProperty
(
hidden
=
true
)
private
String
sessionKey
;
// 存储sessionKey,异常补退使用
private
String
sessionKey
;
// 存储sessionKey,异常补退使用
private
String
menuType
;
@Data
@Data
public
static
class
PremiumExchangeActivity
{
public
static
class
PremiumExchangeActivity
{
@NotNull
(
message
=
"activityCode 不能为空"
)
@NotNull
(
message
=
"activityCode 不能为空"
)
...
...
order-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartInfoRequestVo.java
View file @
436d77c7
...
@@ -87,6 +87,8 @@ public class ShoppingCartInfoRequestVo {
...
@@ -87,6 +87,8 @@ public class ShoppingCartInfoRequestVo {
*/
*/
private
BuyMemberCard
buyMemberCard
;
private
BuyMemberCard
buyMemberCard
;
private
String
menuType
;
@Data
@Data
public
final
static
class
SendGoods
{
public
final
static
class
SendGoods
{
/**
/**
...
...
order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java
View file @
436d77c7
...
@@ -305,6 +305,7 @@ public class CheckOrder {
...
@@ -305,6 +305,7 @@ public class CheckOrder {
.
flag
(
CouponFlag
.
NO
.
getCode
())
.
flag
(
CouponFlag
.
NO
.
getCode
())
.
useCustomerScore
(
createOrderVo
.
getUseCustomerScore
())
.
useCustomerScore
(
createOrderVo
.
getUseCustomerScore
())
.
buyMemberCard
(
buyMemberCard
)
.
buyMemberCard
(
buyMemberCard
)
.
menuType
(
createOrderVo
.
getMenuType
())
.
build
();
.
build
();
// 如果使用优惠券或者商品券,校验 couponCode
// 如果使用优惠券或者商品券,校验 couponCode
if
(
StringUtils
.
isNotBlank
(
createOrderVo
.
getCouponCode
()))
{
if
(
StringUtils
.
isNotBlank
(
createOrderVo
.
getCouponCode
()))
{
...
...
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