|
@@ -1652,14 +1652,18 @@ public class OrderServiceImpl implements OrderService {
|
|
|
@Override
|
|
@Override
|
|
|
public Order findOrderDetail(String orderid) {
|
|
public Order findOrderDetail(String orderid) {
|
|
|
Order order = orderDao.findOrderByOrderid(orderid);
|
|
Order order = orderDao.findOrderByOrderid(orderid);
|
|
|
- if (order.getBuyerenuu() != null && order.getBuyerentername() == null) {
|
|
|
|
|
- Enterprise enterprise = enterpriseDao.findByUu(order.getBuyerenuu());
|
|
|
|
|
- if (enterprise != null) {
|
|
|
|
|
- order.setBuyerentername(enterprise.getEnName());
|
|
|
|
|
|
|
+ if (order != null) {
|
|
|
|
|
+ if (order.getBuyerenuu() != null && order.getBuyerentername() == null) {
|
|
|
|
|
+ Enterprise enterprise = enterpriseDao.findByUu(order.getBuyerenuu());
|
|
|
|
|
+ if (enterprise != null) {
|
|
|
|
|
+ order.setBuyerentername(enterprise.getEnName());
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
|
|
+ order.setReceiveName(sysConf.getEnName());
|
|
|
|
|
+ return order;
|
|
|
|
|
+ } else {
|
|
|
|
|
+ throw new IllegalOperatorException("找不到指定的订单");
|
|
|
}
|
|
}
|
|
|
- order.setReceiveName(sysConf.getEnName());
|
|
|
|
|
- return order;
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|