diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderInvoiceRecordServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderInvoiceRecordServiceImpl.java index 78ebde4a0..35c1b1179 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderInvoiceRecordServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderInvoiceRecordServiceImpl.java @@ -58,7 +58,7 @@ public class OrderInvoiceRecordServiceImpl implements IOrderInvoiceRecordService List orderCodes = Lists.newArrayList(orderInvoiceRecord.getOrderCodes().split(",")); List orderAmountDetailVOS = orderBasicInfoService.queryOrderAmountDetail(orderCodes); - InvoiceRecordVO vo = InvoiceRecordVO.builder() + return InvoiceRecordVO.builder() .id(orderInvoiceRecord.getId() + "") .memberId(orderInvoiceRecord.getMemberId()) .status(orderInvoiceRecord.getStatus()) @@ -67,8 +67,6 @@ public class OrderInvoiceRecordServiceImpl implements IOrderInvoiceRecordService .createTime(DateUtils.formatDateTime(orderInvoiceRecord.getCreateTime())) .updateTime(DateUtils.formatDateTime(orderInvoiceRecord.getUpdateTime())) .build(); - - return vo; } /** diff --git a/jsowell-ui/src/views/order/invoice/detail.vue b/jsowell-ui/src/views/order/invoice/detail.vue index 2533d946c..3862f60db 100644 --- a/jsowell-ui/src/views/order/invoice/detail.vue +++ b/jsowell-ui/src/views/order/invoice/detail.vue @@ -54,7 +54,7 @@ export default { // 申请开票 id invoiceRecordId: null, // 接口返回结果 - data: null, + data: {}, // 订单金额列表 orderList: [], // 发票抬头