Merge branch 'dev' into master

d34cee16 · 宁斌 · b6bfdbd5 · 1288870b · d34cee16 · d34cee16
Commit d34cee16 authored Oct 30, 2020 by 宁斌
30 changed files
--- a/arms/build.gradle
+++ b/arms/build.gradle
@@ -101,6 +101,7 @@ dependencies {
        exclude module: 'support-annotations'
    }
    api rootProject.ext.dependencies['rxerrorhandler2']
+    api rootProject.ext.dependencies['rxbinding']
    //network
    api(rootProject.ext.dependencies["retrofit"]) {
        exclude module: 'okhttp'

--- a/base-module/build.gradle
+++ b/base-module/build.gradle
@@ -51,7 +51,7 @@ android {
        /**
         * 版本号
         */
-        schemaVersion 20
+        schemaVersion 21
        /**
         * greendao输出dao的数据库操作实体类文件夹（相对路径 包名+自定义路径名称，包将创建于包名的直接路径下）
         */

--- a/base-module/src/main/java/com/gingersoft/gsa/cloud/base/application/GsaCloudApplication.java
+++ b/base-module/src/main/java/com/gingersoft/gsa/cloud/base/application/GsaCloudApplication.java
@@ -104,6 +104,7 @@ public class GsaCloudApplication extends BaseApplication {
            //指定为经典Footer，默认是 BallPulseFooter
            return new ClassicsFooter(context).setDrawableSize(20);
        });
    }
    @Override
@@ -133,14 +134,12 @@ public class GsaCloudApplication extends BaseApplication {
        //初始化crash記錄
        AppCrashHandler.getInstance().init(this);
-        uiStyleConfiguration = new UIStyleExtendedConfiguration();
-        functionConfiguration = new FunctionExtendedConfiguration();
        isLogin = (boolean) SPUtils.get(this, PrintConstans.IS_LOGIN, false);
+        uiStyleConfiguration = new UIStyleExtendedConfiguration();
+        functionConfiguration = new FunctionExtendedConfiguration();
        //上傳餐廳擴展信息
        ExpandInfoSetting.initUpdateExtendedConfiguration(uiStyleConfiguration,functionConfiguration);
-        //獲取餐廳擴展表數據
-        initExpandInfo();
        // 设定一些通用的属性，这些属性在每次统计事件中都会附带
        // 注意：如果此处的属性名与内置属性的名称相同，则内置属性会被覆盖
@@ -158,21 +157,6 @@ public class GsaCloudApplication extends BaseApplication {
 //        Tracker.INSTANCE.initialize(this);
    }
-    private void initExpandInfo() {
-        //在IO线程执行数据库处理操作
-        Observable.just(0)
-                .subscribeOn(Schedulers.io())
-                .subscribe(new Consumer<Integer>() {
-                    @Override
-                    public void accept(@io.reactivex.annotations.NonNull Integer integer) throws Exception {
-                        ExpandInfoDaoUtils expandInfoDaoUtils = new ExpandInfoDaoUtils(getAppContext());
-                        List<ExpandInfo> expandInfos = expandInfoDaoUtils.queryAllExpandInfo();
-                        if (expandInfos != null) {
-                            RestaurantExpandInfoUtils.setCommonExpandInfo(expandInfos);
-                        }
-                    }
-                });
-    }
    public Activity getCurrentActivity() {
        return mCurrentActivity;

--- a/base-module/src/main/java/com/gingersoft/gsa/cloud/base/utils/crash/AppCrashHandler.java
+++ b/base-module/src/main/java/com/gingersoft/gsa/cloud/base/utils/crash/AppCrashHandler.java
@@ -11,6 +11,7 @@ import android.widget.Toast;
 import com.elvishew.xlog.XLog;
 import com.gingersoft.gsa.cloud.base.Api;
+import com.gingersoft.gsa.cloud.base.BuildConfig;
 import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication;
 import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
 import com.gingersoft.gsa.cloud.base.utils.FileUtils;
@@ -41,6 +42,8 @@ import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.Disposable;
 import io.reactivex.schedulers.Schedulers;
+import static com.gingersoft.gsa.cloud.constans.AppConstans.RP_ERROR;
 public class AppCrashHandler implements UncaughtExceptionHandler {
    /**
     * Debug Log tag
@@ -141,12 +144,27 @@ public class AppCrashHandler implements UncaughtExceptionHandler {
        if (ex == null) {
            return false;
        }
        //使用Toast来显示异常信息
        new Thread() {
            @Override
            public void run() {
                Looper.prepare();
-                Toast.makeText(mContext, ErrorStr, Toast.LENGTH_LONG).show();
+                String showText = ErrorStr;
+                Throwable cause = ex.getCause();
+                if (cause != null && BuildConfig.DEBUG) {
+                    StackTraceElement[] stackTrace = cause.getStackTrace();
+                    if (stackTrace != null && stackTrace.length > 0) {
+                        String causeName = cause.getClass().getSimpleName();
+                        String fileName = stackTrace[0].getFileName();
+                        fileName = fileName.substring(0, fileName.length() - 4);
+                        int lineNumber = stackTrace[0].getLineNumber();
+                        showText += "-" + fileName + "-" + lineNumber + "-" + causeName;
+                        OkHttp3Utils.noticePersonnel(RP_ERROR, showText);
+                    }
+                }
+                Toast.makeText(mContext, showText, Toast.LENGTH_LONG).show();
                Looper.loop();
            }
        }.start();
@@ -201,7 +219,7 @@ public class AppCrashHandler implements UncaughtExceptionHandler {
                        @Override
                        public void onNext(String data) {
-                            if(!TextUtils.isEmpty(data)){
+                            if (!TextUtils.isEmpty(data)) {
                                BaseResult result = JsonUtils.parseObject(data, BaseResult.class);
                                if (result != null && result.isSuccess()) {
                                    //上傳成功后刪除對應文件

--- a/base-module/src/main/java/com/gingersoft/gsa/cloud/base/utils/time/TimePickerUtils.java
+++ b/base-module/src/main/java/com/gingersoft/gsa/cloud/base/utils/time/TimePickerUtils.java
@@ -119,6 +119,7 @@ public class TimePickerUtils {
                .setTitleColor(Color.BLACK)//标题文字颜色
                .setSubmitColor(Color.BLUE)//确定按钮文字颜色
                .setCancelColor(Color.BLUE)//取消按钮文字颜色
+                .setDate(defaultTime)
                .setRangDate(Calendar.getInstance(), endTime)//限制時間範圍
                .setLabel("", "", "", "", "", "")
                .isCenterLabel(false) //是否只显示中间选中项的label文字，false则每项item全部都带有label。

--- a/base-module/src/main/java/com/gingersoft/gsa/cloud/bean/expandInfo/ExpandInfoSetting.java
+++ b/base-module/src/main/java/com/gingersoft/gsa/cloud/bean/expandInfo/ExpandInfoSetting.java
 package com.gingersoft.gsa.cloud.bean.expandInfo;
+import android.util.SparseArray;
 import com.gingersoft.gsa.cloud.base.Api;
 import com.gingersoft.gsa.cloud.base.utils.JsonUtils;
 import com.gingersoft.gsa.cloud.base.utils.ReflectionUtils;
 import com.gingersoft.gsa.cloud.base.utils.RestaurantExpandInfoUtils;
-import com.gingersoft.gsa.cloud.base.utils.gson.GsonUtils;
 import com.gingersoft.gsa.cloud.base.utils.okhttpUtils.OkHttp3Utils;
 import com.gingersoft.gsa.cloud.constans.HttpsConstans;
 import com.gingersoft.gsa.cloud.database.bean.ExpandInfo;
@@ -18,15 +19,18 @@ import java.util.HashMap;
 import java.util.List;
 import io.reactivex.Observable;
+import io.reactivex.Observer;
+import io.reactivex.disposables.Disposable;
 import io.reactivex.functions.Consumer;
 import io.reactivex.schedulers.Schedulers;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.Setter;
-import me.jessyan.retrofiturlmanager.RetrofitUrlManager;
 import okhttp3.MediaType;
 import okhttp3.RequestBody;
+import static com.gingersoft.gsa.cloud.base.application.GsaCloudApplication.getAppContext;
 /**
 * @author : bin
 * @create date: 2020-10-20
@@ -46,7 +50,7 @@ public class ExpandInfoSetting {
    /**
     * 數據類型 1：整形，2：字符型，3：布爾型，4：日期類型
     */
-    private byte dataType;
+    private int dataType;
    private int sort;
    private String showName;
    private String remark;
@@ -67,7 +71,7 @@ public class ExpandInfoSetting {
    public static void initUpdateExtendedConfiguration(Object... objects) {
        Observable.just(0)
-                .subscribeOn(Schedulers.newThread())
+                .subscribeOn(Schedulers.io())
                .subscribe(new Consumer<Integer>() {
                    @Override
                    public void accept(@io.reactivex.annotations.NonNull Integer integer) throws Exception {
@@ -78,10 +82,34 @@ public class ExpandInfoSetting {
                        }
                        String expandInfoListJson = JsonUtils.toJson(expandInfoSettingList);
-                        RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"),expandInfoListJson);
+                        RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), expandInfoListJson);
-                        OkHttp3Utils.post(HttpsConstans.ROOT_SERVER_ADDRESS_FORMAL + Api.add_restaurant_base_table_configuration,requestBody)
+                        OkHttp3Utils.post(HttpsConstans.ROOT_SERVER_ADDRESS_FORMAL + Api.add_restaurant_base_table_configuration, requestBody)
-                                .subscribe();
+                                .subscribe(new Observer<String>() {
+                                    @Override
+                                    public void onSubscribe(Disposable d) {
+                                    }
+                                    @Override
+                                    public void onNext(String s) {
+                                    }
+                                    @Override
+                                    public void onError(Throwable e) {
+                                    }
+                                    @Override
+                                    public void onComplete() {
+                                        //從本地獲取餐廳擴展表數據
+                                        ExpandInfoDaoUtils expandInfoDaoUtils = new ExpandInfoDaoUtils(getAppContext());
+                                        List<ExpandInfo> expandInfos = expandInfoDaoUtils.queryAllExpandInfo();
+                                        if (expandInfos != null) {
+                                            RestaurantExpandInfoUtils.setCommonExpandInfo(expandInfos);
+                                        }
+                                    }
+                                });
                    }
                });
    }
@@ -104,7 +132,7 @@ public class ExpandInfoSetting {
            Class<?> returnClass = method.getReturnType();
            if (method.getName().startsWith("get") && returnClass.equals(ExpandInfoSetting.class)) {
                try {
-                    Object [] objs ={};
+                    Object[] objs = {};
                    //反射執行get方法 獲取每個配置類信息
                    ExpandInfoSetting expandInfo = (ExpandInfoSetting) ReflectionUtils.invokeMethod(method, obj, objs);
                    //獲取完整的settingName

--- a/base-module/src/main/java/com/gingersoft/gsa/cloud/constans/AppConstans.java
+++ b/base-module/src/main/java/com/gingersoft/gsa/cloud/constans/AppConstans.java
@@ -10,7 +10,8 @@ public class AppConstans {
    public static final String RP_THIRE_LOGISTICS_ERROR = "RP_WL003";//第三方物流接口錯誤碼
    public static final String RP_UPDATE_ORDER_STATE_ERROR = "RP_UO004";//修改訂單狀態失敗錯誤碼
    public static final String RP_LOGIN_ERROR = "RP_LOGIN";//登陸報錯錯誤碼
-    public static final String RP_REPRINT_CODE = "RP_REPRINT_CODE";//登陸報錯錯誤碼
+    public static final String RP_REPRINT_CODE = "RP_REPRINT_CODE";//重印推送
+    public static final String RP_ERROR = "RP_ERROR";//全局報錯錯誤碼
    public static final String SECRETKEY_VALUES = "2309485937845783";
@@ -27,5 +28,5 @@ public class AppConstans {
    /**語言下標*/
    public static final String LANGUAGE_INDEX = "language_index";
+    //4個四通，四條腿
 }
--- a/base-module/src/main/java/com/gingersoft/gsa/cloud/database/bean/Discount.java
+++ b/base-module/src/main/java/com/gingersoft/gsa/cloud/database/bean/Discount.java
--- a/base-module/src/main/java/com/gingersoft/gsa/cloud/database/greendao/DaoMaster.java
+++ b/base-module/src/main/java/com/gingersoft/gsa/cloud/database/greendao/DaoMaster.java
@@ -14,10 +14,10 @@ import org.greenrobot.greendao.identityscope.IdentityScopeType;
 // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
 /**
- * Master of DAO (schema version 20): knows all DAOs.
+ * Master of DAO (schema version 21): knows all DAOs.
 */
 public class DaoMaster extends AbstractDaoMaster {
-    public static final int SCHEMA_VERSION = 20;
+    public static final int SCHEMA_VERSION = 21;
    /** Creates underlying database table using DAOs. */
    public static void createAllTables(Database db, boolean ifNotExists) {

--- a/base-module/src/main/java/com/gingersoft/gsa/cloud/database/greendao/DiscountDao.java
+++ b/base-module/src/main/java/com/gingersoft/gsa/cloud/database/greendao/DiscountDao.java
--- a/base-module/src/main/java/com/gingersoft/gsa/cloud/ui/view/timeselect/WheelTime.java
+++ b/base-module/src/main/java/com/gingersoft/gsa/cloud/ui/view/timeselect/WheelTime.java
@@ -700,8 +700,8 @@ public class WheelTime {
                sb.append((wv_year.getCurrentItem() + startYear)).append("-")
                        .append((wv_month.getCurrentItem() + startMonth)).append("-")
                        .append((wv_day.getCurrentItem() + startDay)).append(" ")
-                        .append(wv_hours.getCurrentItem()).append(":")
+                        .append(wv_hours.getCurrentItem() + startHour).append(":")
-                        .append(wv_minutes.getCurrentItem()).append(":")
+                        .append(wv_minutes.getCurrentItem() + startMin).append(":")
                        .append(wv_seconds.getCurrentItem());
            } else {
                sb.append((wv_year.getCurrentItem() + startYear)).append("-")

--- a/config.gradle
+++ b/config.gradle
@@ -78,6 +78,9 @@ ext {
            "rxpermissions2"           : "com.tbruyelle.rxpermissions2:rxpermissions:0.9.5@aar",
            "rxerrorhandler2"          : "me.jessyan:rxerrorhandler:2.1.1",
+            //rxbinding
+            "rxbinding"          : "com.jakewharton.rxbinding4:rxbinding:4.0.0",
            //tools
            "dagger2"                  : "com.google.dagger:dagger:${version["dagger2SdkVersion"]}",
            "dagger2-android"          : "com.google.dagger:dagger-android:${version["dagger2SdkVersion"]}",

--- a/delivery_pick_module/src/main/java/com/gingersoft/gsa/delivery_pick_mode/mvp/ui/activity/PrjQueryActivity.java
+++ b/delivery_pick_module/src/main/java/com/gingersoft/gsa/delivery_pick_mode/mvp/ui/activity/PrjQueryActivity.java
@@ -221,6 +221,11 @@ public class PrjQueryActivity extends BaseActivity<PrjQueryPresenter> implements
    }
    private void printPrj(List<PrjBean.DataBean.Bean> printDatas) {
+        for (int i = 0; i < printDatas.size(); i++) {
+            printDatas.get(i).setTotalPrj(printDatas.size());
+            printDatas.get(i).setCurrentIndex(i);
+        }
        CC.obtainBuilder("Component.Print")
                .addParam(PrintConstans.PRINT_TYPE, PrintConstans.PRINT_KITCHEN)
                .addParam("prjBeans", printDatas)

--- a/order-base/src/main/java/com/gingersoft/gsa/cloud/base/order/bean/OrderBean.java
+++ b/order-base/src/main/java/com/gingersoft/gsa/cloud/base/order/bean/OrderBean.java
@@ -452,7 +452,7 @@ public class OrderBean {
        public static class RestaurantDiscountVO implements Serializable{
            private long id;
            private int type;
-            private float discountValue;
+            private int discountValue;
            private String remark;
            private double discountAmount;
@@ -472,11 +472,11 @@ public class OrderBean {
                this.type = type;
            }
-            public float getDiscountValue() {
+            public int getDiscountValue() {
                return discountValue;
            }
-            public void setDiscountValue(float discountValue) {
+            public void setDiscountValue(int discountValue) {
                this.discountValue = discountValue;
            }

--- a/order-base/src/main/java/com/gingersoft/gsa/cloud/base/order/bean/OrderDetail.java
+++ b/order-base/src/main/java/com/gingersoft/gsa/cloud/base/order/bean/OrderDetail.java
@@ -1071,7 +1071,7 @@ public class OrderDetail implements Serializable {
    private static Discount getDiscountItem(OrderBean.OrderDetailsBean.RestaurantDiscountVO discountBean) {
        Discount discount = new Discount();
        discount.setId(discountBean.getId());
-        discount.setDiscount_value(discountBean.getDiscountValue());
+        discount.setDiscountValue(discountBean.getDiscountValue());
        discount.setAmount(discountBean.getDiscountAmount());
        discount.setType(discountBean.getType());
        discount.setRemark(discountBean.getRemark());

--- a/order-base/src/main/java/com/gingersoft/gsa/cloud/base/order/bean/discount/OrderDiscount.java
+++ b/order-base/src/main/java/com/gingersoft/gsa/cloud/base/order/bean/discount/OrderDiscount.java
@@ -114,7 +114,7 @@ public class OrderDiscount {
            request.setType(MEMBER_DISCOUNT);
            if(discount.getDiscount() != null) {
                request.setMemberId(discount.getDiscount().getId());
-                request.setMemberDiscountRate((int) discount.getDiscount().getDiscount_value());
+                request.setMemberDiscountRate((int) discount.getDiscount().getDiscountValue());
            }
            request.setDiscountAmount(discount.getMoney());
            request.setScAble(0);
@@ -127,7 +127,7 @@ public class OrderDiscount {
            if(discount.getDiscount() != null) {
                request.setMemberId(discount.getDiscount().getMemberId());
                request.setDiscountId(discount.getDiscount().getId());
-                request.setMemberDiscountRate((int) discount.getDiscount().getDiscount_value());
+                request.setMemberDiscountRate((int) discount.getDiscount().getDiscountValue());
            }
            request.setDiscountAmount(discount.getMoney());
            request.setScAble(0);

--- a/print-module/src/main/java/com/joe/print/mvp/ui/activity/PrintActivity.java
+++ b/print-module/src/main/java/com/joe/print/mvp/ui/activity/PrintActivity.java
@@ -53,6 +53,7 @@ import com.joe.print.mvp.ui.adapter.DialogPrinterListAdapter;
 import com.joe.print.mvp.ui.adapter.PrintProgressAdapter;
 import com.yanzhenjie.recyclerview.widget.DefaultItemDecoration;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -170,7 +171,18 @@ public class PrintActivity extends BaseActivity<PrintPresenter> implements Print
 //            List<PrjBean.DataBean.Bean> printDatas = (List<PrjBean.DataBean.Bean>) getIntent().getSerializableExtra("prjBeans");
            List<PrjBean.DataBean.Bean> printDatas = CCUtil.getNavigateParam(this, "prjBeans", null);
            Map<String, List<PrjBean.DataBean.Bean>> prjMap = PrintPrjKitchen.getPrjMap();
-            prjMap.put("", printDatas);
+            for (PrjBean.DataBean.Bean prjBean : printDatas) {
+                if (prjMap.containsKey(prjBean.getPrintPosition())) {
+                    List<PrjBean.DataBean.Bean> beans = prjMap.get(prjBean.getPrintPosition());
+                    if (beans != null) {
+                        beans.add(prjBean);
+                    }
+                } else {
+                    prjMap.put(prjBean.getPrintPosition(), Collections.singletonList(prjBean));
+                }
+            }
+//            prjMap.put("", printDatas);
        }
        if (defaultPrint == null) {

--- a/table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/OrderContentModel.java
+++ b/table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/OrderContentModel.java
@@ -22,6 +22,7 @@ import com.jess.arms.di.scope.ActivityScope;
 import com.jess.arms.integration.IRepositoryManager;
 import com.jess.arms.mvp.BaseModel;
+import java.util.Date;
 import java.util.List;
 import javax.inject.Inject;
@@ -66,7 +67,8 @@ public class OrderContentModel extends BaseModel implements OrderContentContract
        if (OpenTableManage.getDefault().getTableBean() == null) {
            OpenTableManage.getDefault().setTableBean(new TableBean.DataBean());
        }
-        OpenTableManage.getDefault().getTableBean().setCreateTime(TimeUtils.getTime(createTime, TimeUtils.DEFAULT_DATE_FORMAT));
+        String dateTime = new Date(createTime).toString();
+        OpenTableManage.getDefault().getTableBean().setCreateTime(dateTime);
    }
    @Override
@@ -191,9 +193,9 @@ public class OrderContentModel extends BaseModel implements OrderContentContract
    }
    @Override
-    public Observable<BaseResult> queryCoupon(int tableId,Long memberId, long couponMemberId, String couponNo, int restaurantId) {
+    public Observable<BaseResult> queryCoupon(int tableId, Long memberId, long couponMemberId, String couponNo, int restaurantId) {
        return mRepositoryManager.obtainRetrofitService(MemberService.class)
-                .queryCoupon(tableId,memberId, couponMemberId, couponNo, restaurantId);
+                .queryCoupon(tableId, memberId, couponMemberId, couponNo, restaurantId);
    }
    @Override

--- a/table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/cart/ShoppingCart.java
+++ b/table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/cart/ShoppingCart.java
@@ -36,7 +36,7 @@ public abstract class ShoppingCart {
        Discount discount = new Discount();
        discount.setType(1);
        discount.setRemark("9折");
-        discount.setDiscount_value(10);
+        discount.setDiscountValue(10);
        MemberInfo memberDiscount = new MemberInfo();
        memberDiscount.setMemberName("斯八達");

--- a/table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/discount/NomalDiscount.java
+++ b/table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/discount/NomalDiscount.java
@@ -50,7 +50,7 @@ public class NomalDiscount extends MultyDiscount{
            discountMoney = discount.getAmount();
        } else {
            //百分比折扣
-            discountMoney = MoneyUtil.divide(MoneyUtil.multiply(sourceMoney, discount.getDiscount_value()), 100).doubleValue();
+            discountMoney = MoneyUtil.divide(MoneyUtil.multiply(sourceMoney, discount.getDiscountValue()), 100).doubleValue();
        }
        if (sourceMoney < discountMoney) {
            //折扣金額不能超出總額

--- a/table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/BaseOrderPresenter.java
+++ b/table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/BaseOrderPresenter.java
@@ -42,6 +42,7 @@ import com.jess.arms.utils.RxLifecycleUtils;
 import com.tbruyelle.rxpermissions2.RxPermissions;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -117,7 +118,8 @@ public abstract class BaseOrderPresenter<M extends BaseOrderContract.Model, V ex
        if (OpenTableManage.getDefault().getTableBean() == null) {
            OpenTableManage.getDefault().setTableBean(new TableBean.DataBean());
        }
-        OpenTableManage.getDefault().getTableBean().setCreateTime(TimeUtils.getTime(createTime, TimeUtils.DEFAULT_DATE_FORMAT));
+        String dateTime = new Date(createTime).toString();
+        OpenTableManage.getDefault().getTableBean().setCreateTime(dateTime);
    }
@@ -420,7 +422,7 @@ public abstract class BaseOrderPresenter<M extends BaseOrderContract.Model, V ex
                        if (orderDiscount.getDiscountValue() != 0) {
                            //百分比折扣
                            discount.setType(1);
-                            discount.setDiscount_value(orderDiscount.getDiscountValue());
+                            discount.setDiscountValue(orderDiscount.getDiscountValue());
                            addOrderDiscount(true, discount, BillOrderMoney.BILL_ITEM_ORDER_SENT_STATUS);
                            continue;
                        }
@@ -577,7 +579,7 @@ public abstract class BaseOrderPresenter<M extends BaseOrderContract.Model, V ex
        discount.setMemberId(memberId);
        discount.setType(1);
        discount.setRemark(memberName + discountRate + "%");
-        discount.setDiscount_value(discountRate);
+        discount.setDiscountValue(discountRate);
        orderMoney.setDiscount(discount);
        mOrderMoneyList.add(orderMoney);
@@ -627,7 +629,7 @@ public abstract class BaseOrderPresenter<M extends BaseOrderContract.Model, V ex
        discount.setId(coupon.getId());
        discount.setMemberId(memberId);
        discount.setRemark(coupon.getName() + coupon.getDiscount() + "%");
-        discount.setDiscount_value(coupon.getDiscount());
+        discount.setDiscountValue(coupon.getDiscount());
        discount.setAmount(coupon.getAmount());
        if (coupon.getDiscount() != 0) {
            discount.setType(1);
@@ -647,7 +649,7 @@ public abstract class BaseOrderPresenter<M extends BaseOrderContract.Model, V ex
        BillOrderMoney orderMoney = getBillOrderItemByType(BillOrderMoney.COUPON_DISCOUNT_TYPE);
        if (orderMoney != null) {
            double totalMoney = getDiscountableFoodTotal(BillOrderMoney.COUPON_DISCOUNT_TYPE, false);
-            double discountPrice = CouponDiscountBean.calculationCoupon(orderMoney.getDiscount().getDiscount_value(), orderMoney.getDiscount().getAmount(), totalMoney);
+            double discountPrice = CouponDiscountBean.calculationCoupon(orderMoney.getDiscount().getDiscountValue(), orderMoney.getDiscount().getAmount(), totalMoney);
            orderMoney.setMoney(discountPrice);
        }
    }
@@ -1454,6 +1456,10 @@ public abstract class BaseOrderPresenter<M extends BaseOrderContract.Model, V ex
    protected List<Discount> filterDiscountByType(List<Discount> discountList, String discountType) {
        for (int i = discountList.size() - 1; i >= 0; i--) {
            Discount discount = discountList.get(i);
+            if (discount.getDiscountType().equals("2")) {
+                //2=全部類型
+                continue;
+            }
            if (TextUtils.isEmpty(discount.getDiscountType()) || !discount.getDiscountType().contains(discountType)) {
                discountList.remove(i);
            }
@@ -1579,7 +1585,7 @@ public abstract class BaseOrderPresenter<M extends BaseOrderContract.Model, V ex
    }
-    protected boolean hasNesOrderFoods() {
+    public boolean hasNesOrderFoods() {
        if (getNewOrderFoodLists().size() > 0) {
            return true;
        }

--- 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
@@ -975,10 +975,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
@@ -336,7 +336,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());
                                }
                                OpenTableManage.getDefault().setPeopleNumber(orderBean.getPerson());
@@ -418,7 +418,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());
                                }
                                OpenTableManage.getDefault().setPeopleNumber(orderBean.getPerson());

--- 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
@@ -34,6 +34,7 @@ import com.gingersoft.gsa.cloud.base.order.bean.OrderDetail;
 import com.gingersoft.gsa.cloud.base.order.bean.mealManger.MyOrderManage;
 import com.gingersoft.gsa.cloud.base.order.bean.mealManger.OpenTableManage;
 import com.gingersoft.gsa.cloud.base.table.bean.TableBean;
+import com.gingersoft.gsa.cloud.base.utils.LanguageUtils;
 import com.gingersoft.gsa.cloud.base.utils.VibratorUtils;
 import com.gingersoft.gsa.cloud.base.utils.other.SPUtils;
 import com.gingersoft.gsa.cloud.constans.FoodSummaryConstans;
@@ -44,6 +45,7 @@ import com.gingersoft.gsa.cloud.table.di.component.DaggerMealStandComponent;
 import com.gingersoft.gsa.cloud.table.mvp.contract.MealStandContract;
 import com.gingersoft.gsa.cloud.table.mvp.model.bean.SoldoutCtrFood;
 import com.gingersoft.gsa.cloud.table.mvp.model.bean.event.InitTableEvent;
+import com.gingersoft.gsa.cloud.table.mvp.presenter.BaseOrderPresenter;
 import com.gingersoft.gsa.cloud.table.mvp.presenter.MealStandPresenter;
 import com.gingersoft.gsa.cloud.table.mvp.ui.adapter.BaseFragmentAdapter;
 import com.gingersoft.gsa.cloud.table.mvp.ui.adapter.meal.FoodGroupAdapter;
@@ -62,6 +64,7 @@ import com.gingersoft.gsa.cloud.ui.recylcler.decorator.GridDividerItemDecoration
 import com.gingersoft.gsa.cloud.ui.view.PagerSlidingTabStrip;
 import com.gingersoft.gsa.cloud.ui.view.RecyclerViewNoBugLinearLayoutManager;
 import com.gingersoft.gsa.cloud.ui.view.SearchKeyBoardView;
+import com.gingersoft.gsa.cloud.ui.widget.dialog.CommonTipDialog;
 import com.gingersoft.gsa.cloud.ui.widget.dialog.LoadingDialog;
 import com.gingersoft.gsa.cloud.zxing.MipcaCaptureActivity;
 import com.jess.arms.base.BaseFragmentActivity;
@@ -741,7 +744,7 @@ public class MealStandActivity extends BaseFragmentActivity<MealStandPresenter> 
            Intent intent = new Intent(this, OrderContentActivity.class);
            startActivityForResult(intent, ORDER_CONTENT_CODE);
        } else if (id == R.id.tv_no_save_return) {
-            returnBeforeActivity(true);
+            returnTableActivity(true);
        } else if (id == R.id.btn_taste) {
            currentFinePage = 0;
            showRemarkLayout();
@@ -817,11 +820,25 @@ public class MealStandActivity extends BaseFragmentActivity<MealStandPresenter> 
    @Override
    public void onBackPressedSupport() {
-        super.onBackPressedSupport();
+//        super.onBackPressedSupport();
-        returnBeforeActivity(true);
+        returnTableActivity(true);
+    }
+    public void returnTableActivity(boolean initTable) {
+        if (!MyOrderManage.getInstance().isModifyOrder() && mPresenter.hasNesOrderFoods()) {
+            if (mPresenter.hasNesOrderFoods()) {
+                //没有过重复下单提示且有未送单食品，提示用户
+                String tip = LanguageUtils.get_language_system(this, "food.not.delivered.tip", "有食品未送單, 確認離開?");
+                Class[] parameterTypes = {boolean.class};
+                Object[] parameters = {initTable};
+                CommonTipDialog.showSurpisedDialog(this, tip, MealStandActivity.class, this,
+                        "returnBeforeActivity", parameterTypes, parameters);
+            }
+        } else {
+            returnBeforeActivity(initTable);
+        }
    }
    public void returnBeforeActivity(boolean initTable) {
        SPUtils.put(this, MealConstant.EXIT_IS_PLU_MODE, isPluMode);
        if (initTable && OpenTableManage.getDefault().getTableBean() != null && !MyOrderManage.getInstance().isModifyOrder()) {
@@ -885,7 +902,7 @@ public class MealStandActivity extends BaseFragmentActivity<MealStandPresenter> 
                    @Override
                    public void OnBackClick() {
                        recordOperat(true);
-                        returnBeforeActivity(true);
+                        returnTableActivity(true);
                    }
                });
            int backPageBtnVisibility;
@@ -912,7 +929,7 @@ public class MealStandActivity extends BaseFragmentActivity<MealStandPresenter> 
                @Override
                public void onBackPage() {
-                    returnBeforeActivity(true);
+                    returnTableActivity(true);
                }
            });
            mChooseNumberDialog.setCancelable(isNeedCancel);
@@ -1328,11 +1345,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/java/com/gingersoft/gsa/cloud/table/mvp/ui/adapter/meal/ComboAdapter.java
+++ b/table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/adapter/meal/ComboAdapter.java
@@ -158,28 +158,6 @@ public class ComboAdapter extends DefaultAdapter<ComboItem> {
        }
        private void initModifierSoldout(Modifier datasBean) {
-//            if (datasBean.isSoldout()) {
-//                iv_qty_sold.setVisibility(View.VISIBLE);
-//            } else {
-//                iv_qty_sold.setVisibility(View.INVISIBLE);
-//            }
-//            int maxNumber = datasBean.getMaxNumber();
-//            int number = datasBean.getNumber();
-//            if (number >= maxNumber) {
-//                tv_soldout.setVisibility(View.VISIBLE);
-//                tv_soldout.setText(maxNumber);
-//            } else {
-//                tv_soldout.setVisibility(View.INVISIBLE);
-//            }
-//            String qty = datasBean.getMaxNumber();
-//            if (qty.equals("")) {
-//                tv_soldout.setVisibility(View.INVISIBLE);
-//            } else {
-//                tv_soldout.setVisibility(View.VISIBLE);
-//                tv_soldout.setText(datasBean.getMaxNumber());
-//            }
            String qty = datasBean.getCurrentMaxNumber();
            if (TextUtils.isEmpty(qty)) {
                tv_soldout.setVisibility(View.INVISIBLE);
@@ -191,9 +169,6 @@ public class ComboAdapter extends DefaultAdapter<ComboItem> {
                    tv_soldout.setText(qty);
                }
            }
-            tv_soldout.setMaxHeight(soldoutModFlagHeight);
-            tv_soldout.setMinHeight(soldoutModFlagHeight);
-            tv_soldout.setTextSize(soldoutFoodFlagFontSize);
        }
        private void initComboName(ComboItem datasBean) {
@@ -206,14 +181,10 @@ public class ComboAdapter extends DefaultAdapter<ComboItem> {
        private void setSolodStatus(ComboItem datasBean) {
-            tv_soldout.setMaxHeight(soldoutModFlagHeight);
            tv_soldout.setMinHeight(soldoutModFlagHeight);
            tv_soldout.setTextSize(soldoutFoodFlagFontSize);
-//            tv_soldout.setTextColor(Color.parseColor("#000000"));
            tv_soldout.setBackgroundDrawable(mContext.getResources().getDrawable(R.drawable.meal_shape_remaining_number_bg));
-//            tv_soldout.setMinWidth(15);
+            tv_soldout.setGravity(Gravity.CENTER);
-//            tv_soldout.setTextSize(8);
-//            tv_soldout.setGravity(Gravity.CENTER);
            RelativeLayout.LayoutParams lp2 = new RelativeLayout.LayoutParams(new ViewGroup.MarginLayoutParams(60, 40));
            lp2.addRule(RelativeLayout.ALIGN_PARENT_BOTTOM);

--- a/table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/adapter/meal/FoodAdapter.java
+++ b/table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/adapter/meal/FoodAdapter.java
@@ -175,19 +175,10 @@ public class FoodAdapter extends DefaultAdapter<Food> {
        private void setStatus(Food datasBean) {
-            tv_soldout.setMaxHeight(mSoldoutFoodFlagHeight);
            tv_soldout.setMinHeight(mSoldoutFoodFlagHeight);
            tv_soldout.setTextSize(mSoldoutFoodFlagFontSize);
-//            tv_soldout.setTextColor(Color.parseColor("#000000"));
            tv_soldout.setBackgroundDrawable(mContext.getResources().getDrawable(R.drawable.meal_shape_remaining_number_bg));
-//            tv_soldout.setMinWidth(20);
+            tv_soldout.setGravity(Gravity.CENTER);
-//            tv_soldout.setTextSize(10);
-//            tv_soldout.setGravity(Gravity.CENTER);
-//            RelativeLayout.LayoutParams lp2 = new RelativeLayout.LayoutParams(new ViewGroup.MarginLayoutParams(60, 40));
-//            lp2.addRule(RelativeLayout.ALIGN_PARENT_BOTTOM);
-//            lp2.addRule(RelativeLayout.ALIGN_PARENT_LEFT);
-//            tv_soldout.setLayoutParams(lp2);
            tv_soldout.setVisibility(View.INVISIBLE);
            iv_qtySold.setVisibility(View.INVISIBLE);
@@ -239,8 +230,9 @@ public class FoodAdapter extends DefaultAdapter<Food> {
            }
            //设置当前选中item颜色
-            if (datasBean != null)
+            if (datasBean != null) {
                datasBean.setSelected(true);
+            }
            notifyDataSetChanged();
            //保存上次操作的position

--- a/table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/adapter/meal/FoodGroupAdapter.java
+++ b/table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/adapter/meal/FoodGroupAdapter.java
@@ -226,8 +226,6 @@ public class FoodGroupAdapter extends DefaultAdapter<Food> {
            String qty = datasBean.getMaxNumber();
            if (!qty.equals("")) {
-//                tv_soldout.setVisibility(View.VISIBLE);
-//                tv_soldout.setText(datasBean.getMaxNumber());
                blv_soldout.setVisibility(View.VISIBLE);
                blv_soldout.setLableText(datasBean.getMaxNumber());
            }

--- a/table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/adapter/meal/ModifierAdapter.java
+++ b/table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/adapter/meal/ModifierAdapter.java
@@ -35,6 +35,7 @@ public class ModifierAdapter extends DefaultAdapter<Modifier> {
    private int ColHeight;
    private int FontSize;
+    private int soldoutModFlagHeight;
    private int OrderNumberChildFontSize;
@@ -44,6 +45,7 @@ public class ModifierAdapter extends DefaultAdapter<Modifier> {
        ColHeight = GsaCloudApplication.uiStyleConfiguration.getModBtnHeightValue();
        FontSize = GsaCloudApplication.uiStyleConfiguration.getModFontSizeValue();
+        soldoutModFlagHeight = GsaCloudApplication.uiStyleConfiguration.getSoldoutModFlagHeightValue();
        OrderNumberChildFontSize = GsaCloudApplication.uiStyleConfiguration.getSoldoutModFlagFontSizeValue();
    }
@@ -142,17 +144,10 @@ public class ModifierAdapter extends DefaultAdapter<Modifier> {
        private void initModifierSoldout(Modifier datasBean) {
-//            String qty = datasBean.getCurrentMaxNumber();
+            tv_soldout.setMinHeight(soldoutModFlagHeight);
-//            if (qty.equals("")) {
-//                tv_soldout.setVisibility(View.INVISIBLE);
-//            } else {
-//                tv_soldout.setVisibility(View.VISIBLE);
-//                tv_soldout.setText(datasBean.getCurrentMaxNumber());
-//            }
-            tv_soldout.setBackgroundDrawable(mContext.getResources().getDrawable(R.drawable.meal_shape_remaining_number_bg));
-//            tv_soldout.setMaxHeight(OrderNumberChildShowSize);
-//            tv_soldout.setMinHeight(OrderNumberChildShowSize);
            tv_soldout.setTextSize(OrderNumberChildFontSize);
+            tv_soldout.setBackgroundDrawable(mContext.getResources().getDrawable(R.drawable.meal_shape_remaining_number_bg));
+            tv_soldout.setGravity(Gravity.CENTER);
            tv_soldout.setVisibility(View.INVISIBLE);
            iv_qty_sold.setVisibility(View.INVISIBLE);

--- 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">
@@ -565,8 +565,9 @@
                android:divider="@null"
                android:fadeScrollbars="false"
                android:orientation="vertical"
+                android:layout_below="@+id/rv_combo"
                android:visibility="visible" />
-        </LinearLayout>
+        </RelativeLayout>
    </ScrollView>
    <androidx.recyclerview.widget.RecyclerView