修改訂單

62672cb9 · 宁斌 · daefa31e · 62672cb9 · 62672cb9 · 62672cb9
Commit 62672cb9 authored Mar 19, 2020 by 宁斌
37 changed files
--- a/main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/activity/NewMainActivity.java
+++ b/main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/activity/NewMainActivity.java
@@ -135,6 +135,7 @@ public class NewMainActivity extends BaseActivity<NewMainPresenter> implements N
                mainTopFragment.setData(msg);
            }
        });
+        refresh.setEnableLoadMore(false);
        initFuncationData();
        setTitleInfo();
    }
@@ -176,7 +177,6 @@ public class NewMainActivity extends BaseActivity<NewMainPresenter> implements N
        refresh.finishRefresh();
    }
    private void initFuncationData() {
        //拿到功能列表數據
 //        FunctionDaoUtils functionDao = new FunctionDaoUtils(mContext);

--- a/main/src/main/res/layout/activity_new_main.xml
+++ b/main/src/main/res/layout/activity_new_main.xml
@@ -140,6 +140,10 @@
                android:layout_height="match_parent"
                android:background="#F0edf1">
+                <ScrollView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:fillViewport="true">
                    <RelativeLayout
                        android:layout_width="match_parent"
                        android:layout_height="match_parent">
@@ -255,6 +259,7 @@
                            </LinearLayout>
                        </com.lihang.ShadowLayout>
                    </RelativeLayout>
+                </ScrollView>
            </com.scwang.smartrefresh.layout.SmartRefreshLayout>
        </LinearLayout>

--- a/public-base/src/main/java/com/gingersoft/gsa/cloud/globalconfig/applyOptions/MyResponseErrorListener.java
+++ b/public-base/src/main/java/com/gingersoft/gsa/cloud/globalconfig/applyOptions/MyResponseErrorListener.java
@@ -50,7 +50,7 @@ public class MyResponseErrorListener implements ResponseErrorListener {
        }
 //        ArmsUtils.snackbarText(msg);
 //        LogUtil.d("handleResponseError: " + t.getMessage());
-        LogUtil.d(TAG, t.getMessage());
+         LogUtil.d(TAG, t.getMessage());
        if(!TextUtils.isEmpty(msg)){
            ToastUtils.show(context, msg);
        }

--- a/table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/contract/BaseOrderContract.java
+++ b/table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/contract/BaseOrderContract.java
 package com.gingersoft.gsa.cloud.table.mvp.contract;
 import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
+import com.gingersoft.gsa.cloud.table.mvp.model.bean.BaseRespose;
 import com.jess.arms.base.DefaultAdapter;
 import com.jess.arms.mvp.IModel;
 import com.jess.arms.mvp.IView;
@@ -43,5 +44,7 @@ public interface BaseOrderContract {
        Observable<BaseResult> updateOrder(RequestBody formBody);
+        Observable<BaseRespose> calculationPrice(long orderId);
    }
 }
--- a/table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/contract/MealStandContract.java
+++ b/table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/contract/MealStandContract.java
@@ -3,6 +3,7 @@ package com.gingersoft.gsa.cloud.table.mvp.contract;
 import android.app.Activity;
 import android.widget.BaseAdapter;
+import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
 import com.gingersoft.gsa.cloud.database.bean.ComboItem;
 import com.gingersoft.gsa.cloud.database.bean.Food;
 import com.gingersoft.gsa.cloud.database.bean.FoodCombo;

