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
71c4f12d
Commit
71c4f12d
authored
Apr 14, 2020
by
huluobin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
内部券使用
parent
0b362d2e
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
20 deletions
+16
-20
MarketServiceImpl.java
...irl/application/market/coupon/impl/MarketServiceImpl.java
+16
-20
No files found.
src/main/java/com/gogirl/application/market/coupon/impl/MarketServiceImpl.java
View file @
71c4f12d
...
...
@@ -48,31 +48,29 @@ import java.util.stream.Collectors;
public
class
MarketServiceImpl
implements
MarketService
{
@Resource
TimesCardUsedRecordMapper
timesCardUsedRecordMapper
;
@Resource
TimesCardOrderServeDetailMapper
timesCardOrderServeDetailMapper
;
@Resource
private
CouponMapper
couponMapper
;
@Resource
private
CouponCustomerRelevanceService
couponCustomerRelevanceService
;
@Resource
private
CouponOrderRelevanceService
couponOrderRelevanceService
;
@Resource
private
OrderManageMapper
orderManageMapper
;
@Resource
private
OrderServeMapper
orderServeMapper
;
@Resource
private
TimesCardCustomerRelevanceMapper
timesCardCustomerRelevanceMapper
;
@Resource
private
CouponCustomerRelevanceMapper
couponCustomerRelevanceMapper
;
@Resource
private
OrderServeService
orderServeService
;
@Resource
private
TimesCardUsedRecordService
timesCardUsedRecordService
;
@Resource
private
TimesCardCustomerRelevanceService
timesCardCustomerRelevanceService
;
@Resource
private
DiscountConfigMapper
discountConfigMapper
;
...
...
@@ -264,11 +262,6 @@ public class MarketServiceImpl implements MarketService {
}
}
@Resource
TimesCardUsedRecordMapper
timesCardUsedRecordMapper
;
@Resource
TimesCardOrderServeDetailMapper
timesCardOrderServeDetailMapper
;
/**
* 更新订单 使用次卡 使用外部券 使用内部券之后需要调用这个方法
* 结算订单
...
...
@@ -574,6 +567,9 @@ public class MarketServiceImpl implements MarketService {
.
filter
(
couponCustomerRelevance
->
!
discountConfigListCouponId
.
contains
(
couponCustomerRelevance
.
getCouponId
()))
.
collect
(
Collectors
.
toList
());
normalInnerCouponCustomerRelevanceServiceList
.
forEach
(
couponCustomerRelevanceConsumer
);
if
(
normalInnerCouponCustomerRelevanceServiceList
.
size
()
>
1
)
{
throw
new
RRException
(
"普通内部券只能用一张"
);
}
}
orderManageMapper
.
updateById
(
orderManage
);
...
...
@@ -581,15 +577,6 @@ public class MarketServiceImpl implements MarketService {
}
@Data
static
class
CalcFreePay
{
private
Integer
orderServeId
;
private
List
<
Integer
>
serveIds
=
new
ArrayList
<>();
private
BigDecimal
payPrice
;
}
private
List
<
OrderServe
>
queryCanDiscount
(
OrderManage
orderManage
,
List
<
Integer
>
serveIds
,
Integer
counponId
)
{
List
<
Integer
>
freeCouponIds
=
discountConfigMapper
.
selectList
(
new
LambdaQueryWrapper
<>()).
stream
().
map
(
DiscountConfig:
:
getCouponId
)
...
...
@@ -695,5 +682,14 @@ public class MarketServiceImpl implements MarketService {
.
orElse
(
null
);
}
@Data
static
class
CalcFreePay
{
private
Integer
orderServeId
;
private
List
<
Integer
>
serveIds
=
new
ArrayList
<>();
private
BigDecimal
payPrice
;
}
}
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