Merge branch 'master' of https://gitee.com/luxiaotao1123/zy-asrs into hylyasrs

18516761980

2022-06-21 f849fe0808bb3b38f60c24492d6d4595e9b7fa82

 src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java

@@ -84,6 +84,7 @@
                    orderDetl.setQty(orderDetl.getAnfme());
                    orderDetl.setOrderId(order.getId());
                    orderDetl.setOrderNo(orderNo);
                    orderDetl.setStatus(1);
                    orderDetl.setCreateTime(order.getCreateTime());
                    orderDetl.setCreateBy(order.getCreateBy());
                    orderDetl.setUpdateTime(order.getUpdateTime());
@@ -155,4 +156,14 @@
        orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_id", orderId));
    }

    @Override
    public List<Order> selectComplete() {
        return this.baseMapper.selectComplete();
    }

    @Override
    public boolean addToLogTable(Order order) {
        return this.baseMapper.addToLogTable(order) > 0;
    }

}