--- a/table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/contract/OrderCenterContract.java
+++ b/table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/contract/OrderCenterContract.java
@@ -27,7 +27,7 @@ public interface OrderCenterContract {
    //对于经常使用的关于UI的方法可以定义到IView中,如显示隐藏进度条,和显示文字消息
    interface View extends IView {
-        void showEmptyView(boolean isSuccess,int size,Throwable t);
+        void showEmptyView(boolean isSuccess, int size, Throwable t);
        void returnOrderItemList(List<OrderDetailItem> orderItemList);
@@ -44,9 +44,9 @@ public interface OrderCenterContract {
    //Model层定义接口,外部只需关心Model返回的数据,无需关心内部细节,即是否使用缓存
    interface Model extends IModel {
-        Observable<BaseResult> loadOrderList(int restaurantId,byte status, int pageIndex, int pageSize);
+        Observable<BaseResult> loadOrderList(int restaurantId, byte status, int pageIndex, int pageSize);
-        Observable<BaseResult> cancelOrder(long orderId,int restaurantId,byte status);
+        Observable<BaseResult> cancelOrder(long orderId, int restaurantId, byte status);
    }
 }
--- a/table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/contract/OrderPayContract.java
+++ b/table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/contract/OrderPayContract.java
@@ -5,6 +5,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
 import com.gingersoft.gsa.cloud.table.app.payment.bean.RefundRespose;
 import com.gingersoft.gsa.cloud.table.app.payment.bean.SaleRespose;
+import com.gingersoft.gsa.cloud.table.mvp.model.bean.BaseRespose;
 import com.gingersoft.gsa.cloud.ui.widget.dialog.StatusLoadingDialog;
 import io.reactivex.Observable;
@@ -55,6 +56,8 @@ public interface OrderPayContract {
        Observable<BaseResult> getPayMethods(int brandId,int restaurantId);
+        Observable<BaseResult> updateOrderPay(RequestBody requestBody);
 //        Observable<Object> getN5SaleTxnId(String url);
 //
 //        Observable<BaseResult> updateOrderStatus( RequestBody formBody);

--- a/table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/MealStandModel.java
+++ b/table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/MealStandModel.java
@@ -80,9 +80,9 @@ public class MealStandModel extends BaseModel implements MealStandContract.Model
    }
    @Override
-    public List<Modifier> queryDB_ModifierList(long fid,int mode) {
+    public List<Modifier> queryDB_ModifierList(long fid, int mode) {
        ModifierDaoUtils daoUtils = new ModifierDaoUtils(mApplication);
-        return daoUtils.queryModifiersByFid(fid,mode);
+        return daoUtils.queryModifiersByFid(fid, mode);
    }
    @Override
@@ -123,8 +123,19 @@ public class MealStandModel extends BaseModel implements MealStandContract.Model
    @Override
    public Observable<BaseRespose> deleteFood(RequestBody requestBody) {
-        return mRepositoryManager.obtainRetrofitService(MealService.class)
+        Observable ob = mRepositoryManager.obtainRetrofitService(MealService.class)
                .deleteFood(requestBody)
+//                .flatMap(new Function<BaseResult, Observable<BaseRespose>>() {
+//                    @Override
+//                    public Observable<BaseRespose> apply(BaseResult info) throws Exception {
+//                        if (MyOrderManage.getInstance().isModifyOrder()) {
+//                            if (info != null && info.isSuccess()) {
+//                                return calculationPrice(MyOrderManage.getInstance().getOrderId());
+//                            }
+//                        }
+//                        return null;
+//                    }
+//                })
                .flatMap(new Function<BaseResult, Observable<BaseRespose>>() {
                    @Override
                    public Observable<BaseRespose> apply(BaseResult info) throws Exception {
@@ -134,6 +145,13 @@ public class MealStandModel extends BaseModel implements MealStandContract.Model
                        return null;
                    }
                });
+        return ob;
+    }
+    @Override
+    public Observable<BaseRespose> calculationPrice(long orderId) {
+        return mRepositoryManager.obtainRetrofitService(MealService.class)
+                .calculationPrice(orderId);
    }
    @Override

--- a/table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/OrderContentModel.java
+++ b/table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/OrderContentModel.java
@@ -84,4 +84,9 @@ public class OrderContentModel extends BaseModel implements OrderContentContract
        return mRepositoryManager.obtainRetrofitService(OrderPayService.class)
                .updateOrder(formBody);
    }
+    @Override
+    public Observable<BaseRespose> calculationPrice(long orderId) {
+        return null;
+    }
 }
\ No newline at end of file
--- a/table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/OrderPayModel.java
+++ b/table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/OrderPayModel.java
@@ -3,8 +3,10 @@ package com.gingersoft.gsa.cloud.table.mvp.model;
 import android.app.Application;
 import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
+import com.gingersoft.gsa.cloud.base.common.bean.mealManage.MyOrderManage;
 import com.gingersoft.gsa.cloud.base.utils.constans.HttpsConstans;
 import com.gingersoft.gsa.cloud.table.mvp.contract.OrderPayContract;
+import com.gingersoft.gsa.cloud.table.mvp.model.bean.BaseRespose;
 import com.gingersoft.gsa.cloud.table.mvp.model.service.MealService;
 import com.gingersoft.gsa.cloud.table.mvp.model.service.OrderPayService;
 import com.google.gson.Gson;
@@ -15,6 +17,7 @@ import com.jess.arms.mvp.BaseModel;
 import javax.inject.Inject;
 import io.reactivex.Observable;
+import io.reactivex.functions.Function;
 import me.jessyan.retrofiturlmanager.RetrofitUrlManager;
 import okhttp3.RequestBody;
@@ -57,6 +60,18 @@ public class OrderPayModel extends BaseModel implements OrderPayContract.Model {
    }
    @Override
+    public Observable<BaseResult> updateOrderPay( RequestBody requestBody) {
+        return mRepositoryManager.obtainRetrofitService(OrderPayService.class)
+                .updateOrderPay(requestBody);
+    }
+    @Override
+    public Observable<BaseRespose> calculationPrice(long orderId) {
+        return mRepositoryManager.obtainRetrofitService(MealService.class)
+                .calculationPrice(orderId);
+    }
+    @Override
    public Observable<BaseResult> createOrder(RequestBody requestBody) {
        return mRepositoryManager.obtainRetrofitService(MealService.class)
                .createOrder(requestBody);
@@ -64,8 +79,24 @@ public class OrderPayModel extends BaseModel implements OrderPayContract.Model {
    @Override
    public Observable<BaseResult> addFood(RequestBody requestBody) {
-        return mRepositoryManager.obtainRetrofitService(MealService.class)
+        Observable ob = mRepositoryManager.obtainRetrofitService(MealService.class)
                .addFood(requestBody);
+//        if (MyOrderManage.getInstance().isModifyOrder()) {
+//            /**
+//             * 修改訂單
+//             * 添加食品后更新總金額
+//             */
+//            ob.flatMap(new Function<BaseResult, Observable<BaseRespose>>() {
+//                @Override
+//                public Observable<BaseRespose> apply(BaseResult info) throws Exception {
+//                    if (info != null && info.isSuccess()) {
+//                        return calculationPrice(MyOrderManage.getInstance().getOrderId());
+//                    }
+//                    return null;
+//                }
+//            });
+//        }
+        return ob;
    }
    @Override

--- a/table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/bean/OrderDetailItem.java
+++ b/table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/bean/OrderDetailItem.java
@@ -23,6 +23,7 @@ public class OrderDetailItem implements Serializable {
    /**
     * id : 47040
     * tableName : 4
+     * tableId : 1694
     * orderNo : gs200371144969589
     * status : 0
     * totalAmount : 10
@@ -31,15 +32,18 @@ public class OrderDetailItem implements Serializable {
     * endTime : Mar 14, 2020 1:24:12 PM
     * person : 2
     * payName : 支付寶
+     * orderPayType : 0
     * orderDetails : [{"id":1639952,"orderId":47040,"parentId":0,"productName":"包子","productId":"14520","price":5,"lunchboxPrice":0,"number":1,"type":3,"createTime":"Mar 14, 2020 2:55:02 PM","status":0},{"id":1639953,"orderId":47040,"parentId":0,"productName":"燒麥","productId":"14522","price":5,"lunchboxPrice":0,"number":1,"type":3,"createTime":"Mar 14, 2020 2:55:02 PM","status":0}]
     */
    private long id;
-    private String tableName;
-    private String orderNo;
    private int status;
+    private String orderNo;
+    private String tableName;
+    private int tableId;
    private double totalAmount;
    private int totalPoints;
    private String payName;
+    private String orderPayType;
    /**生成訂單時間*/
    private String createTime;
    /**結賬時間*/
@@ -74,6 +78,14 @@ public class OrderDetailItem implements Serializable {
        this.tableName = tableName;
    }
+    public int getTableId() {
+        return tableId;
+    }
+    public void setTableId(int tableId) {
+        this.tableId = tableId;
+    }
    public String getOrderNo() {
        return orderNo;
    }
@@ -82,6 +94,14 @@ public class OrderDetailItem implements Serializable {
        this.orderNo = orderNo;
    }
+    public String getOrderPayType() {
+        return orderPayType;
+    }
+    public void setOrderPayType(String orderPayType) {
+        this.orderPayType = orderPayType;
+    }
    public String getPayName() {
        return payName;
    }

--- a/table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/service/MealService.java
+++ b/table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/service/MealService.java
@@ -9,6 +9,7 @@ import okhttp3.RequestBody;
 import retrofit2.http.Body;
 import retrofit2.http.Field;
 import retrofit2.http.FormUrlEncoded;
+import retrofit2.http.GET;
 import retrofit2.http.POST;
 /**
@@ -19,7 +20,6 @@ import retrofit2.http.POST;
 * 描述：
 */
 public interface MealService {
    @POST("order/send" + RetrofitUrlManager.IDENTIFICATION_PATH_SIZE + 2)
    Observable<BaseResult> createOrder(@Body RequestBody requestBody);
@@ -33,10 +33,15 @@ public interface MealService {
    @POST("orderDetails/delete" + RetrofitUrlManager.IDENTIFICATION_PATH_SIZE + 2)
    Observable<BaseResult> deleteFood(@Body RequestBody requestBody);
+    @FormUrlEncoded
+    @POST("order/calculation/price" + RetrofitUrlManager.IDENTIFICATION_PATH_SIZE + 2)
+    Observable<BaseRespose> calculationPrice(@Field("orderId") long orderId);
 //    @POST("behavior/print" + RetrofitUrlManager.IDENTIFICATION_PATH_SIZE + 2)
 //    Observable<BaseRespose> printOrder(@Body RequestBody requestBody);
    @POST("restaurantTable/print" + RetrofitUrlManager.IDENTIFICATION_PATH_SIZE + 2)
    Observable<BaseRespose> printOrder(@Body RequestBody requestBody);
 }
--- a/table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/service/OrderPayService.java
+++ b/table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/service/OrderPayService.java
@@ -19,10 +19,12 @@ public interface OrderPayService {
    @POST("order/update" + RetrofitUrlManager.IDENTIFICATION_PATH_SIZE + 2)
    Observable<BaseResult> updateOrder(@Body RequestBody requestBody);
+    @POST("orderPay/update" + RetrofitUrlManager.IDENTIFICATION_PATH_SIZE + 2)
+    Observable<BaseResult> updateOrderPay(@Body RequestBody requestBody);
    @POST("order/Pay" + RetrofitUrlManager.IDENTIFICATION_PATH_SIZE + 2)
    Observable<BaseResult> toOrderPay(@Body RequestBody requestBody);
    @GET("restaurant/pay/get" + RetrofitUrlManager.IDENTIFICATION_PATH_SIZE + 2)
    Observable<BaseResult> getPayMethods(@Query("brandId") int brandId,@Query("restaurantId") int restaurantId);
 }
--- a/table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/service/OrderService.java
+++ b/table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/service/OrderService.java
@@ -27,4 +27,6 @@ public interface OrderService {
    @FormUrlEncoded
    @POST("order/cancel" + RetrofitUrlManager.IDENTIFICATION_PATH_SIZE + 2)
    Observable<BaseResult> cancelOrder(@Field("orderId") long orderId);
 }
--- a/table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/AllOrderPresenter.java
+++ b/table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/AllOrderPresenter.java
@@ -114,12 +114,20 @@ public class AllOrderPresenter extends BasePresenter<AllOrderContract.Model, All
                orderBean.setPerson(datasBean.getPerson());
                orderBean.setCreateTime(datasBean.getCreateTime());
                MyOrderManage.getInstance().setOrderBean(orderBean);
+                TableBean.DataBean openTableBean = new TableBean.DataBean();
+                openTableBean.setCreateTime(datasBean.getCreateTime());
+                openTableBean.setTableName(datasBean.getTableName());
+                openTableBean.setId(datasBean.getTableId());
+                OpenTableManage.getDefault().setTableBean(openTableBean);
                OpenTableManage.getDefault().setPeopleNumber(datasBean.getPerson());
                List<OrderBean.OrderDetailsBean> orderDetailsBeans = datasBean.getOrderDetails();
                List<OrderDetail> orderDetailList = OrderAssemblyUtil.assemblyOrder(OrderDetail.orderTransOrderDetails(orderDetailsBeans));
                MyOrderManage.getInstance().setOrderFoodList(orderDetailList);
-                mRootView.launchActivity(new Intent(IActivity, MealStandActivity.class));
+                Intent intent = new Intent(IActivity, MealStandActivity.class);
+                IActivity.startActivityForResult(intent, OrderCenterActivity.MODIFY_ORDER_RETURN_CODE);
            }
            @Override
@@ -136,7 +144,7 @@ public class AllOrderPresenter extends BasePresenter<AllOrderContract.Model, All
        dialogBuilder.addAction("取消", (dialog, index) -> dialog.dismiss());
        dialogBuilder.addAction(0, "確認", QMUIDialogAction.ACTION_PROP_NEGATIVE, (dialog, index) -> {
            dialog.dismiss();
-            IActivity.cancelOrder(orderId,mRootView.getStatus());
+            IActivity.cancelOrder(orderId, mRootView.getStatus());
        });
        dialogBuilder.create(R.style.MyDialogTheme2).show();
    }

--- a/table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/BaseOrderPresenter.java
+++ b/table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/BaseOrderPresenter.java
@@ -247,7 +247,7 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas
            return false;
        }
        //旧食品不可以修改数量
-        if (myOrderManage.isModifyOrder() || myOrderManage.getOrderFoodList().get(mSelectMealAdapter.getSelect_start_position()).isNew() == false && i != 0) {
+        if (!myOrderManage.isModifyOrder() && myOrderManage.getOrderFoodList().get(mSelectMealAdapter.getSelect_start_position()).isNew() == false && i != 0) {
            return false;
        }
        if (mSelectMealAdapter.getSelect_position() == -1) {

--- a/table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/MealStandPresenter.java
+++ b/table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/MealStandPresenter.java
@@ -445,6 +445,7 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod
        }
        RequestBody requestBody = new FormBody.Builder()
                .add("ids", ids)
+                .add("orderId", String.valueOf(MyOrderManage.getInstance().getOrderId()))
                .build();
        mModel.deleteFood(requestBody)
@@ -490,31 +491,6 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod
                });
    }
