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
e68928f4
Commit
e68928f4
authored
Nov 15, 2019
by
jiaorz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
出车bug
parent
94cb9fda
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
4 deletions
+6
-4
OrderVehicleCrosstownBiz.java
...com/xxfc/platform/order/biz/OrderVehicleCrosstownBiz.java
+4
-2
OrderPayBiz.java
...ain/java/com/xxfc/platform/universal/biz/OrderPayBiz.java
+2
-2
No files found.
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderVehicleCrosstownBiz.java
View file @
e68928f4
...
@@ -310,8 +310,10 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
...
@@ -310,8 +310,10 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
vehicleArrivalVo
.
setBookRecordId
(
orderRentVehicleDetail
.
getBookRecordId
());
vehicleArrivalVo
.
setBookRecordId
(
orderRentVehicleDetail
.
getBookRecordId
());
try
{
try
{
RestResponse
restResponse
=
vehicleFeign
.
arrivalBySmall
(
vehicleArrivalVo
);
RestResponse
restResponse
=
vehicleFeign
.
arrivalBySmall
(
vehicleArrivalVo
);
log
.
info
(
"返回信息: "
+
restResponse
.
toString
());
if
(
restResponse
.
getStatus
()
!=
200
)
{
return
ObjectRestResponse
.
createFailedResult
(
restResponse
.
getStatus
(),
restResponse
.
getMessage
());
return
ObjectRestResponse
.
createFailedResult
(
1001
,
restResponse
.
getMessage
());
}
log
.
error
(
"返回信息: "
+
restResponse
.
toString
());
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
return
ObjectRestResponse
.
createFailedResult
(
500
,
e
.
getMessage
());
return
ObjectRestResponse
.
createFailedResult
(
500
,
e
.
getMessage
());
}
}
...
...
xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/biz/OrderPayBiz.java
View file @
e68928f4
...
@@ -586,11 +586,11 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay> {
...
@@ -586,11 +586,11 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay> {
orderPayVo
.
setAmount
(
3
);
orderPayVo
.
setAmount
(
3
);
orderPayVo
.
setBody
(
"扣除租车订单费用"
);
orderPayVo
.
setBody
(
"扣除租车订单费用"
);
orderPayVo
.
setSubject
(
"租车订单交易费用"
);
orderPayVo
.
setSubject
(
"租车订单交易费用"
);
orderPayBiz
.
fundAuthOrderUnFreeze
(
"2019111410002001530505959461"
,
"2019111410002001530505959461"
,
7
,
"退还押
金"
);
//orderPayBiz.fundAuthOrderUnFreeze("201911150924550001122", "2019111510002001530506470085", 1, "退还违约
金");
//orderPayBiz.alipayOrderRefund("20191024153859000003","2019102422001421530513773694", 2, "xxxx", "");
//orderPayBiz.alipayOrderRefund("20191024153859000003","2019102422001421530513773694", 2, "xxxx", "");
//orderPayBiz.tradePay("20191108195202000020", "2019110810002001710518149012", 120000,"退还押金", "退还押金");
//orderPayBiz.tradePay("20191108195202000020", "2019110810002001710518149012", 120000,"退还押金", "退还押金");
//orderPayBiz.fundAuthCancel(orderPayVo, "");
//orderPayBiz.fundAuthCancel(orderPayVo, "");
//orderPayBiz.tradePay("20191114182254000019", "2019111410002001530505959461", 1,"扣除违约金", "扣除违约金");
//orderPayBiz.tradePay("20191114182254000019", "2019111410002001530505959461", 1,"扣除违约金", "扣除违约金");
orderPayBiz
.
fundAuthQuery
(
"20191115092455000004"
);
}
}
}
}
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