Skip to content

S
supplier
Commit 98706bfa by Wyh
Options

Merge remote-tracking branch 'origin/master'

parents c3c5c732 e55a852e
Showing with 82 additions and 61 deletions
base-module/src/main/java/com/gingersoft/gsa/cloud/base/common/bean/TableBean.java
......@@ -78,6 +78,7 @@ public class TableBean {
* sort : 0
* minSeatCount : 2
* maxSeatCount : 8
* SplitStatus : 0
*/
private int id;
......@@ -105,7 +106,6 @@ public class TableBean {
* 已開檯 1
* 已送單 2
* 已印单 3
* 已分檯 4
*/
private int status;
/**
......@@ -130,6 +130,11 @@ public class TableBean {
private int type;
/**
* 0#未分檯
* 1#已分檯
*/
private int splitStatus;
/**
* 分檯编号
*/
private String tableNumber = "";
......@@ -162,7 +167,7 @@ public class TableBean {
}
}
public static TableBean.DataBean splitTableTransformTable( TableExtBean.DataBean dataBean) {
public static TableBean.DataBean splitTableTransformTable(TableExtBean.DataBean dataBean) {
TableBean.DataBean tableBean = new TableBean.DataBean();
tableBean.setId(dataBean.getId());
tableBean.setTableName(dataBean.getTableName() + "-" + dataBean.getTableNumber());
......
base-module/src/main/java/com/gingersoft/gsa/cloud/ui/view/OrderPayView.java
......@@ -267,7 +267,6 @@ public class OrderPayView extends LinearLayout {
return MoneyUtil.get_ItemDecimals_money(differenceMoney);
}
/**
* 獲取支付總額
*
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/AllTablePresenter.java
......@@ -203,7 +203,7 @@ public class AllTablePresenter extends BasePresenter<AllTableContract.Model, All
break;
case TableOperatTypeConstant.table_status_5:
for (int i = 0; i < datasBeans.size(); i++) {
if (datasBeans.get(i).getStatus() == 4 && datasBeans.get(i).getUseStatus() == 0) {
if (datasBeans.get(i).getSplitStatus() == 1 && datasBeans.get(i).getUseStatus() == 0) {
mTableList.add(datasBeans.get(i));
}
}
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/BaseOrderPresenter.java
......@@ -566,6 +566,9 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas
for (OrderDetail food : myOrderManage.getOrderFoodList()) {
total = MoneyUtil.sum(total, food.getPrice());
}
if (total < 0) {
total = 0;
}
return MoneyUtil.get_ItemDecimals_money(total);
}
......@@ -586,6 +589,9 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas
}
}
}
if (foodTotal < 0) {
foodTotal = 0;
}
return MoneyUtil.get_ItemDecimals_money(foodTotal);
}
......@@ -612,6 +618,9 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas
foodTotal = 0;
}
}
if (foodTotal < 0) {
foodTotal = 0;
}
return MoneyUtil.get_ItemDecimals_money(foodTotal);
}
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/OrderContentPresenter.java
......@@ -364,6 +364,7 @@ public class OrderContentPresenter extends BaseOrderPresenter<OrderContentContra
public void printOrder(long tableId, boolean isSend) {
RequestBody requestBody = new FormBody.Builder()
.add("tableId", tableId + "")
.add("tableNumber", OpenTableManage.getDefault().getTableBean().getTableNumber())
.build();
mModel.printOrder(requestBody)
.subscribeOn(Schedulers.io())
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/OrderPayPresenter.java
......@@ -8,6 +8,7 @@ import com.gingersoft.gsa.cloud.base.common.bean.OrderDetail;
import com.gingersoft.gsa.cloud.base.common.bean.OrderPayRequest;
import com.gingersoft.gsa.cloud.base.common.bean.PayMethod;
import com.gingersoft.gsa.cloud.base.common.bean.mealManage.MyOrderManage;
import com.gingersoft.gsa.cloud.base.common.bean.mealManage.OpenTableManage;
import com.gingersoft.gsa.cloud.base.utils.JsonUtils;
import com.gingersoft.gsa.cloud.base.utils.MoneyUtil;
import com.gingersoft.gsa.cloud.base.utils.gson.GsonUtils;
......@@ -255,6 +256,7 @@ public class OrderPayPresenter extends BaseOrderPresenter<OrderPayContract.Model
payRequest.setOrderId(MyOrderManage.getInstance().getOrderId());
payRequest.setOrderPayType(orderPayType);
payRequest.setLinePayType(orderPayView.getLinePayType());
payRequest.setTableNumber(OpenTableManage.getDefault().getTableBean().getTableNumber());
for (int i = 0; i < payMethodList.size(); i++) {
PayMethod payMethod = payMethodList.get(i);
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/StateTablePresenter.java
......@@ -191,7 +191,7 @@ public class StateTablePresenter extends BasePresenter<StateTableContract.Model,
break;
case TableOperatTypeConstant.table_status_5:
for (int i = 0; i < datasBeans.size(); i++) {
if (datasBeans.get(i).getStatus() == 4 && datasBeans.get(i).getUseStatus() == 0) {
if (datasBeans.get(i).getSplitStatus() == 1 && datasBeans.get(i).getUseStatus() == 0) {
mTableList.add(datasBeans.get(i));
}
}
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/TablePresenter.java
......@@ -745,7 +745,7 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont
case TableOperatTypeConstant.splite_table_1:
for (int i = 0; i < mTableList.size(); i++) {
// if (mTableList.get(i).getStatus() != 0 || mTableList.get(i).getSplitStatus() == 1 ? true : false) {
if (mTableList.get(i).getStatus() != 0) {
if (mTableList.get(i).getStatus() != 0 ) {
filterTableBeanList.add(mTableList.get(i));
}
}
......@@ -759,7 +759,7 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont
break;
case TableOperatTypeConstant.init_table_3:
for (int i = 0; i < mTableList.size(); i++) {
if (mTableList.get(i).getUseStatus() == 1 || mTableList.get(i).getStatus() == 4) {
if (mTableList.get(i).getUseStatus() == 1 || mTableList.get(i).getSplitStatus() == 1) {
filterTableBeanList.add(mTableList.get(i));
}
}
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/TableActivity.java
......@@ -300,7 +300,7 @@ public class TableActivity extends BaseFragmentActivity<TablePresenter> implemen
case TableOperatTypeConstant.print_parper_2:
case TableOperatTypeConstant.init_table_3:
setOperatContentText(dataBean.getTableName());
if (dataBean.getStatus() == 4) {
if (dataBean.getSplitStatus() == 1) {
showSplitTableDialog(dataBean.getId());
} else {
mPresenter.showOperatTipDialog(dataBean);
......@@ -311,14 +311,20 @@ public class TableActivity extends BaseFragmentActivity<TablePresenter> implemen
CommonTipDialog.showCancelDialog(this, "相同檯不能转檯", OrderContentPresenter.class, mPresenter, "", null, null);
return;
}
if (dataBean.getSplitStatus() == 1) {
showSplitTableDialog(dataBean.getId());
} else {
//獲取餐檯狀態
mPresenter.getTable(dataBean.getId());
}
//獲取餐檯狀態
mPresenter.getTable(dataBean.getId());
// mPresenter.getTable(dataBean.getId());
break;
case TableOperatTypeConstant.skyorder_mode_5:
break;
default:
if (dataBean.getStatus() == 4) {
if (dataBean.getSplitStatus() == 1) {
showSplitTableDialog(dataBean.getId());
} else {
mPresenter.openTable(dataBean.getId(), null);
......@@ -409,25 +415,24 @@ public class TableActivity extends BaseFragmentActivity<TablePresenter> implemen
@Override
public void onItemClick(SplitTableDialog dialog, TableBean.DataBean dataBean, int position) {
int currentChooseOperatType = mPresenter.getCurrentChooseOperatType();
if (currentChooseOperatType == -1) {
mPresenter.openTable(dataBean.getId(), dataBean);
} else {
mPresenter.showOperatTipDialog(dataBean);
}
// switch (currentChooseOperatType) {
// case TableOperatTypeConstant.print_parper_2:
// mPresenter.loadOrderToPrint(dataBean.getId(), dataBean.getOrderId());
// break;
// case TableOperatTypeConstant.init_table_3:
// mPresenter. initTable(dataBean.getId(), dataBean.getTableNumber(), true);
// break;
// case TableOperatTypeConstant.skyorder_mode_5:
//
// break;
// default:
// mPresenter.openTable(dataBean.getId(), dataBean);
// break;
// if (currentChooseOperatType == -1) {
// mPresenter.openTable(dataBean.getId(), dataBean);
// } else {
// mPresenter.showOperatTipDialog(dataBean);
// }
switch (currentChooseOperatType) {
case TableOperatTypeConstant.print_parper_2:
case TableOperatTypeConstant.init_table_3:
mPresenter.showOperatTipDialog(dataBean);
break;
case TableOperatTypeConstant.move_table_4:
//獲取餐檯狀態
mPresenter.getTable(dataBean.getId());
break;
default:
mPresenter.openTable(dataBean.getId(), dataBean);
break;
}
}
});
mSplitTableDialog.setOnRetryListener(new BaseRetryDialog.OnRetryListener() {
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/adapter/TableAdapter.java
......@@ -224,34 +224,33 @@ public class TableAdapter extends DefaultAdapter<TableBean.DataBean> {
private void initTableBackground(TableBean.DataBean item) {
// if (item.getSplitStatus() != 0) {
// setBackGroundWork(item, "888", R.drawable.tablebutton_splite, R.drawable.tablebutton_splite_new, R.color.black);
// } else {
if (item.getSplitStatus() != 0) {
setBackGroundWork(item, ContextCompat.getColor(mContext, R.color.app_color_blue_2), R.color.theme_white_color, R.color.theme_white_color);
} else {
ll_container.setBackgroundColor(Color.parseColor("#FFFFFFFF"));
ll_container.setBackgroundColor(Color.parseColor("#FFFFFFFF"));
if (item.getUseStatus() == 1) {
setBackGroundWork(item, Color.parseColor("#FFD14141"), R.color.theme_white_color, R.color.theme_black);
} else {
switch (item.getStatus()) {
case 0:
setBackGroundWork(item, Color.parseColor("#FFFFFFFF"), R.color.black, R.color.theme_black);
break;
case 1:
if (item.getUseStatus() == 1) {
setBackGroundWork(item, Color.parseColor("#FFD14141"), R.color.theme_white_color, R.color.theme_black);
} else {
switch (item.getStatus()) {
case 0:
setBackGroundWork(item, Color.parseColor("#FFFFFFFF"), R.color.black, R.color.theme_black);
break;
case 1:
// setBackGroundWork(item, "2", R.drawable.table_shape_table_send, R.drawable.tablebutton_glassgreen_new, R.color.theme_white_color); break;
case 2:
setBackGroundWork(item, Color.parseColor("#FF249B65"), R.color.theme_white_color, R.color.theme_white_color);
break;
case 3:
setBackGroundWork(item, Color.parseColor("#FFE5AC00"), R.color.theme_white_color, R.color.theme_white_color);
break;
case 4:
setBackGroundWork(item, ContextCompat.getColor(mContext, R.color.app_color_blue_2), R.color.theme_white_color, R.color.theme_white_color);
break;
case 5:
case 6:
setBackGroundWork(item, ContextCompat.getColor(mContext, R.color.Violet), R.color.theme_white_color, R.color.theme_white_color);
break;
case 2:
setBackGroundWork(item, Color.parseColor("#FF249B65"), R.color.theme_white_color, R.color.theme_white_color);
break;
case 3:
setBackGroundWork(item, Color.parseColor("#FFE5AC00"), R.color.theme_white_color, R.color.theme_white_color);
break;
case 4:
case 5:
case 6:
setBackGroundWork(item, ContextCompat.getColor(mContext, R.color.Violet), R.color.theme_white_color, R.color.theme_white_color);
break;
}
}
}
}
......
table-module/src/main/res/layout/table_dialog_split.xml
......@@ -23,19 +23,20 @@
android:layout_height="match_parent"
android:fitsSystemWindows="true" />
<ProgressBar
android:id="@+id/progress"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:visibility="invisible"/>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler_table"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
app:spanCount="3" />
app:spanCount="3"
android:background="@color/theme_background_color"/>
<ProgressBar
android:id="@+id/progress"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:visibility="invisible"/>
</FrameLayout>
<!-- <ImageView-->
<!-- android:id="@+id/btn_close"-->
......
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