-    public void showInputNumberDialog(OrderDetail datasBean) {
-        ChooseNumberDialog chooseNumberDialog = new ChooseNumberDialog(IActivity);
-        chooseNumberDialog.builder();
-        chooseNumberDialog.setValueHint("請輸入數量");
-        chooseNumberDialog.setOnBackClickListener(new ChooseNumberDialog.OnBackClickListener() {
-            @Override
-            public void OnBackClick() {
-            }
-        });
-        chooseNumberDialog.setOnClickListener(new ChooseNumberDialog.OnClickListener() {
-            @Override
-            public void onComfirmClick(String number) {
-                changeNumber(datasBean.getNumber() - 1);
-            }
-            @Override
-            public void onBackPage() {
-            }
-        });
-        chooseNumberDialog.setCancelable(true);
-        chooseNumberDialog.show();
-    }
    private void deleteWithOrderedFoodById(OrderDetail deleteFood) {
        QMUIDialog.MessageDialogBuilder dialogBuilder = new QMUIDialog.MessageDialogBuilder(IActivity);
        dialogBuilder.setTitle("溫馨提示");
@@ -522,17 +498,9 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod
        dialogBuilder.addAction("取消", (dialog, index) -> dialog.dismiss());
        dialogBuilder.addAction(0, "確認", QMUIDialogAction.ACTION_PROP_NEGATIVE, (dialog, index) -> {
            dialog.dismiss();
-            if (myOrderManage.isModifyOrder()) {
+            deleteFood();
-                if (deleteFood.getNumber() < 1) {
-                    changeNumber(0);
-                } else {
-                    showInputNumberDialog(deleteFood);
-                }
-            } else {
-                deleteFood();
-            }
        });
-        dialogBuilder.create(R.style.QMUI_Dialog).show();
+        dialogBuilder.create(R.style.MyDialogTheme2).show();
    }
    /**
@@ -845,7 +813,10 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod
    private void setModifierDefModifier(List<Modifier> modifierList) {
        String defmodifier = null;
        for (int i = 0; i < modifierList.size(); i++) {
-            defmodifier = modifierList.get(i).getDefmodifier() + ",";
+            String modifier = modifierList.get(i).getDefmodifier().trim();
+            if (!TextUtils.isEmpty(modifier)) {
+                defmodifier = modifier + ",";
+            }
        }
        if (!TextUtils.isEmpty(defmodifier)) {
            if (defmodifier.startsWith(",")) {
@@ -878,7 +849,10 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod
    private void setComboDefModifier(List<ComboItem> comboItemList) {
        String defmodifier = null;
        for (int i = 0; i < comboItemList.size(); i++) {
-            defmodifier = comboItemList.get(i).getDefmodifier() + ",";
+            String modifier = comboItemList.get(i).getDefmodifier().trim();
+            if (!TextUtils.isEmpty(modifier)) {
+                defmodifier = modifier + ",";
+            }
        }
        if (!TextUtils.isEmpty(defmodifier)) {
            if (defmodifier.startsWith(",")) {
@@ -888,17 +862,15 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod
                defmodifier = defmodifier.substring(0, defmodifier.length() - 1);
            }
            String[] defmodifiers = defmodifier.split(",");
-            if (defmodifiers.length > 0) {
+            for (int j = 0; j < defmodifiers.length; j++) {
-                for (int j = 0; j < defmodifiers.length; j++) {
+                long def = Long.parseLong(defmodifiers[j]);
-                    long def = Long.parseLong(defmodifiers[j]);
+                for (int k = 0; k < comboItemList.size(); k++) {
-                    for (int k = 0; k < comboItemList.size(); k++) {
+                    ComboItem comboItem = comboItemList.get(k);
-                        ComboItem comboItem = comboItemList.get(k);
+                    long fid = comboItem.getFid();
-                        long fid = comboItem.getFid();
+                    if (def == fid) {
-                        if (def == fid) {
+                        comboItem.setDefmodifier("1");
-                            comboItem.setDefmodifier("1");
+                    } else {
-                        } else {
+                        comboItem.setDefmodifier("0");
-                            comboItem.setDefmodifier("0");
-                        }
                    }
                }
            }

--- a/table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/OrderCenterPresenter.java
+++ b/table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/OrderCenterPresenter.java
@@ -99,7 +99,7 @@ public class OrderCenterPresenter extends BasePresenter<OrderCenterContract.Mode
                    public void onSubscribe(Disposable d) {
                        super.onSubscribe(d);
                        if (!isLoadMore) {
-                            //初始化或下拉刷新，重置上拉加載標誌
+                            //初始化或下拉刷新,重置上拉加載標誌
                            noMoreData = false;
                        }
                    }
@@ -149,7 +149,7 @@ public class OrderCenterPresenter extends BasePresenter<OrderCenterContract.Mode
                                refreshLayout.finishLoadMore();
                            } else {
                                refreshLayout.finishRefresh();
-                                refreshLayout.resetNoMoreData();//setNoMoreData(false);
+                                refreshLayout.resetNoMoreData();
                            }
                        }
                    }
@@ -178,6 +178,7 @@ public class OrderCenterPresenter extends BasePresenter<OrderCenterContract.Mode
                            if (result.getData() != null) {
                                List<OrderDetailItem> orderItemList = JsonUtils.parseArray(result.getData(), OrderDetailItem.class);
                                if (orderItemList.size() > 0) {
+                                    mRootView.setPageIndex(0);
                                    mRootView.returnOrderItemList(orderItemList);
                                    //每次更新完數據，頁碼+1
                                    mRootView.setPageIndex(mRootView.getPageIndex() + 1);

--- a/table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/OrderContentPresenter.java
+++ b/table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/OrderContentPresenter.java
@@ -73,11 +73,11 @@ public class OrderContentPresenter extends BaseOrderPresenter<OrderContentContra
    private OrderTopFunctionAdapter mOrderTopFunctionAdapter;
    private List<Function> mFunctionList = new ArrayList<>();
-    private Function[] functions = {
+    //    private Function[] functions = {
-            new Function("送單", Color.parseColor("#FFFFFF"), Color.parseColor("#008131"), 24),
+//            new Function("送單", Color.parseColor("#FFFFFF"), Color.parseColor("#008131"), 24),
-            new Function("印單", Color.parseColor("#FFFFFF"), Color.parseColor("#FF8E04"), 24),
+//            new Function("印單", Color.parseColor("#FFFFFF"), Color.parseColor("#FF8E04"), 24),
-            new Function("結賬", Color.parseColor("#FFFFFF"), Color.parseColor("#DC0000"), 24),
+//            new Function("結賬", Color.parseColor("#FFFFFF"), Color.parseColor("#DC0000"), 24),
-    };
+//    };
    @Inject
    public OrderContentPresenter(OrderContentContract.Model model, OrderContentContract.View rootView) {
@@ -111,13 +111,12 @@ public class OrderContentPresenter extends BaseOrderPresenter<OrderContentContra
                if (XClickUtil.isFastDoubleClick(view, 1000)) {
                    return;
                }
-                switch (position) {
+                Function function = (Function) data;
-                    case 0:
+                switch (function.getResName()) {
-                        //送單
+                    case "送單":
                        sendOrder(false);
                        break;
-                    case 1:
+                    case "印單":
-                        //印單
                        if (getFoodCount() == 0) {
                            showTipDialog(IActivity, "沒有食品，不能印單");
                            return;
@@ -129,8 +128,7 @@ public class OrderContentPresenter extends BaseOrderPresenter<OrderContentContra
                            printOrder(OpenTableManage.getDefault().getTableBean().getId(), false);
                        }
                        break;
-                    case 2:
+                    case "結賬":
-                        //結賬
                        mRootView.startActivityForResult(OrderContentActivity.BILL_CODE, OrderPayActivity.class, null);
                        break;
                }
@@ -144,13 +142,12 @@ public class OrderContentPresenter extends BaseOrderPresenter<OrderContentContra
    public void initTopFunctionData() {
        if (MyOrderManage.getInstance().isModifyOrder()) {
            //修改訂單隱藏送單，印單功能
-            functions[0] = new Function("結賬", Color.parseColor("#FFFFFF"), Color.parseColor("#DC0000"), 24);
+            mFunctionList.add(new Function("結賬", Color.parseColor("#FFFFFF"), Color.parseColor("#DC0000"), 24));
        } else {
-            functions[0] = new Function("送單", Color.parseColor("#FFFFFF"), Color.parseColor("#008131"), 24);
+            mFunctionList.add(new Function("送單", Color.parseColor("#FFFFFF"), Color.parseColor("#008131"), 24));
-            functions[1] = new Function("印單", Color.parseColor("#FFFFFF"), Color.parseColor("#FF8E04"), 24);
+            mFunctionList.add(new Function("印單", Color.parseColor("#FFFFFF"), Color.parseColor("#FF8E04"), 24));
-            functions[2] = new Function("結賬", Color.parseColor("#FFFFFF"), Color.parseColor("#DC0000"), 24);
+            mFunctionList.add(new Function("結賬", Color.parseColor("#FFFFFF"), Color.parseColor("#DC0000"), 24));
        }
-        mFunctionList.addAll(Arrays.asList(functions));
    }
    protected void createOrder(boolean isPrint) {

--- a/table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/OrderDetailPresenter.java
+++ b/table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/OrderDetailPresenter.java
@@ -21,6 +21,8 @@ import javax.inject.Inject;
 import com.gingersoft.gsa.cloud.table.mvp.contract.OrderDetailContract;
 import com.jess.arms.utils.RxLifecycleUtils;
+import org.simple.eventbus.EventBus;
 /**
 * ================================================
@@ -59,6 +61,34 @@ public class OrderDetailPresenter extends BasePresenter<OrderDetailContract.Mode
        this.mApplication = null;
    }
+    public void getOrderDetailItem(long orderId) {
+        mModel.getOrderDetailItem(orderId)
+                .subscribeOn(Schedulers.io())
+                .doOnSubscribe(disposable -> mRootView.showLoading(null))
+                .subscribeOn(AndroidSchedulers.mainThread())
+                .observeOn(AndroidSchedulers.mainThread())
+                .doAfterTerminate(() -> mRootView.hideLoading())
+                .compose(RxLifecycleUtils.bindToLifecycle(mRootView))
+                .subscribe(new ErrorHandleSubscriber<BaseResult>(mErrorHandler) {
+                    @Override
+                    public void onNext(@NonNull BaseResult result) {
+                        if (result.isSuccess()) {
+                            if (result.getData() != null) {
+                                OrderDetailItem orderDetailItem = JsonUtils.parseObject(JsonUtils.toJson(result.getData()), OrderDetailItem.class);
+                                mRootView.returnOrderDetail(orderDetailItem);
+                                //刷新訂單列表
+                                EventBus.getDefault().post(true, "updateOrderListEvent");
+                            } else {
+                                mRootView.showMessage("獲取賬單失敗");
+                            }
+                        } else {
+                            mRootView.showMessage("獲取賬單失敗");
+                        }
+                    }
+                });
+    }
    public void cancelOrder(long orderId) {
        mModel.cancelOrder(orderId)
                .subscribeOn(Schedulers.io())
@@ -73,8 +103,10 @@ public class OrderDetailPresenter extends BasePresenter<OrderDetailContract.Mode
                    public void onNext(@NonNull BaseResult result) {
                        if (result.isSuccess()) {
                            if (result.getData() != null) {
-                                OrderDetailItem orderDetailItem = JsonUtils.parseObject((String) result.getData(), OrderDetailItem.class);
+                                OrderDetailItem orderDetailItem = JsonUtils.parseObject(JsonUtils.toJson(result.getData()), OrderDetailItem.class);
                                mRootView.returnOrderDetail(orderDetailItem);
+                                //刷新訂單列表
+                                EventBus.getDefault().post(true, "updateOrderListEvent");
                            } else {
                                mRootView.showMessage("獲取賬單失敗");
                            }

--- a/table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/OrderPayPresenter.java
+++ b/table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/OrderPayPresenter.java
@@ -214,6 +214,33 @@ public class OrderPayPresenter extends BaseOrderPresenter<OrderPayContract.Model
                });
    }
+    /**
+     * 修改訂單更新支付方式
+     */
+    public void updateOrderPay() {
+        RequestBody requestBody = new FormBody.Builder()
+                .add("payType", String.valueOf(mBillMoneyList.get(0).getId()))
+                .add("orderId", String.valueOf(MyOrderManage.getInstance().getOrderId()))
+                .build();
+        mModel.updateOrderPay(requestBody)
+                .subscribeOn(Schedulers.io())
+                .doOnSubscribe(disposable -> mRootView.showLoading(null))
+                .subscribeOn(AndroidSchedulers.mainThread())
+                .observeOn(AndroidSchedulers.mainThread())
+                .doAfterTerminate(() -> mRootView.hideLoading())
+                .compose(RxLifecycleUtils.bindToLifecycle(mRootView))
+                .subscribe(new ErrorHandleSubscriber<BaseResult>(mErrorHandler) {
+                    @Override
+                    public void onNext(BaseResult baseResult) {
+                        if (baseResult.isSuccess()) {
+                            //結賬成功
+                            mRootView.paySuccess();
+                        }
+                    }
+                });
+    }
    protected void createOrder() {
        CreateOrderRequest request = getCreateOrderRequest(getOrderFoodLists());
        RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), GsonUtils.GsonString(request));
