Commit 4d325b34 authored by 周健威's avatar 周健威

修复短信发送bug

parent 762293e3
......@@ -283,24 +283,13 @@ public class OrderMsgBiz {
CompanyDetail startCompanyDetail = vehicleFeign.getCompanyDetail(orvd.getStartCompanyId()).getData();
CompanyDetail endCompanyDetail = vehicleFeign.getCompanyDetail(orvd.getEndCompanyId()).getData();
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(){{
setOrderId(baseOrder.getId());
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(null != orvd.getFreeDays() && orvd.getFreeDays() > 0) {
......@@ -321,8 +310,8 @@ public class OrderMsgBiz {
sms2AppUser(startCompanyDetail, endCompanyDetail, orvd, otd, omd, baseOrder, appUserDTO, smstype, smsParams);
//发送用户退款消息
// smsParams.clear();
// sms2RefundAppUser(BigDecimal.ZERO, orderRefund.getDeductAmount(), depositOrderRefund.getRefundAmount().add(orderRefund.getRefundAmount()), BigDecimal.ZERO, baseOrder, appUserDTO, smstype, smsParams);
smsParams.clear();
sms2RefundAppUser(BigDecimal.ZERO, orderAccount.getDeductAmount(), orderAccount.getAccountAmount(), BigDecimal.ZERO, baseOrder, appUserDTO, smstype, smsParams);
//后台发送消息(出车人)
smsParams.clear();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment