1、餐牌送單信息不跳轉新增訂單頁 2、新增訂單彈出選擇人數框

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

@@ -93,7 +93,6 @@ import static com.gingersoft.gsa.cloud.table.mvp.ui.activity.SoldoutCtrlActivity
  * <a href="https://github.com/JessYanCoding/MVPArmsTemplate">模版请保持更新</a>
  * <a href="https://github.com/JessYanCoding/MVPArmsTemplate">模版请保持更新</a>
  * ================================================
  * ================================================
  */
  */
-@Data
 @ActivityScope
 @ActivityScope
 public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Model, MealStandContract.View> {
 public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Model, MealStandContract.View> {
     @Inject
     @Inject

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

@@ -325,9 +325,6 @@ public class MealStandActivity extends BaseFragmentActivity<MealStandPresenter>
     }
     }
 
 
     private void initTableDetail() {
     private void initTableDetail() {
-        if (OpenTableManage.getDefault().getPeopleNumber() == 0) {
-            showChoosePeopleNumDialog(false);
-        }
         if (MyOrderManage.getInstance().getOrderType() == MyOrderManage.order_type_1) {
         if (MyOrderManage.getInstance().getOrderType() == MyOrderManage.order_type_1) {
             TableBean.DataBean tableBean = new TableBean.DataBean();
             TableBean.DataBean tableBean = new TableBean.DataBean();
             tableBean.setPerson(1);
             tableBean.setPerson(1);
@@ -336,6 +333,10 @@ public class MealStandActivity extends BaseFragmentActivity<MealStandPresenter>
             OpenTableManage.getDefault().setTableBean(tableBean);
             OpenTableManage.getDefault().setTableBean(tableBean);
 
 
             btn_send_order.setText("送單信息");
             btn_send_order.setText("送單信息");
+        } else {
+            if (OpenTableManage.getDefault().getPeopleNumber() == 0) {
+                showChoosePeopleNumDialog(false);
+            }
         }
         }
     }
     }
 
 
@@ -591,10 +592,6 @@ public class MealStandActivity extends BaseFragmentActivity<MealStandPresenter>
     @OnClick(R2.id.btn_table)
     @OnClick(R2.id.btn_table)
     void onClickTable() {
     void onClickTable() {
         if (MyOrderManage.getInstance().getOrderType() == MyOrderManage.order_type_1) {
         if (MyOrderManage.getInstance().getOrderType() == MyOrderManage.order_type_1) {
-            CC.obtainBuilder("ComponentDeliveryPick")
-                    .setActionName("SendOrder")
-                    .build()
-                    .call();
             return;
             return;
         }
         }
         //type取值：1:qrCdoetype，2:手機號，3:memberId
         //type取值：1:qrCdoetype，2:手機號，3:memberId
@@ -731,6 +728,13 @@ public class MealStandActivity extends BaseFragmentActivity<MealStandPresenter>
             mPresenter.restoreDeleteFood();
             mPresenter.restoreDeleteFood();
             showBtnMealModifyRestoreVisibility(false);
             showBtnMealModifyRestoreVisibility(false);
         } else if (id == R.id.btn_send_order) {
         } else if (id == R.id.btn_send_order) {
+            if (MyOrderManage.getInstance().getOrderType() == MyOrderManage.order_type_1) {
+                CC.obtainBuilder("ComponentDeliveryPick")
+                        .setActionName("SendOrder")
+                        .build()
+                        .call();
+                return;
+            }
             mPresenter.sendOrder(false, null);
             mPresenter.sendOrder(false, null);
         } else if (id == R.id.fl_order_content) {
         } else if (id == R.id.fl_order_content) {
             //如果打印成功會回調
             //如果打印成功會回調