Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
cloud-platform
Project
Project
Details
Activity
Releases
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
youjj
cloud-platform
Commits
883d88f9
Commit
883d88f9
authored
Oct 24, 2019
by
周健威
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改定时退第二笔押金bug
parent
5986a018
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
RentDepositJobHandler.java
...xxfc/platform/order/jobhandler/RentDepositJobHandler.java
+3
-3
No files found.
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/jobhandler/RentDepositJobHandler.java
View file @
883d88f9
...
@@ -72,7 +72,7 @@ public class RentDepositJobHandler extends IJobHandler {
...
@@ -72,7 +72,7 @@ public class RentDepositJobHandler extends IJobHandler {
@Override
@Override
public
ReturnT
<
String
>
execute
(
String
idLastNumInterval
)
{
public
ReturnT
<
String
>
execute
(
String
idLastNumInterval
)
{
Map
<
String
,
Dictionary
>
dictionaryMap
=
thirdFeign
.
dictionaryGetAll4Map
().
getData
();
Map
<
String
,
Dictionary
>
dictionaryMap
=
thirdFeign
.
dictionaryGetAll4Map
().
getData
();
Integer
rentDepositAutoRefundTime
=
new
Integer
(
dictionaryMap
.
get
(
APP_ORDER
+
"_"
+
DictionaryKey
.
RENT_DEPOSIT_AUTO_REFUND_TIME
).
getDetail
());
Long
rentDepositAutoRefundTime
=
new
Long
(
dictionaryMap
.
get
(
APP_ORDER
+
"_"
+
DictionaryKey
.
RENT_DEPOSIT_AUTO_REFUND_TIME
).
getDetail
());
try
{
try
{
List
<
BaseOrder
>
lists
=
baseOrderBiz
.
selectByExample
(
new
Example
.
Builder
(
BaseOrder
.
class
)
List
<
BaseOrder
>
lists
=
baseOrderBiz
.
selectByExample
(
new
Example
.
Builder
(
BaseOrder
.
class
)
...
@@ -80,7 +80,7 @@ public class RentDepositJobHandler extends IJobHandler {
...
@@ -80,7 +80,7 @@ public class RentDepositJobHandler extends IJobHandler {
.
where
(
WeekendSqls
.<
BaseOrder
>
custom
().
andEqualTo
(
BaseOrder:
:
getType
,
OrderTypeEnum
.
RENT_VEHICLE
.
getCode
())
.
where
(
WeekendSqls
.<
BaseOrder
>
custom
().
andEqualTo
(
BaseOrder:
:
getType
,
OrderTypeEnum
.
RENT_VEHICLE
.
getCode
())
.
andEqualTo
(
BaseOrder:
:
getStatus
,
OrderStatusEnum
.
ORDER_FINISH
.
getCode
())
//已完成的订单
.
andEqualTo
(
BaseOrder:
:
getStatus
,
OrderStatusEnum
.
ORDER_FINISH
.
getCode
())
//已完成的订单
.
andEqualTo
(
BaseOrder:
:
getRefundStatus
,
RefundStatusEnum
.
RESIDUE_ILLEGAL
.
getCode
())
//已归还了部分押金
.
andEqualTo
(
BaseOrder:
:
getRefundStatus
,
RefundStatusEnum
.
RESIDUE_ILLEGAL
.
getCode
())
//已归还了部分押金
.
andLessThanOrEqualTo
(
BaseOrder:
:
getCrtTime
,
DateUtil
.
date
(
System
.
currentTimeMillis
()
-
(
rentDepositAutoRefundTime
*
60
*
1000
)))
.
andLessThanOrEqualTo
(
BaseOrder:
:
getCrtTime
,
DateUtil
.
date
(
System
.
currentTimeMillis
()
-
(
rentDepositAutoRefundTime
*
60
L
*
1000L
)))
// .andLike(BaseOrder::getId, "%"+ i)
// .andLike(BaseOrder::getId, "%"+ i)
).
build
());
).
build
());
...
@@ -102,7 +102,7 @@ public class RentDepositJobHandler extends IJobHandler {
...
@@ -102,7 +102,7 @@ public class RentDepositJobHandler extends IJobHandler {
setType
(
crosstownTypeEnum
);
setType
(
crosstownTypeEnum
);
}});
}});
if
(
crosstown
.
getCrtTime
().
compareTo
(
System
.
currentTimeMillis
()
-
(
rentDepositAutoRefundTime
*
60
*
1000
))
<
0
)
{
if
(
crosstown
.
getCrtTime
().
compareTo
(
System
.
currentTimeMillis
()
-
(
rentDepositAutoRefundTime
*
60
L
*
1000L
))
<
0
)
{
OrderViolation
orderViolation
=
orderViolationBiz
.
selectOne
(
new
OrderViolation
(){{
OrderViolation
orderViolation
=
orderViolationBiz
.
selectOne
(
new
OrderViolation
(){{
setDetailId
(
orvd
.
getId
());
setDetailId
(
orvd
.
getId
());
setIsDel
(
SYS_FALSE
);
setIsDel
(
SYS_FALSE
);
...
...
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