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
26f2418d
Commit
26f2418d
authored
Jul 28, 2021
by
ping.wu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
蜜雪app未传使用优惠券集合
parent
3bddb48a
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
1 deletions
+4
-1
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/CouponPromotionService.java
+2
-1
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/promotion/CouponSharingService.java
+2
-0
No files found.
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/CouponPromotionService.java
View file @
26f2418d
...
@@ -100,7 +100,8 @@ public class CouponPromotionService implements IPromotionService {
...
@@ -100,7 +100,8 @@ public class CouponPromotionService implements IPromotionService {
couponDiscount
=
couponDiscount
+
(
couponResults
.
getDiscountAmount
()
==
null
?
0
:
couponResults
.
getDiscountAmount
());
couponDiscount
=
couponDiscount
+
(
couponResults
.
getDiscountAmount
()
==
null
?
0
:
couponResults
.
getDiscountAmount
());
}
}
}
}
if
(
CollectionUtils
.
isNotEmpty
(
calculationDiscountResult
.
getCouponDiscounts
()))
{
if
(
CollectionUtils
.
isNotEmpty
(
calculationDiscountResult
.
getCouponDiscounts
())
&&
CollectionUtils
.
isNotEmpty
(
shoppingCartInfoRequestVo
.
getCouponCodes
()))
{
//选中优惠券赋值
//选中优惠券赋值
List
<
ChooseCouponVo
>
couponCodes
=
new
ArrayList
<>();
List
<
ChooseCouponVo
>
couponCodes
=
new
ArrayList
<>();
for
(
ChooseCouponVo
chooseCouponVo
:
shoppingCartInfoRequestVo
.
getCouponCodes
()){
for
(
ChooseCouponVo
chooseCouponVo
:
shoppingCartInfoRequestVo
.
getCouponCodes
()){
...
...
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/promotion/CouponSharingService.java
View file @
26f2418d
...
@@ -94,6 +94,7 @@ public class CouponSharingService {
...
@@ -94,6 +94,7 @@ public class CouponSharingService {
List
<
CalculationSharingDiscountResponseDto
.
CalculationDiscountResult
.
Discount
>
couponResultsList
=
calculationDiscountResult
.
getDiscounts
();
List
<
CalculationSharingDiscountResponseDto
.
CalculationDiscountResult
.
Discount
>
couponResultsList
=
calculationDiscountResult
.
getDiscounts
();
couponDiscount
=
couponResultsList
.
stream
().
filter
(
d
->
asList
.
contains
(
d
.
getType
())).
mapToLong
(
d
->
d
.
getDiscount
().
longValue
()).
sum
();
couponDiscount
=
couponResultsList
.
stream
().
filter
(
d
->
asList
.
contains
(
d
.
getType
())).
mapToLong
(
d
->
d
.
getDiscount
().
longValue
()).
sum
();
//选中优惠券赋值
//选中优惠券赋值
if
(
CollectionUtils
.
isNotEmpty
(
shoppingCartInfoRequestVo
.
getCouponCodes
())){
List
<
ChooseCouponVo
>
couponCodes
=
new
ArrayList
<>();
List
<
ChooseCouponVo
>
couponCodes
=
new
ArrayList
<>();
for
(
ChooseCouponVo
chooseCouponVo
:
shoppingCartInfoRequestVo
.
getCouponCodes
()){
for
(
ChooseCouponVo
chooseCouponVo
:
shoppingCartInfoRequestVo
.
getCouponCodes
()){
for
(
CalculationSharingDiscountResponseDto
.
CalculationDiscountResult
.
Discount
discount
:
couponResultsList
){
for
(
CalculationSharingDiscountResponseDto
.
CalculationDiscountResult
.
Discount
discount
:
couponResultsList
){
...
@@ -105,6 +106,7 @@ public class CouponSharingService {
...
@@ -105,6 +106,7 @@ public class CouponSharingService {
}
}
shoppingCartGoodsResponseVo
.
setCouponCodes
(
couponCodes
);
shoppingCartGoodsResponseVo
.
setCouponCodes
(
couponCodes
);
}
}
}
shoppingCartGoodsResponseVo
.
setCouponDiscount
(
couponDiscount
);
shoppingCartGoodsResponseVo
.
setCouponDiscount
(
couponDiscount
);
Map
<
String
,
CheckSpqInfoResponseDto
>
validCouponMap
=
calculationDiscountResult
==
null
?
new
HashMap
<>()
:
calculationDiscountResult
.
getValidCouponMap
();
Map
<
String
,
CheckSpqInfoResponseDto
>
validCouponMap
=
calculationDiscountResult
==
null
?
new
HashMap
<>()
:
calculationDiscountResult
.
getValidCouponMap
();
...
...
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