1、餐牌返回餐檯為紅檯問題 2、分檯重置 3、折扣結構邏輯問題

table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/MealStandPresenter.java

@@ -757,12 +757,12 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod
                     public void onNext(@NonNull BaseResult info) {
                     public void onNext(@NonNull BaseResult info) {
                         if (info != null && info.isSuccess()) {
                         if (info != null && info.isSuccess()) {
                             mRootView.showMessage("送單成功");
                             mRootView.showMessage("送單成功");
-                            printSendOrder(false);
+                            printSendOrder(true);
                         } else {
                         } else {
                             if (!hasNesOrderFoods()) {
                             if (!hasNesOrderFoods()) {
                                 //TODO 未新增食品點擊送單 後台不讓過直接提示即可
                                 //TODO 未新增食品點擊送單 後台不讓過直接提示即可
                                 mRootView.showMessage("送單成功");
                                 mRootView.showMessage("送單成功");
-                                printSendOrder(false);
+                                printSendOrder(true);
                             } else {
                             } else {
                                 mRootView.showMessage(info.getErrMsg());
                                 mRootView.showMessage(info.getErrMsg());
                             }
                             }

table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/TablePresenter.java

@@ -596,6 +596,13 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont
 
 
                             getTables(false, null);
                             getTables(false, null);
 
 
+                            if (!TextUtils.isEmpty(tableNumber)) {
+                                SplitTableDialog splitTableDialog = IActivity.getSplitTableDialog();
+                                if (splitTableDialog != null) {
+                                    //重置分檯成功,刷新餐檯
+                                    getSplitTables(splitTableDialog.getMainTableId());
+                                }
+                            }
                         } else {
                         } else {
                             if (showMessage)
                             if (showMessage)
                                 mRootView.showMessage(respose.getErrMsg());
                                 mRootView.showMessage(respose.getErrMsg());

table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/TableActivity.java

@@ -437,6 +437,7 @@ public class TableActivity extends BaseFragmentActivity<TablePresenter> implemen
                 }
                 }
             });
             });
         }
         }
+        mSplitTableDialog.setMainTableId(tableId);
         mSplitTableDialog.build().show();
         mSplitTableDialog.build().show();
         mPresenter.getSplitTables(tableId);
         mPresenter.getSplitTables(tableId);
     }
     }

table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/widget/SplitTableDialog.java

@@ -52,6 +52,7 @@ public class SplitTableDialog extends BaseRetryDialog {
     private int mShadowElevationDp = 14;
     private int mShadowElevationDp = 14;
     private int mBagcolor;
     private int mBagcolor;
 
 
+    private int mainTableId;
     private List<TableBean.DataBean> mItems;
     private List<TableBean.DataBean> mItems;
     private TableAdapter mAdapter;
     private TableAdapter mAdapter;
 
 
@@ -172,6 +173,14 @@ public class SplitTableDialog extends BaseRetryDialog {
         progress.setVisibility(show ? View.VISIBLE : View.INVISIBLE);
         progress.setVisibility(show ? View.VISIBLE : View.INVISIBLE);
     }
     }
 
 
+    public int getMainTableId() {
+        return mainTableId;
+    }
+
+    public void setMainTableId(int mainTableId) {
+        this.mainTableId = mainTableId;
+    }
+
     public void closeDialog() {
     public void closeDialog() {
         mDialog.dismiss();
         mDialog.dismiss();
     }
     }