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
41dc72f6
Commit
41dc72f6
authored
May 25, 2022
by
周晓航
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
加价购活动查询新增限制
parent
d5a2a3da
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
0 deletions
+8
-0
shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/PremiumExchangeRequestVo.java
+7
-0
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
+1
-0
No files found.
shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/PremiumExchangeRequestVo.java
View file @
41dc72f6
...
@@ -53,6 +53,13 @@ public class PremiumExchangeRequestVo {
...
@@ -53,6 +53,13 @@ public class PremiumExchangeRequestVo {
private
Integer
bizType
;
private
Integer
bizType
;
/**
/**
* 储值卡需求: 使用的储值卡是否与 促销活动同享
*/
@ApiModelProperty
(
value
=
"是否与营销活动共享 1-是 0-否"
)
private
Integer
enableSharing
=
1
;
/**
* 优惠券code列表
* 优惠券code列表
*/
*/
private
List
<
couponCode
>
couponCodes
;
private
List
<
couponCode
>
couponCodes
;
...
...
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
View file @
41dc72f6
...
@@ -3143,6 +3143,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
...
@@ -3143,6 +3143,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
premiumExchangeResponseVo
.
setResultCode
(
ActivityResultCodeEnum
.
NON_PARTICIPATE
.
getCode
());
premiumExchangeResponseVo
.
setResultCode
(
ActivityResultCodeEnum
.
NON_PARTICIPATE
.
getCode
());
List
<
CartGoods
>
cartGoodsList
=
assortmentSdkService
.
getShoppingCart
(
partnerId
,
storeId
,
userId
,
request
.
getSessionId
(),
null
,
shoppingCartBaseService
,
bizType
);
List
<
CartGoods
>
cartGoodsList
=
assortmentSdkService
.
getShoppingCart
(
partnerId
,
storeId
,
userId
,
request
.
getSessionId
(),
null
,
shoppingCartBaseService
,
bizType
);
DiscountSharingDto
discountSharingDto
=
new
DiscountSharingDto
();
DiscountSharingDto
discountSharingDto
=
new
DiscountSharingDto
();
discountSharingDto
.
setEnableSharing
(
request
.
getEnableSharing
());
if
(
grayPush
(
partnerId
,
storeId
,
"2"
))
{
if
(
grayPush
(
partnerId
,
storeId
,
"2"
))
{
// 当couponCode不为空时,需参与价格计算
// 当couponCode不为空时,需参与价格计算
ArrayList
<
ActivityCalculationDiscountRequestDto
.
CalculationDiscountCoupon
>
coupons
=
new
ArrayList
<>();
ArrayList
<
ActivityCalculationDiscountRequestDto
.
CalculationDiscountCoupon
>
coupons
=
new
ArrayList
<>();
...
...
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