1、送單新增memberId

public-base/src/main/java/com/gingersoft/gsa/cloud/base/common/bean/OrderBean.java

@@ -135,8 +135,12 @@ public class OrderBean {
         private long parentId;
         private long orderId;
 
+        /**
+         * 自定義字段
+         */
         /**商品父級ID*/
         private long topId;
+        private long memberId;
 
         public OrderDetailsBean() {
         }
@@ -161,6 +165,14 @@ public class OrderBean {
             this.id = id;
         }
 
+        public long getMemberId() {
+            return memberId;
+        }
+
+        public void setMemberId(long memberId) {
+            this.memberId = memberId;
+        }
+
         public byte getType() {
             return type;
         }

table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/AllTablePresenter.java

@@ -142,7 +142,9 @@ public class AllTablePresenter extends BasePresenter<AllTableContract.Model, All
 //                    tableBean.setPax(newTableBean.getPax());
 //                    tableBean.setQr_code(newTableBean.getQr_code());
 //                    tableBean.setRiceponorderid(newTableBean.getRiceponorderid());
-
+                    if (!TableActivity.isRefreshData) {
+                        return;
+                    }
                     mTableAdapter.notifyItemChanged(j);
                 }
             }

table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/BaseOrderPresenter.java

@@ -374,6 +374,7 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas
                 }
 
                 OrderBean.OrderDetailsBean request = new OrderBean.OrderDetailsBean();
+                request.setMemberId(GsaCloudApplication.getMemberId(mApplication));
                 request.setProductName(food.getProductName());
                 request.setProductId(food.getProductId());
                 request.setParentId(food.getParentId());
@@ -435,6 +436,7 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas
                 }
 
                 OrderBean.OrderDetailsBean request = new OrderBean.OrderDetailsBean();
+                request.setMemberId(GsaCloudApplication.getMemberId(mApplication));
                 request.setOrderId(MyOrderManage.getInstance().getOrderId());
                 request.setProductName(food.getProductName());
                 request.setProductId(food.getProductId());

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

@@ -189,6 +189,9 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont
 
                     @Override
                     public void onNext(@NonNull TableBean tableBean) {
+                        if (!TableActivity.isRefreshData) {
+                            return;
+                        }
                         if (tableBean.isSuccess()) {
                             List<TableBean.DataBean> tableBeanData = tableBean.getData();
                             if (tableBeanData != null) {

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

@@ -428,15 +428,15 @@ public class TableActivity extends BaseActivity<TablePresenter> implements Table
             @Override
             public void onTabSelected(int index) {
                 if (index == 0) {
+                    setBottomFunctionVisibility(false);
                     //标号输入页面 暂停刷新餐台数据
                     onPauseRefreshTableData();
                 } else {
+                    setBottomFunctionVisibility(true);
                     //页面切换完成区域，状态页面恢复获取餐台数据
                     onStartRefreshTableData();
                 }
                 mCurrentPageIndex = index;
-//                //设置当前显示Fragment页面
-//                mPresenter.setCurrentShowFragment(fragmentList.get(position));
             }
 
             @Override
@@ -455,6 +455,10 @@ public class TableActivity extends BaseActivity<TablePresenter> implements Table
         });
     }
 
+    private void setBottomFunctionVisibility(boolean show) {
+        rv_bottom_function.setVisibility(show == true ? View.VISIBLE : View.GONE);
+    }
+
     @Override
     protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
         super.onActivityResult(requestCode, resultCode, data);

table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/orderManager/OrderCenterActivity.java

@@ -112,6 +112,10 @@ public class OrderCenterActivity extends BaseActivity<OrderCenterPresenter> impl
         mPresenter.loadOrderList(status, getPageIndex(), getPageSize(), refreshLayout, isLoadMore);
     }
 
+    public void cancelOrder(long orderId, byte status) {
+        mPresenter.cancelOrder(orderId, status);
+    }
+
     private void initTabAndPager() {
         QMUIFragmentPagerAdapter pagerAdapter = new QMUIFragmentPagerAdapter(getSupportFragmentManager()) {
             @Override
@@ -277,10 +281,6 @@ public class OrderCenterActivity extends BaseActivity<OrderCenterPresenter> impl
         getCurrentOrderFragment().setData(message);
     }
 
-    public void cancelOrder(long orderId, byte status) {
-        mPresenter.cancelOrder(orderId, status);
-    }
-
     @Override
     public void setPageIndex(int index) {
         getCurrentOrderFragment().setPageIndex(index);

table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/fragment/AllTableFragment.java

@@ -21,7 +21,9 @@ import com.jess.arms.base.BaseFragment;
 import com.jess.arms.base.DefaultAdapter;
 import com.jess.arms.di.component.AppComponent;
 import com.jess.arms.utils.ArmsUtils;
+import com.qmuiteam.qmui.layout.QMUIRelativeLayout;
 import com.qmuiteam.qmui.util.QMUIDisplayHelper;
+import com.qmuiteam.qmui.util.QMUIResHelper;
 
 import java.util.List;
 
@@ -205,7 +207,9 @@ public class AllTableFragment extends BaseFragment<AllTablePresenter> implements
 //        } else {
             mAllTableRecycleLayoutManager = new GridLayoutManager(getActivity(), 4, LinearLayoutManager.VERTICAL, false);
             recycle_all_table.setLayoutManager(mAllTableRecycleLayoutManager);
-            recycle_all_table.addItemDecoration(new GridDividerItemDecoration(QMUIDisplayHelper.dpToPx(1), ArmsUtils.getColor(getActivity(), R.color.theme_grey_color)));
+//            recycle_all_table.addItemDecoration(new GridDividerItemDecoration(ArmsUtils.dip2px(getActivity(),1), ArmsUtils.getColor(getActivity(), R.color.red)));
+        recycle_all_table.addItemDecoration(new DividerItemDecoration(getActivity(), LinearLayoutManager.HORIZONTAL));
+        recycle_all_table.addItemDecoration(new DividerItemDecoration(getActivity(), LinearLayoutManager.VERTICAL));
 //        }
     }
 }

table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/fragment/StateTableFragment.java

@@ -206,7 +206,9 @@ public class StateTableFragment extends BaseFragment<StateTablePresenter> implem
 //        } else {
         mStateTableRecycleLayoutManager = new GridLayoutManager(getActivity(), 4, LinearLayoutManager.VERTICAL, false);
         recycle_state_table.setLayoutManager(mStateTableRecycleLayoutManager);
-        recycle_state_table.addItemDecoration(new GridDividerItemDecoration(QMUIDisplayHelper.dpToPx(1), ArmsUtils.getColor(getActivity(), R.color.theme_grey_color)));
-//        }
+//        recycle_state_table.addItemDecoration(new GridDividerItemDecoration(ArmsUtils.dip2px(getActivity(),1), ArmsUtils.getColor(getActivity(), R.color.theme_grey_color)));
+        recycle_state_table.addItemDecoration(new DividerItemDecoration(getActivity(), LinearLayoutManager.HORIZONTAL));
+        recycle_state_table.addItemDecoration(new DividerItemDecoration(getActivity(), LinearLayoutManager.VERTICAL));
+        //        }
     }
 }

table-mode/src/main/res/layout/table_activity_table.xml

@@ -14,7 +14,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_above="@+id/rv_bottom_function"
-        android:layout_marginTop="?attr/qmui_topbar_height">
+        android:layout_marginTop="?attr/qmui_topbar_height"
+        android:background="@color/theme_white_color">
 
         <com.qmuiteam.qmui.widget.tab.QMUITabSegment
             android:id="@+id/tabSegment"