diff --git a/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/service/impl/OrderInvoiceInfoServiceImpl.java b/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/service/impl/OrderInvoiceInfoServiceImpl.java index 026fb6fc..a6743eda 100644 --- a/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/service/impl/OrderInvoiceInfoServiceImpl.java +++ b/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/service/impl/OrderInvoiceInfoServiceImpl.java @@ -1622,10 +1622,10 @@ public class OrderInvoiceInfoServiceImpl implements OrderInvoiceInfoService { RedInvoiceRespPo redInvoiceRespPo = new RedInvoiceRespPo(); List orderInvoiceInfoVos = orderInvoiceInfoMapper.selectInvoiceInfoByBzdh(redInvoiceReqPo.getLzbzdh(), Arrays.asList(redInvoiceReqPo.getXhfNsrsbh())); List orderItemInfos = orderItemInfoMapper.selectOrderItemInfoByOrderId(redInvoiceReqPo.getOrderInfoId(), Arrays.asList(redInvoiceReqPo.getXhfNsrsbh())); - OrderInvoiceInfo invoiceInfo = new OrderInvoiceInfo(); - invoiceInfo.setOrderInfoId(redInvoiceReqPo.getOrderInfoId()); - OrderInvoiceInfo orderInvoiceInfo = orderInvoiceInfoMapper.selectOrderInvoiceInfo(invoiceInfo, Arrays.asList(redInvoiceReqPo.getXhfNsrsbh())); - OrderProcessInfo orderProcessInfo = orderInfoMapper.selectProcessByFpqqlsh(orderInvoiceInfo.getFpqqlsh(), Arrays.asList(redInvoiceReqPo.getXhfNsrsbh())); +// OrderInvoiceInfo invoiceInfo = new OrderInvoiceInfo(); +// invoiceInfo.setOrderInfoId(redInvoiceReqPo.getOrderInfoId()); + OrderInfo orderInfo = orderInfoMapper.selectOrderInfoByOrderId(redInvoiceReqPo.getOrderInfoId(), Arrays.asList(redInvoiceReqPo.getXhfNsrsbh())); + OrderProcessInfo orderProcessInfo = orderInfoMapper.selectProcessByFpqqlsh(orderInfo.getFpqqlsh(), Arrays.asList(redInvoiceReqPo.getXhfNsrsbh())); //是否允许勾选,发票状态 orderInvoiceInfoVos.stream().map(t->{ Boolean selected = true; @@ -1698,7 +1698,7 @@ public class OrderInvoiceInfoServiceImpl implements OrderInvoiceInfoService { List itemInfos = comparisonMap.entrySet().stream().map(Map.Entry::getValue).collect(Collectors.toList()); redInvoiceRespPo.setRedItemInfoList(itemInfos); } - redInvoiceRespPo.setRedFpqqlsh(orderInvoiceInfo.getFpqqlsh()); + redInvoiceRespPo.setRedFpqqlsh(orderInfo.getFpqqlsh()); redInvoiceRespPo.setRedBzdh(orderProcessInfo.getBzdh()); redInvoiceRespPo.setGsdm(orderProcessInfo.getGsdm()); return redInvoiceRespPo;