feature 1.修复拆分后不展示数据的问题

release
zhenghaiyang@ele-cloud.com 2 years ago
parent 8d10008b66
commit 69485420a1
  1. 1
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderCommonServiceImpl.java
  2. 6
      order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/service/impl/OrderInvoiceInfoServiceImpl.java

@ -1258,6 +1258,7 @@ public class OrderCommonServiceImpl implements OrderCommonService {
orderProcessInfo.setOriginDdh(processInfo.getDdh()); orderProcessInfo.setOriginDdh(processInfo.getDdh());
orderProcessInfo.setOriginOrderId(processInfo.getOrderInfoId()); orderProcessInfo.setOriginOrderId(processInfo.getOrderInfoId());
orderProcessInfo.setKb(processInfo.getKb()); orderProcessInfo.setKb(processInfo.getKb());
orderProcessInfo.setEntId(processInfo.getEntId());
return orderProcessInfo; return orderProcessInfo;
} }

@ -196,6 +196,12 @@ public class OrderInvoiceInfoServiceImpl implements OrderInvoiceInfoService {
OrderInvoiceInfo oderInvoiceInfo = orderInvoiceInfoMapper.selectOrderInvoiceInfo(orderInvoiceInfo1, shList); OrderInvoiceInfo oderInvoiceInfo = orderInvoiceInfoMapper.selectOrderInvoiceInfo(orderInvoiceInfo1, shList);
if (oderInvoiceInfo != null) { if (oderInvoiceInfo != null) {
OrderInfo orderInfo = orderInfoMapper.selectOrderInfoByOrderId(oderInvoiceInfo.getOrderInfoId(), shList); OrderInfo orderInfo = orderInfoMapper.selectOrderInfoByOrderId(oderInvoiceInfo.getOrderInfoId(), shList);
if(StringUtils.isNotBlank(oderInvoiceInfo.getFpqqlsh())){
OrderProcessInfo processInfo = orderInfoMapper.selectProcessByFpqqlsh(oderInvoiceInfo.getFpqqlsh(), shList);
if(processInfo != null){
orderInfo.setYhbh(processInfo.getYhbh());
}
}
List<OrderItemInfo> list = orderItemInfoMapper.selectOrderItemInfoByOrderId(oderInvoiceInfo.getOrderInfoId(), shList); List<OrderItemInfo> list = orderItemInfoMapper.selectOrderItemInfoByOrderId(oderInvoiceInfo.getOrderInfoId(), shList);
co.setOrderInvoiceInfo(oderInvoiceInfo); co.setOrderInvoiceInfo(oderInvoiceInfo);
co.setOrderItemList(JsonUtils.getInstance().listBeanCopy(list, OrderItemInfo.class)); co.setOrderItemList(JsonUtils.getInstance().listBeanCopy(list, OrderItemInfo.class));

Loading…
Cancel
Save