Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gogirl-miniapp-backend
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
huluobin
gogirl-miniapp-backend
Commits
56ee7c86
Commit
56ee7c86
authored
Apr 14, 2020
by
huluobin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
coupon fix
parent
f32f7c42
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
5 deletions
+1
-5
MarketServiceImpl.java
...irl/application/market/coupon/impl/MarketServiceImpl.java
+1
-5
No files found.
src/main/java/com/gogirl/application/market/coupon/impl/MarketServiceImpl.java
View file @
56ee7c86
...
...
@@ -286,14 +286,12 @@ public class MarketServiceImpl implements MarketService {
.
eq
(
CouponCustomerRelevance:
:
getState
,
1
)
.
eq
(
CouponCustomerRelevance:
:
getSourceType
,
1
));
//订单使用的次卡
List
<
TimesCardUsedRecord
>
timesCardUsedRecordList
=
timesCardUsedRecordService
.
list
(
new
LambdaQueryWrapper
<
TimesCardUsedRecord
>()
.
eq
(
TimesCardUsedRecord:
:
getOrderId
,
orderId
)
.
eq
(
TimesCardUsedRecord:
:
getStatus
,
1
));
//查询订单聚合
OrderManage
orderManage
=
orderManageMapper
.
selectById
(
orderId
);
List
<
OrderServe
>
orderServeList
=
orderServeMapper
.
selectList
(
new
LambdaQueryWrapper
<
OrderServe
>().
eq
(
OrderServe:
:
getOrderId
,
orderId
));
...
...
@@ -463,8 +461,6 @@ public class MarketServiceImpl implements MarketService {
});
}
//4、内部券
if
(
ListUtil
.
isNotEmpty
(
innerCouponCustomerRelevanceServiceList
))
{
//删除之前的内部券抵扣情况记录
...
...
@@ -652,7 +648,7 @@ public class MarketServiceImpl implements MarketService {
.
filter
(
orderServe
->
serveIds
.
contains
(
orderServe
.
getServeId
()))
.
filter
(
orderServe
->
!
orderServe
.
isActivity
())
.
filter
(
orderServe
->
orderServe
.
getBindTimesCard
()
==
2
)
.
filter
(
orderServe
->
orderServe
.
getBind
TimesCard
()
==
2
)
.
filter
(
orderServe
->
orderServe
.
getBind
InnerCoupon
()
==
2
)
.
filter
(
orderServe
->
orderServe
.
getBindOuterCoupon
()
==
2
)
.
collect
(
Collectors
.
toList
());
}
...
...
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