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
4d325b34
Commit
4d325b34
authored
Sep 17, 2019
by
周健威
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复短信发送bug
parent
762293e3
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
14 deletions
+3
-14
OrderMsgBiz.java
...n/java/com/xxfc/platform/order/biz/inner/OrderMsgBiz.java
+3
-14
No files found.
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/inner/OrderMsgBiz.java
View file @
4d325b34
...
@@ -283,24 +283,13 @@ public class OrderMsgBiz {
...
@@ -283,24 +283,13 @@ public class OrderMsgBiz {
CompanyDetail
startCompanyDetail
=
vehicleFeign
.
getCompanyDetail
(
orvd
.
getStartCompanyId
()).
getData
();
CompanyDetail
startCompanyDetail
=
vehicleFeign
.
getCompanyDetail
(
orvd
.
getStartCompanyId
()).
getData
();
CompanyDetail
endCompanyDetail
=
vehicleFeign
.
getCompanyDetail
(
orvd
.
getEndCompanyId
()).
getData
();
CompanyDetail
endCompanyDetail
=
vehicleFeign
.
getCompanyDetail
(
orvd
.
getEndCompanyId
()).
getData
();
if
(
null
!=
orvd
.
getEndCompanyId
()
&&
!
SYS_FALSE
.
equals
(
orvd
.
getEndCompanyId
()))
{
if
(
null
!=
orvd
.
getEndCompanyId
()
&&
!
SYS_FALSE
.
equals
(
orvd
.
getEndCompanyId
()))
{
// //查询订单退款记录
// OrderRefund orderRefund = orderRefundBiz.selectOne(new OrderRefund(){{
// setOrderId(baseOrder.getId());
// setRefundType(RefundTypeEnum.ORDER_FUND.getCode());
// }});
//新的账单
,
//新的账单
记录
OrderAccount
orderAccount
=
orderAccountBiz
.
selectOne
(
new
OrderAccount
(){{
OrderAccount
orderAccount
=
orderAccountBiz
.
selectOne
(
new
OrderAccount
(){{
setOrderId
(
baseOrder
.
getId
());
setOrderId
(
baseOrder
.
getId
());
setAccountType
(
AccountTypeEnum
.
IN_ORDER_PAY
.
getCode
());
setAccountType
(
AccountTypeEnum
.
IN_ORDER_PAY
.
getCode
());
}});
}});
// //查询押金退款记录
// OrderRefund depositOrderRefund = orderRefundBiz.selectOne(new OrderRefund(){{
// setOrderId(baseOrder.getId());
// setRefundType(RefundTypeEnum.DEPOSIT.getCode());
// }});
if
(
BigDecimal
.
ZERO
.
equals
(
orderAccount
.
getDeductAmount
()))
{
if
(
BigDecimal
.
ZERO
.
equals
(
orderAccount
.
getDeductAmount
()))
{
//使用免费天数
//使用免费天数
if
(
null
!=
orvd
.
getFreeDays
()
&&
orvd
.
getFreeDays
()
>
0
)
{
if
(
null
!=
orvd
.
getFreeDays
()
&&
orvd
.
getFreeDays
()
>
0
)
{
...
@@ -321,8 +310,8 @@ public class OrderMsgBiz {
...
@@ -321,8 +310,8 @@ public class OrderMsgBiz {
sms2AppUser
(
startCompanyDetail
,
endCompanyDetail
,
orvd
,
otd
,
omd
,
baseOrder
,
appUserDTO
,
smstype
,
smsParams
);
sms2AppUser
(
startCompanyDetail
,
endCompanyDetail
,
orvd
,
otd
,
omd
,
baseOrder
,
appUserDTO
,
smstype
,
smsParams
);
//发送用户退款消息
//发送用户退款消息
//
smsParams.clear();
smsParams
.
clear
();
// sms2RefundAppUser(BigDecimal.ZERO, orderRefund.getDeductAmount(), depositOrderRefund.getRefundAmount().add(orderRefund.getRefundAmount()
), BigDecimal.ZERO, baseOrder, appUserDTO, smstype, smsParams);
sms2RefundAppUser
(
BigDecimal
.
ZERO
,
orderAccount
.
getDeductAmount
(),
orderAccount
.
getAccountAmount
(
),
BigDecimal
.
ZERO
,
baseOrder
,
appUserDTO
,
smstype
,
smsParams
);
//后台发送消息(出车人)
//后台发送消息(出车人)
smsParams
.
clear
();
smsParams
.
clear
();
...
...
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