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
6315b3ee
Commit
6315b3ee
authored
Aug 30, 2019
by
jiaorz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改出车bug
parent
09799292
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
OrderDepositRefundRecordBiz.java
.../xxfc/platform/order/biz/OrderDepositRefundRecordBiz.java
+4
-2
bootstrap.yml
xx-order/xx-order-server/src/main/resources/bootstrap.yml
+1
-1
No files found.
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderDepositRefundRecordBiz.java
View file @
6315b3ee
...
@@ -115,8 +115,10 @@ public class OrderDepositRefundRecordBiz extends BaseBiz<DepositRefundRecordMapp
...
@@ -115,8 +115,10 @@ public class OrderDepositRefundRecordBiz extends BaseBiz<DepositRefundRecordMapp
if
(
depositRefundRecord
.
getStatus
()
==
DepositRefundStatus
.
VIOLATIONARRIVAL
.
getCode
())
{
if
(
depositRefundRecord
.
getStatus
()
==
DepositRefundStatus
.
VIOLATIONARRIVAL
.
getCode
())
{
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
());
Integer
rentDepositAutoRefundTime
=
new
Integer
(
dictionaryMap
.
get
(
APP_ORDER
+
"_"
+
DictionaryKey
.
RENT_DEPOSIT_AUTO_REFUND_TIME
).
getDetail
());
depositRefundRecord
.
setRentDepositAutoRefundTime
(
depositRefundRecord
.
getCrtTime
()
+
(
rentDepositAutoRefundTime
==
null
?
0
:
rentDepositAutoRefundTime
*
60
*
60
*
1000
));
if
(
rentDepositAutoRefundTime
!=
null
)
{
Long
time
=
Long
.
parseLong
(
rentDepositAutoRefundTime
+
""
);
depositRefundRecord
.
setRentDepositAutoRefundTime
(
depositRefundRecord
.
getCrtTime
()
+
time
*
60
*
60
*
1000
);
}
}
}
}
}
return
list
;
return
list
;
...
...
xx-order/xx-order-server/src/main/resources/bootstrap.yml
View file @
6315b3ee
...
@@ -13,7 +13,7 @@ spring:
...
@@ -13,7 +13,7 @@ spring:
cloud
:
cloud
:
nacos
:
nacos
:
config
:
config
:
server-addr
:
127.0.0.1:8848
, 10.1.37.166:8848
server-addr
:
127.0.0.1:8848
#共用配置,+ mongodb日志配置
#共用配置,+ mongodb日志配置
shared-dataids
:
common-dev.yaml,mongodb-log-dev.yaml
shared-dataids
:
common-dev.yaml,mongodb-log-dev.yaml
...
...
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