@@ -232,7 +259,7 @@ public class OrderPayPresenter extends BaseOrderPresenter<OrderPayContract.Model
                            if (info.getData() != null) {
                                setOrderId((Double) info.getData());
                            }
-                            toOrderPay(false);
+                            toOrderPayBefore(false);
                        } else {
                            mRootView.showMessage("結賬失敗!");
                        }
@@ -264,7 +291,7 @@ public class OrderPayPresenter extends BaseOrderPresenter<OrderPayContract.Model
                    @Override
                    public void onNext(@NonNull BaseResult info) {
                        if (info != null && info.isSuccess()) {
-                            toOrderPay(false);
+                            toOrderPayBefore(false);
                        } else {
                            mRootView.showMessage("結賬失敗!");
                        }
@@ -278,17 +305,29 @@ public class OrderPayPresenter extends BaseOrderPresenter<OrderPayContract.Model
                });
    }
    /**
     * 結賬
+     * @return
     */
-    public void sendOrderPay() {
+    private void toOrderPayBefore(boolean show){
+        if(myOrderManage.isModifyOrder()){
+            //修改訂單,更新支付方式即可
+            updateOrderPay();
+        }else {
+            toOrderPay(show);
+        }
+    }
+    /**
+     * 結賬前創建訂單或添加食品
+     */
+    public void sendOrderBefore() {
        if (hasNesOrderFoods()) {
            //有食品未送單 先送單
            sendOrder(false);
        } else {
-            //直接結賬
+            //去結賬
-            toOrderPay(true);
+            toOrderPayBefore(true);
        }
    }
@@ -301,10 +340,8 @@ public class OrderPayPresenter extends BaseOrderPresenter<OrderPayContract.Model
        }
    }
    /**
     * 獲取當前選中的支付方式
-     *
     * @return
     */
    public PayMethod getSelectBillMoney() {
@@ -395,7 +432,6 @@ public class OrderPayPresenter extends BaseOrderPresenter<OrderPayContract.Model
        return false;
    }
    public ArrayList<PayMethod> getBillMethodList() {
        return mBillMethodList;
    }

--- a/table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/MealStandActivity.java
+++ b/table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/MealStandActivity.java
@@ -274,7 +274,6 @@ public class MealStandActivity extends BaseActivity<MealStandPresenter> implemen
    @Override
    public void initData(@Nullable Bundle savedInstanceState) {
-//        mPresenter = null;
        initViewMap();
        //初始化Plu模式
        setPluMode();
@@ -492,8 +491,10 @@ public class MealStandActivity extends BaseActivity<MealStandPresenter> implemen
    public void setPluMode() {
        isPluMode = (boolean) SPUtils.get(this, MealConstant.EXIT_IS_PLU_MODE, false);
        if (isPluMode) {
-            btn_fid.setBackgroundColor(ArmsUtils.getColor(this, R.color.theme_grey_color));
            showViewModeVisibility(MealConstant.ViewMode_keys);
+            btn_fid.setBackgroundColor(ArmsUtils.getColor(this, R.color.theme_hint_color));
+        }else {
+            btn_fid.setBackground(ArmsUtils.getDrawablebyResource(this, R.drawable.ui_selector_item_background));
        }
    }
@@ -536,6 +537,7 @@ public class MealStandActivity extends BaseActivity<MealStandPresenter> implemen
            } else {
                showViewModeVisibility(MealConstant.ViewMode_keys);
            }
+            setPluMode();
        } else if (id == R.id.btn_meal_delete) {
            mPresenter.deleteFoodItem(1);
        } else if (id == R.id.btn_send_order) {
@@ -602,7 +604,7 @@ public class MealStandActivity extends BaseActivity<MealStandPresenter> implemen
    public void returnBeforeActivity(boolean initTable) {
        SPUtils.put(this, MealConstant.EXIT_IS_PLU_MODE, isPluMode);
-        if (initTable && OpenTableManage.getDefault().getTableBean() != null) {
+        if (initTable && OpenTableManage.getDefault().getTableBean() != null && !MyOrderManage.getInstance().isModifyOrder()) {
            //通知更新餐台状态
            EventBus.getDefault().post(OpenTableManage.getDefault().getTableBean().getId(), "initTable_status_event");
        }

--- a/table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/OrderContentActivity.java
+++ b/table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/OrderContentActivity.java
@@ -11,6 +11,8 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.DefaultItemAnimator;
+import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication;
@@ -273,6 +275,7 @@ public class OrderContentActivity extends BaseActivity<OrderContentPresenter> im
    @Override
    public void setTopFunctionAdapter(DefaultAdapter adapter) {
        rv_top_function.setAdapter(adapter);
+        setTopFunctionRecycleLayoutManager();
    }
    @Override
@@ -287,7 +290,9 @@ public class OrderContentActivity extends BaseActivity<OrderContentPresenter> im
    @Override
    public void setTopFunctionRecycleLayoutManager() {
+        GridLayoutManager funtionRecycleLayoutManager = new GridLayoutManager(this, 3, GridLayoutManager.VERTICAL, false);
+        rv_top_function.setLayoutManager(funtionRecycleLayoutManager);
+        rv_top_function.setItemAnimator(new DefaultItemAnimator());
    }
    @Override

--- a/table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/OrderPayActivity.java
+++ b/table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/OrderPayActivity.java
@@ -297,7 +297,7 @@ public class OrderPayActivity extends BaseActivity<OrderPayPresenter> implements
                tipMoneyInsufficient();
                return;
            }
-            mPresenter.sendOrderPay();
+            mPresenter.sendOrderBefore();
        } else if (id == R.id.btn_exact) {
            if (mPresenter.getSelectBillMoney() == null) {
                showMessage("請選擇支付方式");
@@ -502,7 +502,7 @@ public class OrderPayActivity extends BaseActivity<OrderPayPresenter> implements
    public void paySuccess() {
        //修改結賬方式數據
        MyOrderManage.getInstance().setBillMoney(mPresenter.getBillMoneyList());
-        if (OpenTableManage.getDefault() != null) {
+        if (!MyOrderManage.getInstance().isModifyOrder() && OpenTableManage.getDefault() != null && OpenTableManage.getDefault().getTableBean()!=null) {
            //通知更新餐台状态
            EventBus.getDefault().post(OpenTableManage.getDefault().getTableBean().getId(), "initTable_status_event");
        }

--- a/table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/TableActivity.java
+++ b/table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/TableActivity.java
@@ -379,17 +379,17 @@ public class TableActivity extends BaseActivity<TablePresenter> implements Table
            public Fragment createFragment(int position) {
                switch (position) {
                    case 1:
-                    if (stateTableFragment != null) {
-                        return stateTableFragment;
-                    }
-                    stateTableFragment = new StateTableFragment();
-                    return stateTableFragment;
-                    case 2:
                        if (allTableFragment != null) {
                            return allTableFragment;
                        }
                        allTableFragment = new AllTableFragment();
                        return allTableFragment;
+                    case 2:
+                    if (stateTableFragment != null) {
+                        return stateTableFragment;
+                    }
+                    stateTableFragment = new StateTableFragment();
+                    return stateTableFragment;
                    default:
                        if (inputTableFragment != null) {
                            return inputTableFragment;
@@ -455,172 +455,24 @@ public class TableActivity extends BaseActivity<TablePresenter> implements Table
        });
    }
-//    private void initTabBarViewPage() {
+    @Override
-//
+    protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
-//        fm = getSupportFragmentManager();
+        super.onActivityResult(requestCode, resultCode, data);
-//        List<Fragment> fragmentList = new ArrayList<>();
-//        // Fragment标签
-//        inputTableFragment = InputTableFragment.newInstance();
-//        allTableFragment = AllTableFragment.newInstance();
-//        stateTableFragment = StateTableFragment.newInstance();
-//        fragmentList.add(inputTableFragment);
-//        fragmentList.add(allTableFragment);
-//        fragmentList.add(stateTableFragment);
-//        // tab title
-//        tabTitles = new String[3];
-//        tabTitles[0] = "編號";
-//        tabTitles[1] = "全部";
-//        tabTitles[2] = "狀態";
-//
-//        BaseFragmentAdapter adapter = new BaseFragmentAdapter(this, fm, fragmentList, Arrays.asList(tabTitles));
-//        pager_content.setAdapter(adapter);
-//
-//        DisplayMetrics dm = getResources().getDisplayMetrics();
-//        // 设置Tab底部选中的指示器Indicator的高度
-//        tabs.setIndicatorHeight((int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 2.5f, dm));
-//        // 设置Tab底部选中的指示器 Indicator的颜色
-//        tabs.setIndicatorColor(ArmsUtils.getColor(this, R.color.theme_color));
-//        //设置Tab标题文字的颜色
-//        tabs.setTextColor(ArmsUtils.getColor(this, R.color.theme_text_color));
-//        //设置选中的Tab文字的颜色
-//        tabs.setSelectedTextColor(ArmsUtils.getColor(this, R.color.theme_color));
-//        //设置Tab底部分割线的颜色
-//        tabs.setUnderlineColor(Color.TRANSPARENT);
-//        // 设置点击某个Tab时的背景色,设置为0时取消背景色
-//        tabs.setTabBackground(0);
-//        // 设置Tab是自动填充满屏幕的
-//        tabs.setShouldExpand(true);
-//        //设置布局样式
-//        tabs.setIconAndText(PagerSlidingTabStrip.TABICONTEXT);
-//        //设置未选择的图标
-//        tabs.setNormalIconRes(icon0);
-//        //设置已选择的图标
-//        tabs.setLightIconRes(icon1);
-//        // 设置Tab标题文字的大小
-////        tabs.setTextSize(GSAApplication.androidSetting.getTableFunctionTopFontSize());
-//        tabs.setTextSize(16);
-//        //设置文本
-//        tabs.setTabTexts(tabTitles);
-//        //tab间的分割线
-//        tabs.setDividerColor(Color.TRANSPARENT);
-//        //底部横线与字体宽度一致
-//        tabs.setIndicatorinFollower(false);
-//        //与ViewPager关联，这样指示器就可以和ViewPager联动
-//        tabs.setViewPager(pager_content);
-//
-//        //设置当前现在的页面  默认输入页
-//        pager_content.setCurrentItem(mDefaultPosition);
-//        //设置当前默认显示Fragment页面
-////        mPresenter.setCurrentShowFragment(fragmentList.get(mDefaultPosition));
-//        pager_content.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
-//
-//            @Override
-//            public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
-//                if (!firstFlag) {
-//                    //防止滑动页面 滑动的过程中不让刷新数据
-//                    TableActivity.isRefreshData = false;
-//                    LogUtil.d(TAG, "position: " + position + "  positionOffset: " + positionOffset + "  positionOffsetPixels: " + positionOffsetPixels);
-//                }
-//                firstFlag = false;
-//            }
-//
-//            @Override
-//            public void onPageSelected(int position) {
-//                if (position == 0) {
-//                    //标号输入页面 暂停获取餐台数据
-//                    onPauseRefreshTableData();
-//                } else {
-//                    //页面切换完成区域，状态页面恢复获取餐台数据
-//                    if (mPosition == 0) {
-//                        //是从输入编号页面回到全部，使用状态页面 直接刷新餐台数据
-//                        onStartRefreshTableData();
-//                    } else {
-//                        TableActivity.isRefreshData = true;
-//                    }
-//                }
-//                mPosition = position;
-////                //设置当前显示Fragment页面
-////                mPresenter.setCurrentShowFragment(fragmentList.get(position));
-//            }
-//
-//            @Override
-//            public void onPageScrollStateChanged(int state) {
-//
-//            }
-//        });
-//        tabs.setOnItemTagClickListener(new PagerSlidingTabStrip.OnItemTagClickListener() {
-//            @Override
-//            public void onItemTagClick(int position, View tab) {
-////                initTableStatusPopup();
-////                switch (position) {
-////                    case 0:
-////                        break;
-////                    case 1:
-////                        if (mPosition == position) {
-////                            initViewPageListener();
-////                        }
-////                        break;
-////                    case 2:
-////                        if (mPosition == position) {
-////                            //显示下拉框停止刷新餐台数据
-////                            GSAApplication.isRefreshData = false;
-////                            //处于当前tab页面 再次点击tab
-////                            mTableStatusPopup.setAnimStyle(QMUIPopup.ANIM_GROW_FROM_CENTER);
-////                            mTableStatusPopup.setPreferredDirection(QMUIPopup.DIRECTION_BOTTOM);
-////                            mTableStatusPopup.show(tab);
-////                        }
-////                        break;
-////                }
-////                mPosition = position;
-////                //设置当前显示Fragment页面
-////                mPresenter.setCurrentShowFragment(fragmentList.get(position));
-//            }
-//        });
-//    }
-    public static class SortTableByName implements Comparator {
-        @Override
-        public int compare(Object lhs, Object rhs) {
-            TableBean.DataBean s1 = (TableBean.DataBean) lhs;
-            TableBean.DataBean s2 = (TableBean.DataBean) rhs;
-            try {
-                String s1_tn = s1.getTableName();
-                String s2_tn = s2.getTableName();
-                //String s1_tn_s=String.valueOf(s1_tn).com
-                //各位补零
-                int i = (10 - s1_tn.trim().length());
-                String v = "";
-                for (int j = 0; j < i; j++) {
-                    v = v + "0";
-                }
-                s1_tn = "A" + v + s1_tn.trim();
-                v = "";
-                i = (10 - s2_tn.trim().length());
-                for (int j = 0; j < i; j++) {
-                    v = v + "0";
-                }
-                s2_tn = "A" + v + s2_tn.trim();
-                return s1_tn.compareTo(s2_tn);
-            } catch (Exception E) {
-                return s1.getTableName().compareTo(s2.getTableName());
-            }
-        }
    }
    @Override
    protected void onResume() {
        super.onResume();
+        //開始刷新餐檯數據
        onStartRefreshTableData();
-        //清空食品數據
+        //清空賬單數據
        MyOrderManage.getInstance().clear();
    }
    @Override
    protected void onPause() {
        super.onPause();
+        //停止刷新餐檯數據
        onPauseRefreshTableData();
    }
 }
--- a/table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/orderManager/OrderCenterActivity.java
+++ b/table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/orderManager/OrderCenterActivity.java
@@ -29,6 +29,7 @@ import com.qmuiteam.qmui.widget.tab.QMUITabSegment;
 import com.scwang.smartrefresh.layout.api.RefreshLayout;
 import org.json.JSONException;
+import org.simple.eventbus.Subscriber;
 import java.net.SocketTimeoutException;
 import java.net.UnknownHostException;
@@ -73,6 +74,8 @@ public class OrderCenterActivity extends BaseActivity<OrderCenterPresenter> impl
    //是否已經初始化數據,默認初始化第一個頁面
    private boolean[] pageDataInit = {true, false, false};
+    public static final int MODIFY_ORDER_RETURN_CODE = 100;
    @Override
    public void setupActivityComponent(@NonNull AppComponent appComponent) {
        DaggerOrderCenterComponent //如找不到该类,请编译一下项目
@@ -92,7 +95,21 @@ public class OrderCenterActivity extends BaseActivity<OrderCenterPresenter> impl
    public void initData(@Nullable Bundle savedInstanceState) {
        initTabAndPager();
-        mPresenter.loadOrderList(OrderDetailItem.STATUS_CONFIRM, 0, 15, null, false);
+        mPresenter.loadOrderList(OrderDetailItem.STATUS_CONFIRM, 0, 10, null, false);
+    }
+    @Subscriber(tag = "updateOrderListEvent")
+    private void updateOrderList(boolean update) {
+        refeshOrderList();
+    }
+    private void refeshOrderList(){
+        setPageIndex(0);
+        mPresenter.loadOrderList(OrderDetailItem.STATUS_CONFIRM, 0, 10, null, false);
+    }
+    public void loadOrderList(byte status, RefreshLayout refreshLayout, boolean isLoadMore) {
+        mPresenter.loadOrderList(status, getPageIndex(), getPageSize(), refreshLayout, isLoadMore);
    }
    private void initTabAndPager() {
@@ -160,7 +177,7 @@ public class OrderCenterActivity extends BaseActivity<OrderCenterPresenter> impl
                pagerAdapter.createFragment(index);
                if (!pageDataInit[index]) {
                    //未初始化數據，獲取數據
-                    loadOrderList(getCurrentOrderFragment().getStatus(),null, false);
+                    loadOrderList(getCurrentOrderFragment().getStatus(), null, false);
                }
                pageDataInit[currentPageIndex] = true;
            }
@@ -260,10 +277,6 @@ public class OrderCenterActivity extends BaseActivity<OrderCenterPresenter> impl
        getCurrentOrderFragment().setData(message);
    }
-    public void loadOrderList(byte status, RefreshLayout refreshLayout, boolean isLoadMore) {
-        mPresenter.loadOrderList(status, getPageIndex(), getPageSize(), refreshLayout, isLoadMore);
-    }
    public void cancelOrder(long orderId, byte status) {
        mPresenter.cancelOrder(orderId, status);
    }
@@ -295,4 +308,12 @@ public class OrderCenterActivity extends BaseActivity<OrderCenterPresenter> impl
        }
    }
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == MODIFY_ORDER_RETURN_CODE) {
+            //修改訂單返回,刷新訂單數據
+            refeshOrderList();
+        }
+    }
 }
--- a/table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/orderManager/OrderDetailActivity.java
+++ b/table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/orderManager/OrderDetailActivity.java
@@ -28,6 +28,7 @@ import com.gingersoft.gsa.cloud.table.mvp.ui.adapter.OrderDetailPayMethodAdapter
 import com.gingersoft.gsa.cloud.ui.bean.view.SectionTextItem3;
 import com.gingersoft.gsa.cloud.ui.widget.dialog.LoadingDialog;
 import com.jess.arms.base.BaseActivity;
+import com.jess.arms.base.delegate.IActivity;
 import com.jess.arms.di.component.AppComponent;
 import com.jess.arms.utils.ArmsUtils;
 import com.gingersoft.gsa.cloud.table.di.component.DaggerOrderDetailComponent;
@@ -205,8 +206,8 @@ public class OrderDetailActivity extends BaseActivity<OrderDetailPresenter> impl
            mSectionTextItem3FoodList.addAll(SectionTextItem3.orderDetailTransSectionTextItem3(orderDetailList));
            mOrderDetailFoodAdapter = new OrderDetailItemAdapter(mSectionTextItem3FoodList);
            recycler_food.setAdapter(mOrderDetailFoodAdapter);
-            LinearLayoutManager mAllOrderRecycleLayoutManager = new LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false);
+            LinearLayoutManager allOrderRecycleLayoutManager = new LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false);
-            recycler_food.setLayoutManager(mAllOrderRecycleLayoutManager);
+            recycler_food.setLayoutManager(allOrderRecycleLayoutManager);
        } else {
            mSectionTextItem3FoodList.clear();
            mSectionTextItem3FoodList.addAll(SectionTextItem3.orderDetailTransSectionTextItem3(orderDetailList));
@@ -221,8 +222,8 @@ public class OrderDetailActivity extends BaseActivity<OrderDetailPresenter> impl
            mSectionTextItem3PayMethodList.addAll(sectionTextItem3List);
            mOrderDetailPayMethodAdapter = new OrderDetailPayMethodAdapter(mSectionTextItem3PayMethodList);
            recycler_pay_method.setAdapter(mOrderDetailPayMethodAdapter);
-            LinearLayoutManager mAllOrderRecycleLayoutManager = new LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false);
+            LinearLayoutManager allOrderRecycleLayoutManager = new LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false);
-            recycler_pay_method.setLayoutManager(mAllOrderRecycleLayoutManager);
+            recycler_pay_method.setLayoutManager(allOrderRecycleLayoutManager);
        } else {
            mSectionTextItem3PayMethodList.clear();
            mSectionTextItem3PayMethodList.addAll(sectionTextItem3List);
@@ -273,12 +274,20 @@ public class OrderDetailActivity extends BaseActivity<OrderDetailPresenter> impl
        orderBean.setPerson(datasBean.getPerson());
        orderBean.setCreateTime(datasBean.getCreateTime());
        MyOrderManage.getInstance().setOrderBean(orderBean);
+        TableBean.DataBean openTableBean = new TableBean.DataBean();
+        openTableBean.setCreateTime(datasBean.getCreateTime());
+        openTableBean.setTableName(datasBean.getTableName());
+        openTableBean.setId(datasBean.getTableId());
+        OpenTableManage.getDefault().setTableBean(openTableBean);
        OpenTableManage.getDefault().setPeopleNumber(datasBean.getPerson());
        List<OrderBean.OrderDetailsBean> orderDetailsBeans = datasBean.getOrderDetails();
        List<OrderDetail> orderDetailList = OrderAssemblyUtil.assemblyOrder(OrderDetail.orderTransOrderDetails(orderDetailsBeans));
        MyOrderManage.getInstance().setOrderFoodList(orderDetailList);
-        launchActivity(new Intent(this, MealStandActivity.class));
+        Intent intent = new Intent(this, MealStandActivity.class);
+        startActivityForResult(intent, OrderCenterActivity.MODIFY_ORDER_RETURN_CODE);
    }
    /**
@@ -399,4 +408,13 @@ public class OrderDetailActivity extends BaseActivity<OrderDetailPresenter> impl
        initOrderDetail(orderDetailItem);
    }
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == OrderCenterActivity.MODIFY_ORDER_RETURN_CODE) {
+            //修改訂單返回,刷新訂單數據
+            mPresenter.getOrderDetailItem(mOrderDetailItem.getId());
+        }
+    }
 }
--- a/table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/adapter/OrderTopFunctionAdapter.java
+++ b/table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/adapter/OrderTopFunctionAdapter.java
@@ -27,7 +27,6 @@ import butterknife.BindView;
 public class OrderTopFunctionAdapter extends DefaultAdapter<Function> {
    private Context mContext;
-    private int detailCol = 3;
    public OrderTopFunctionAdapter(Context context, List<Function> infos) {
        super(infos);
@@ -67,9 +66,6 @@ public class OrderTopFunctionAdapter extends DefaultAdapter<Function> {
            btn_name.setBackgroundColor(datasBean.getBackgroundColor());
            btn_name.setTextSize(datasBean.getTextSize());
-            ViewGroup.LayoutParams layoutParams = btn_name.getLayoutParams();
-            layoutParams.width = QMUIDisplayHelper.getScreenWidth(mContext) / detailCol;
-            btn_name.setLayoutParams(layoutParams);
        }
    }

--- a/table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/adapter/meal/ComboAdapter.java
+++ b/table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/adapter/meal/ComboAdapter.java
@@ -101,30 +101,12 @@ public class ComboAdapter extends DefaultAdapter<ComboItem> {
                initModifierSoldout(datasBean.getModifier());
            }
            initComboLayoutParams();
-            tv_name.setOnTouchListener(new View.OnTouchListener() {
+            tv_name.setOnClickListener(new View.OnClickListener() {
                @Override
-                public boolean onTouch(View v, MotionEvent event) {
+                public void onClick(View v) {
-                    if(XClickUtil.isFastDoubleClick(v,200)){
+                    if (mOnItemClickListener != null) {
-                        return true;
+                        mOnItemClickListener.onItemClick(datasBean, position);
-                    }
-                    switch (event.getAction()) {
-                        case MotionEvent.ACTION_DOWN:
-                            if (mOnItemClickListener != null) {
-                                if (!datasBean.isModifier()) {
-                                    tv_name.setBackgroundColor(mContext.getResources().getColor(R.color.keyboard_paybill_normal));
-                                }
-                                mOnItemClickListener.onItemClick(datasBean, position);
-                            }
-                            break;
-                        case MotionEvent.ACTION_CANCEL:
-                        case MotionEvent.ACTION_UP:
-                            if (!datasBean.isModifier()) {
-                                initComboColor(datasBean);
-                            }
-                            break;
                    }
-                    return true;
                }
            });
        }

--- a/table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/adapter/meal/ModifierAdapter.java
+++ b/table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/adapter/meal/ModifierAdapter.java
@@ -97,24 +97,12 @@ public class ModifierAdapter extends DefaultAdapter<Modifier> {
            initModifierName(datasBean);
            initModifierSoldout(datasBean);
            initModifierLayoutParams();
-            tv_name.setOnTouchListener(new View.OnTouchListener() {
+            tv_name.setOnClickListener(new View.OnClickListener() {
                @Override
-                public boolean onTouch(View v, MotionEvent event) {
+                public void onClick(View v) {
-                    if(XClickUtil.isFastDoubleClick(v,200)){
+                    if (mOnItemClickListener != null) {
-                        return true;
+                        mOnItemClickListener.onItemClick(datasBean, position);
-                    }
-                    switch (event.getAction()) {
-                        case MotionEvent.ACTION_DOWN:
-                            if (mOnItemClickListener != null) {
-                                mOnItemClickListener.onItemClick(datasBean, position);
-                            }
-                            break;
-                        case MotionEvent.ACTION_CANCEL:
-                        case MotionEvent.ACTION_UP:
-                            break;
                    }
-                    return true;
                }
            });
        }

--- a/table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/adapter/meal/SelectMealAdapter.java
+++ b/table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/adapter/meal/SelectMealAdapter.java
@@ -259,12 +259,12 @@ public class SelectMealAdapter extends DefaultAdapter<OrderDetail> {
        private void setNumber(OrderDetail datasBean) {
            int number = datasBean.getNumber();
-//            if (number == 0) {
+            if (number == 0) {
-//                //细项、折扣不需要显示数量
+                //细项、折扣不需要显示数量
-//                tv_number.setText("0");
+                tv_number.setText("");
-//            } else {
+            } else {
                tv_number.setText(String.valueOf(number));
-//            }
+            }
        }
        private void setMoney(OrderDetail datasBean) {
@@ -301,15 +301,15 @@ public class SelectMealAdapter extends DefaultAdapter<OrderDetail> {
            if (datasBean.isNew() == false) {
                iv_lock.setVisibility(View.INVISIBLE);
                int number = datasBean.getNumber();
-                if (number == 0) {
+//                if (number == 0) {
-                    tv_name.setTextColor(ArmsUtils.getColor(mContext,R.color.theme_red_color));
+//                    tv_name.setTextColor(ArmsUtils.getColor(mContext,R.color.theme_red_color));
-                    tv_number.setTextColor(ArmsUtils.getColor(mContext,R.color.theme_red_color));
+//                    tv_number.setTextColor(ArmsUtils.getColor(mContext,R.color.theme_red_color));
-                    tv_money.setTextColor(ArmsUtils.getColor(mContext,R.color.theme_red_color));
+//                    tv_money.setTextColor(ArmsUtils.getColor(mContext,R.color.theme_red_color));
-                } else {
+//                } else {
                    tv_name.setTextColor(ArmsUtils.getColor(mContext, R.color.Grass_green));
                    tv_number.setTextColor(ArmsUtils.getColor(mContext, R.color.Grass_green));
                    tv_money.setTextColor(ArmsUtils.getColor(mContext, R.color.Grass_green));
-                }
+//                }
            } else {
                iv_lock.setVisibility(View.INVISIBLE);
                tv_number.setTextColor(ArmsUtils.getColor(mContext, R.color.black));

--- a/table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/fragment/AllOrderFragment.java
+++ b/table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/fragment/AllOrderFragment.java
@@ -233,6 +233,10 @@ public class AllOrderFragment extends BaseFragment<AllOrderPresenter> implements
        }
    }
+    public RefreshLayout getRefreshLayout() {
+        return refreshLayout;
+    }
    public int getPageIndex() {
        return pageIndex;
    }

--- a/table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/fragment/StateTableFragment.java
+++ b/table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/fragment/StateTableFragment.java
@@ -54,7 +54,6 @@ import static com.jess.arms.utils.Preconditions.checkNotNull;
 */
 public class StateTableFragment extends BaseFragment<StateTablePresenter> implements StateTableContract.View {
    @BindView(R2.id.recycle_state_table)
    RecyclerView recycle_state_table;

--- a/table-mode/src/main/res/layout/meal_order_top_function.xml
+++ b/table-mode/src/main/res/layout/meal_order_top_function.xml
@@ -2,7 +2,7 @@
 <com.qmuiteam.qmui.alpha.QMUIAlphaButton xmlns:android="http://schemas.android.com/apk/res/android"
    android:id="@+id/btn_name"
    android:orientation="vertical"
-    android:layout_width="wrap_content"
+    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:gravity="center"
    android:background="@color/theme_color"

--- a/table-mode/src/main/res/layout/table_activity_meal_stand.xml
+++ b/table-mode/src/main/res/layout/table_activity_meal_stand.xml
@@ -488,6 +488,7 @@
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_below="@+id/ll_meals"
+        android:layout_above="@+id/ll_stand_oper"
        android:divider="@null"
        android:fadeScrollbars="false"
        android:orientation="vertical"

--- a/table-mode/src/main/res/layout/table_activity_table.xml
+++ b/table-mode/src/main/res/layout/table_activity_table.xml
@@ -31,7 +31,7 @@
        <LinearLayout
            android:id="@+id/ll_table_operat_content"
            android:layout_width="match_parent"
-            android:layout_height="?attr/qmui_topbar_height"
+            android:layout_height="@dimen/dp_45"
            android:background="@color/transparent"
            android:gravity="center_vertical"
            android:orientation="horizontal"

--- a/table-mode/src/main/res/layout/table_item_combo.xml
+++ b/table-mode/src/main/res/layout/table_item_combo.xml
@@ -4,7 +4,7 @@
    android:layout_width="match_parent"
    android:layout_height="wrap_content">
-    <TextView
+    <com.qmuiteam.qmui.alpha.QMUIAlphaTextView
        android:id="@+id/tv_name"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"