1、按返回沒有彈出提示尚有食物未送單,是否不保存返回 2、修改沒有找到會員提示 3、美化一下，按進細項，這數字建盤飛起來了

0d0fc54b · 宁斌 · 525c4def · 0d0fc54b · 0d0fc54b · 0d0fc54b
Commit 0d0fc54b authored Oct 29, 2020 by 宁斌
6 changed files
--- a/table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/discount/MealDiscountAction.java
+++ b/table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/discount/MealDiscountAction.java
@@ -24,19 +24,24 @@ public class MealDiscountAction implements Strategy<Discount> {
    private Activity mContext;
-    private List<OrderDetail> mOrderMealList;
+    private List<OrderDetail> mSelectMixOrderMealList;
    private MealDiscountAction.OnCallBackListener mListener;
-    public MealDiscountAction(Activity context, List<OrderDetail> orderMealList, MealDiscountAction.OnCallBackListener listener) {
+    public MealDiscountAction(Activity context, MealDiscountAction.OnCallBackListener listener) {
        this.mContext = context;
-        this.mOrderMealList = orderMealList;
        this.mListener = listener;
    }
+    public void setSelectMixOrderMealList(List<OrderDetail> selectMixOrderMealList) {
+        this.mSelectMixOrderMealList = selectMixOrderMealList;
+    }
    @Override
    public void action(Discount discount) {
+        if (mSelectMixOrderMealList == null || mSelectMixOrderMealList.size() == 0) {
+            return;
+        }
        if (isOnlyOnce(discount)) {
            //此折扣只一次
            return;
@@ -158,6 +163,7 @@ public class MealDiscountAction implements Strategy<Discount> {
        });
    }
    public interface OnCallBackListener {
        void exclusiveRemoveOther();

--- a/table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/MealStandPresenter.java
+++ b/table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/MealStandPresenter.java
@@ -148,17 +148,16 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod
        super(model, rootView);
        this.IActivity = (MealStandActivity) rootView;
-        mMealDiscountAction = new MealDiscountAction(IActivity, getMixOrderMealList(), new MealDiscountAction.OnCallBackListener() {
+        mMealDiscountAction = new MealDiscountAction(IActivity,  new MealDiscountAction.OnCallBackListener() {
            @Override
            public void exclusiveRemoveOther() {
            }
            @Override
            public void preformAddDiscount(Discount discount) {
+                addDiscountItem(discount);
            }
        });
    }
@@ -167,7 +166,7 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod
     * 獲取當前選中的套餐食品組
     * @return
     */
-    private List<OrderDetail> getMixOrderMealList() {
+    private List<OrderDetail> getSelectMixOrderMealList() {
        List<OrderDetail> mixOrderMealList = new ArrayList<>();
        for (int i = mSelectMealAdapter.getSelect_full_start_position();
             mSelectMealAdapter.getSelect_full_end_position() < mOrderMealList.size(); i++) {
@@ -402,7 +401,8 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod
 //                } else {
 //                    addDiscountItem(discountBean);
 //                }
-                mNomalDiscountAction.action(discountBean);
+                mMealDiscountAction.setSelectMixOrderMealList();
+                mMealDiscountAction.action(discountBean);
            }
        });
    }
@@ -1028,10 +1028,10 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod
                                    //更新會員信息
                                    mRootView.updateMemberInfo(memberInfo);
                                } else {
-                                    mRootView.showMessage("請輸入正確的會員號碼!");
+                                    mRootView.showMessage("未找到相關會員電話號碼,請重新輸入");
                                }
                            } else {
-                                mRootView.showMessage("獲取會員信息失敗!");
+                                mRootView.showMessage("獲取會員信息失敗");
                            }
                        } else {
                            mRootView.showMessage(info.getErrMsg());

--- a/table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/TablePresenter.java
+++ b/table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/TablePresenter.java
@@ -338,7 +338,7 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont
                            if (orderBean != null && respose.getData().getOrderDetails() != null) {
                                if (respose.getData().getCreateTime() != null && openTableBean != null) {
                                    //將開台時間設置為訂單創建時間
-                                    openTableBean.setCreateTime(TimeUtils.getFormatTime(respose.getData().getCreateTime(), TimeUtils.DEFAULT_DATE_FORMAT));
+                                    openTableBean.setCreateTime(respose.getData().getCreateTime());
                                }
                                tableInfo.setPerson(orderBean.getPerson());
@@ -417,7 +417,7 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont
                            if (orderBean != null && respose.getData().getOrderDetails() != null) {
                                if (respose.getData().getCreateTime() != null && openTableBean != null) {
                                    //將開台時間設置為訂單創建時間
-                                    openTableBean.setCreateTime(TimeUtils.getFormatTime(respose.getData().getCreateTime(), TimeUtils.DEFAULT_DATE_FORMAT));
+                                    openTableBean.setCreateTime(respose.getData().getCreateTime());
                                }
                                List<OrderBean.OrderDetailsBean> mealCommoditysBeans = orderBean.getOrderDetails();

--- a/table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/MealStandActivity.java
+++ b/table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/MealStandActivity.java
@@ -1337,11 +1337,11 @@ public class MealStandActivity extends BaseFragmentActivity<MealStandPresenter> 
    @Override
    public void setModifierTop(int margins) {
-//        RelativeLayout.LayoutParams layoutParam = new RelativeLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+        RelativeLayout.LayoutParams layoutParam = new RelativeLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
-//        layoutParam.setMargins(0, margins, 0, 0);
+        layoutParam.setMargins(0, margins, 0, 0);
-//        layoutParam.addRule(RelativeLayout.ABOVE, R.id.ll_stand_oper);
+        layoutParam.addRule(RelativeLayout.ABOVE, R.id.ll_stand_oper);
-//        layoutParam.addRule(RelativeLayout.BELOW, R.id.rv_combo);
+        layoutParam.addRule(RelativeLayout.BELOW, R.id.rv_combo);
-//        rv_modifier.setLayoutParams(layoutParam);
+        rv_modifier.setLayoutParams(layoutParam);
    }
    @Override

--- a/table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/adapter/TableAdapter.java
+++ b/table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/adapter/TableAdapter.java
@@ -160,7 +160,7 @@ public class TableAdapter extends DefaultAdapter<TableBean.DataBean> {
                tv_people.setVisibility(View.VISIBLE);
                tv_people.setText(person + "人");
                String createDate = item.getCreateTime();
-                if (!TextUtils.isEmpty(createDate) && createDate.startsWith("Jul")) {
+                if (!TextUtils.isEmpty(createDate)) {
                    LogUtil.d(TAG, "tableName: " + item.getTableName() + "  " + "createDate: " + createDate);
                    Date date = new Date(createDate);
                    String createTime = TimeUtils.getStringByFormat(date, TimeUtils.DEFAULT_DATE_FORMAT);

--- a/table-module/src/main/res/layout/table_activity_meal_stand.xml
+++ b/table-module/src/main/res/layout/table_activity_meal_stand.xml
@@ -499,7 +499,7 @@
        android:layout_height="38dp"
        android:layout_below="@+id/ll_meals"
        android:background="@color/theme_white_color"
-        android:visibility="visible">
+        android:visibility="invisible">
        <ImageView
            android:id="@+id/iv_fine_back"
@@ -543,7 +543,7 @@
        android:layout_below="@+id/ll_meals"
        android:layout_above="@+id/ll_stand_oper">
-        <LinearLayout
+        <RelativeLayout
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:orientation="vertical">
@@ -562,11 +562,12 @@
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:layout_marginTop="@dimen/dp_10"
+                android:layout_below="@+id/rv_combo"
                android:divider="@null"
                android:fadeScrollbars="false"
                android:orientation="vertical"
                android:visibility="visible" />
-        </LinearLayout>
+        </RelativeLayout>
    </ScrollView>
    <androidx.recyclerview.widget.RecyclerView