Merge remote-tracking branch 'origin/test' into test
This commit is contained in:
commit
843408b81e
|
|
@ -1838,7 +1838,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Object printOrder(BaseTableDTO baseTableDTO) {
|
public Object printOrder(BaseTableDTO baseTableDTO) {
|
||||||
ShopEatTypeInfoDTO shopEatTypeInfoDTO = checkEatModel(baseTableDTO.getTableId(), baseTableDTO.getTableId());
|
ShopEatTypeInfoDTO shopEatTypeInfoDTO = checkEatModel(baseTableDTO.getShopId(), baseTableDTO.getTableId());
|
||||||
|
|
||||||
Integer currentOrderId = getCurrentOrderId(shopEatTypeInfoDTO);
|
Integer currentOrderId = getCurrentOrderId(shopEatTypeInfoDTO);
|
||||||
if (currentOrderId == null) {
|
if (currentOrderId == null) {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue