Commit b3c4c556 by 宁斌

隐藏分檯操作

parent ea884f5b
...@@ -320,8 +320,9 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont ...@@ -320,8 +320,9 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont
} }
public void loadOrderToPrint(long tableId, Long orderId) { public void loadOrderToPrint(long tableId, Long orderId) {
if (orderId == null) if (orderId == null) {
return; return;
}
mModel.getOrderById(orderId) mModel.getOrderById(orderId)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.doOnSubscribe(disposable -> mRootView.showLoading(null)) .doOnSubscribe(disposable -> mRootView.showLoading(null))
...@@ -953,7 +954,7 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont ...@@ -953,7 +954,7 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont
@Override @Override
public void splitTableAction() { public void splitTableAction() {
showSplitTableDialog(dataBean.getId()); // showSplitTableDialog(dataBean.getId());
} }
@Override @Override
......
...@@ -214,7 +214,7 @@ public class SelectMealAdapter extends DefaultAdapter<OrderDetail> { ...@@ -214,7 +214,7 @@ public class SelectMealAdapter extends DefaultAdapter<OrderDetail> {
// datasBean.getDiscount_id() == 0) { // datasBean.getDiscount_id() == 0) {
if (datasBean.isNew() && if (datasBean.isNew() &&
mOrderContentPresenter != null && mOrderContentPresenter != null &&
select_position == position && datasBean.getSelected() != 0 &&
datasBean.getProp() == OrderDetail.FOOD_PROP) { datasBean.getProp() == OrderDetail.FOOD_PROP) {
iv_add_count.setVisibility(View.VISIBLE); iv_add_count.setVisibility(View.VISIBLE);
...@@ -781,8 +781,9 @@ public class SelectMealAdapter extends DefaultAdapter<OrderDetail> { ...@@ -781,8 +781,9 @@ public class SelectMealAdapter extends DefaultAdapter<OrderDetail> {
select_full_start_position = k; select_full_start_position = k;
break; break;
} }
} else } else {
break; break;
}
} }
k = select_position; k = select_position;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment