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
f6f012e7
Commit
f6f012e7
authored
Jun 22, 2021
by
周晓航
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
运费券核销问题
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
parent
a5f4e219
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
order-application-service/src/main/java/cn/freemud/service/coupon/impl/PlatformCouponRelationServiceImpl.java
+3
-2
No files found.
order-application-service/src/main/java/cn/freemud/service/coupon/impl/PlatformCouponRelationServiceImpl.java
View file @
f6f012e7
...
@@ -64,8 +64,9 @@ public class PlatformCouponRelationServiceImpl implements CouponRelationService
...
@@ -64,8 +64,9 @@ public class PlatformCouponRelationServiceImpl implements CouponRelationService
@Override
@Override
public
BaseResponse
verificationCoupon
(
List
<
QueryOrdersResponseDto
.
DataBean
.
OrderBean
.
AccountBean
>
accountList
,
QueryOrdersResponseDto
.
DataBean
.
OrderBean
orderBean
,
CouponReqType
couponReqType
)
{
public
BaseResponse
verificationCoupon
(
List
<
QueryOrdersResponseDto
.
DataBean
.
OrderBean
.
AccountBean
>
accountList
,
QueryOrdersResponseDto
.
DataBean
.
OrderBean
orderBean
,
CouponReqType
couponReqType
)
{
if
(
accountList
.
size
()
>
1
)
{
if
(
accountList
.
size
()
>
1
)
{
Integer
code
=
OrderAccountType
.
FREIGHT_COUPON
.
getCode
();
// 运费券 塞进 核销接口里面, 这里真的是贼恶心 逻辑不敢动
// 运费券 塞进 核销接口里面, 这里真的是贼恶心 逻辑不敢动
QueryOrdersResponseDto
.
DataBean
.
OrderBean
.
AccountBean
freightCouponAccountBean
=
accountList
.
stream
().
filter
(
accountBean
->
OrderAccountType
.
DISCOUNT_COUPON
.
getCode
()
.
equals
(
accountBean
.
getType
())).
findFirst
().
orElse
(
null
);
QueryOrdersResponseDto
.
DataBean
.
OrderBean
.
AccountBean
freightCouponAccountBean
=
accountList
.
stream
().
filter
(
accountBean
->
code
.
equals
(
accountBean
.
getType
())).
findFirst
().
orElse
(
null
);
CouponCodeVerificationTransDto
couponCodeVerificationTransDto
=
null
;
CouponCodeVerificationTransDto
couponCodeVerificationTransDto
=
null
;
if
(!
Objects
.
isNull
(
freightCouponAccountBean
))
{
if
(!
Objects
.
isNull
(
freightCouponAccountBean
))
{
couponCodeVerificationTransDto
=
new
CouponCodeVerificationTransDto
();
couponCodeVerificationTransDto
=
new
CouponCodeVerificationTransDto
();
...
@@ -73,7 +74,7 @@ public class PlatformCouponRelationServiceImpl implements CouponRelationService
...
@@ -73,7 +74,7 @@ public class PlatformCouponRelationServiceImpl implements CouponRelationService
couponCodeVerificationTransDto
.
setTotalAmount
(
freightCouponAccountBean
.
getPrice
().
intValue
());
couponCodeVerificationTransDto
.
setTotalAmount
(
freightCouponAccountBean
.
getPrice
().
intValue
());
}
}
// 过滤出配送券
// 过滤出配送券
List
<
QueryOrdersResponseDto
.
DataBean
.
OrderBean
.
AccountBean
>
collect
=
accountList
.
stream
().
filter
(
accountBean
->
!
OrderAccountType
.
DISCOUNT_COUPON
.
getCode
()
.
equals
(
accountBean
.
getType
())).
collect
(
Collectors
.
toList
());
List
<
QueryOrdersResponseDto
.
DataBean
.
OrderBean
.
AccountBean
>
collect
=
accountList
.
stream
().
filter
(
accountBean
->
code
.
equals
(
accountBean
.
getType
())).
collect
(
Collectors
.
toList
());
return
commonMethodVerification
(
couponCodeVerificationTransDto
,
collect
,
orderBean
,
couponReqType
);
return
commonMethodVerification
(
couponCodeVerificationTransDto
,
collect
,
orderBean
,
couponReqType
);
}
else
{
}
else
{
return
commonMethodVerification
(
null
,
accountList
,
orderBean
,
couponReqType
);
return
commonMethodVerification
(
null
,
accountList
,
orderBean
,
couponReqType
);
...
...
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