Commit 8de33ae4 authored by unset's avatar unset

添加通知信息

parent c91c9518
...@@ -383,6 +383,7 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> { ...@@ -383,6 +383,7 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
orderInfo.setRemark(orderInfoDto.getRemark()); orderInfo.setRemark(orderInfoDto.getRemark());
orderInfo.setAmount(new BigDecimal(amount.get())); orderInfo.setAmount(new BigDecimal(amount.get()));
orderInfo.setNumber(number.get()); orderInfo.setNumber(number.get());
orderInfo.setTotalAmount(orderInfo.getAmount());
//订单发票信息 //订单发票信息
if (orderInfoDto.getUserInvoiceId() != null) { if (orderInfoDto.getUserInvoiceId() != null) {
UserInvoice userInvoice = userInvoiceBiz.selectById(orderInfoDto.getUserInvoiceId()); UserInvoice userInvoice = userInvoiceBiz.selectById(orderInfoDto.getUserInvoiceId());
...@@ -408,11 +409,8 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> { ...@@ -408,11 +409,8 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
if (dictionary != null && StringUtils.isNotBlank(dictionary.getDetail())) { if (dictionary != null && StringUtils.isNotBlank(dictionary.getDetail())) {
orderInfo.setFee(new BigDecimal(dictionary.getDetail())); orderInfo.setFee(new BigDecimal(dictionary.getDetail()));
} }
if (orderInfo.getFee() != null) { if (orderInfo.getFee() != null) {
orderInfo.setTotalAmount(orderInfo.getAmount().add(orderInfo.getFee())); orderInfo.setTotalAmount(orderInfo.getAmount().add(orderInfo.getFee()));
} else {
orderInfo.setTotalAmount(orderInfo.getAmount());
} }
} }
} }
......
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