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
cca5624b
Commit
cca5624b
authored
Mar 06, 2020
by
huluobin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
c9bdcf0b
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
2 deletions
+7
-2
MarketServiceImpl.java
...com/gogirl/application/market/impl/MarketServiceImpl.java
+6
-1
Schedule.java
...ain/java/com/gogirl/infrastructure/schedule/Schedule.java
+1
-1
No files found.
src/main/java/com/gogirl/application/market/impl/MarketServiceImpl.java
View file @
cca5624b
...
@@ -186,7 +186,9 @@ public class MarketServiceImpl implements MarketService {
...
@@ -186,7 +186,9 @@ public class MarketServiceImpl implements MarketService {
.
eq
(
CouponCustomerRelevance:
:
getState
,
1
)
.
eq
(
CouponCustomerRelevance:
:
getState
,
1
)
.
eq
(
CouponCustomerRelevance:
:
getType
,
0
));
.
eq
(
CouponCustomerRelevance:
:
getType
,
0
));
innerCouponCustomerRelevanceServiceList
.
forEach
(
couponCustomerRelevance
->
couponCustomerRelevance
.
setState
(
CouponCustomerRelevance
.
STATE_USED
));
innerCouponCustomerRelevanceServiceList
.
forEach
(
couponCustomerRelevance
->
couponCustomerRelevance
.
setState
(
CouponCustomerRelevance
.
STATE_USED
));
if
(
ListUtil
.
isNotEmpty
(
innerCouponCustomerRelevanceServiceList
))
{
couponCustomerRelevanceService
.
saveOrUpdateBatch
(
innerCouponCustomerRelevanceServiceList
);
couponCustomerRelevanceService
.
saveOrUpdateBatch
(
innerCouponCustomerRelevanceServiceList
);
}
//订单使用的外部券
//订单使用的外部券
List
<
CouponCustomerRelevance
>
outerCouponCustomerRelevanceServiceList
=
couponCustomerRelevanceService
List
<
CouponCustomerRelevance
>
outerCouponCustomerRelevanceServiceList
=
couponCustomerRelevanceService
...
@@ -195,8 +197,9 @@ public class MarketServiceImpl implements MarketService {
...
@@ -195,8 +197,9 @@ public class MarketServiceImpl implements MarketService {
.
eq
(
CouponCustomerRelevance:
:
getState
,
1
)
.
eq
(
CouponCustomerRelevance:
:
getState
,
1
)
.
eq
(
CouponCustomerRelevance:
:
getType
,
1
));
.
eq
(
CouponCustomerRelevance:
:
getType
,
1
));
outerCouponCustomerRelevanceServiceList
.
forEach
(
couponCustomerRelevance
->
couponCustomerRelevance
.
setState
(
CouponCustomerRelevance
.
STATE_USED
));
outerCouponCustomerRelevanceServiceList
.
forEach
(
couponCustomerRelevance
->
couponCustomerRelevance
.
setState
(
CouponCustomerRelevance
.
STATE_USED
));
if
(
ListUtil
.
isNotEmpty
(
outerCouponCustomerRelevanceServiceList
))
{
couponCustomerRelevanceService
.
saveOrUpdateBatch
(
outerCouponCustomerRelevanceServiceList
);
couponCustomerRelevanceService
.
saveOrUpdateBatch
(
outerCouponCustomerRelevanceServiceList
);
}
//订单使用的次卡
//订单使用的次卡
List
<
TimesCardUsedRecord
>
timesCardUsedRecordList
=
timesCardUsedRecordService
List
<
TimesCardUsedRecord
>
timesCardUsedRecordList
=
timesCardUsedRecordService
...
@@ -204,8 +207,10 @@ public class MarketServiceImpl implements MarketService {
...
@@ -204,8 +207,10 @@ public class MarketServiceImpl implements MarketService {
.
eq
(
TimesCardUsedRecord:
:
getOrderId
,
orderId
)
.
eq
(
TimesCardUsedRecord:
:
getOrderId
,
orderId
)
.
eq
(
TimesCardUsedRecord:
:
getStatus
,
1
));
.
eq
(
TimesCardUsedRecord:
:
getStatus
,
1
));
timesCardUsedRecordList
.
forEach
(
timesCardUsedRecord
->
timesCardUsedRecord
.
setStatus
(
TimesCardUsedRecord
.
STATUS_USED
));
timesCardUsedRecordList
.
forEach
(
timesCardUsedRecord
->
timesCardUsedRecord
.
setStatus
(
TimesCardUsedRecord
.
STATUS_USED
));
if
(
ListUtil
.
isNotEmpty
(
timesCardUsedRecordList
))
{
timesCardUsedRecordService
.
saveOrUpdateBatch
(
timesCardUsedRecordList
);
timesCardUsedRecordService
.
saveOrUpdateBatch
(
timesCardUsedRecordList
);
}
}
}
/**
/**
* 更新订单 使用次卡 使用外部券 使用内部券之后需要调用这个方法
* 更新订单 使用次卡 使用外部券 使用内部券之后需要调用这个方法
...
...
src/main/java/com/gogirl/infrastructure/schedule/Schedule.java
View file @
cca5624b
...
@@ -41,7 +41,7 @@ import java.util.List;
...
@@ -41,7 +41,7 @@ import java.util.List;
import
java.util.Map
;
import
java.util.Map
;
import
java.util.stream.Collectors
;
import
java.util.stream.Collectors
;
@EnableScheduling
//
@EnableScheduling
@AllArgsConstructor
@AllArgsConstructor
@Slf4j
@Slf4j
@Component
@Component
...
...
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