|
|
|
@ -103,6 +103,9 @@ public class IoOrderServiceImpl implements IoOrderService {
|
|
|
|
|
private HttpOkClient httpOkClient;
|
|
|
|
|
@Resource
|
|
|
|
|
private BasicCorpDao basicCorpDao;
|
|
|
|
|
@Resource
|
|
|
|
|
IoOrderInvoiceService ioOrderInvoiceService;
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public List<IoOrderEntity> findAll(FilterOrderRequest filterOrderRequest) {
|
|
|
|
|
QueryWrapper<IoOrderEntity> queryWrapper = new QueryWrapper<IoOrderEntity>()
|
|
|
|
@ -134,7 +137,14 @@ public class IoOrderServiceImpl implements IoOrderService {
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public IoOrderEntity findByBillNo(String billNO) {
|
|
|
|
|
return orderDao.selectOne(new QueryWrapper<IoOrderEntity>().eq("billNo", billNO));
|
|
|
|
|
IoOrderEntity orderEntity = orderDao.selectOne(new QueryWrapper<IoOrderEntity>().eq("billNo", billNO));
|
|
|
|
|
if (orderEntity == null) {
|
|
|
|
|
String billNoByInvoiceEncode = ioOrderInvoiceService.selectBillNoByInvoiceEncode(billNO);
|
|
|
|
|
if (billNoByInvoiceEncode != null) {
|
|
|
|
|
orderEntity = orderDao.selectOne(new QueryWrapper<IoOrderEntity>().eq("billNo", billNoByInvoiceEncode));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return orderEntity;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|