9.30 1、上菜紙單號為null問題

Signed-off-by: Wyh <1239658231>

9.30 1、上菜紙單號為null問題
Signed-off-by: Wyh <1239658231>
74eb1901 · Wyh · 93eb173b · 74eb1901 · 74eb1901 · 74eb1901
Commit 74eb1901 authored Sep 30, 2020 by Wyh
4 changed files
--- a/print-module/src/main/java/com/joe/print/mvp/print/PrintBill.java
+++ b/print-module/src/main/java/com/joe/print/mvp/print/PrintBill.java
@@ -12,6 +12,7 @@ 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.RestaurantExpandInfoUtils;
+import com.gingersoft.gsa.cloud.base.utils.other.TextUtil;
 import com.gingersoft.gsa.cloud.base.utils.time.TimeUtils;
 import com.gingersoft.gsa.cloud.constans.ExpandConstant;
 import com.gingersoft.gsa.cloud.database.bean.PrinterDeviceBean;
@@ -60,9 +61,11 @@ public class PrintBill extends PrinterRoot {
        //訂單信息
        String tableName = "餐檯：" + tableBean.getTableName();
        String peopleNum = "人數：" + OpenTableManage.getDefault().getPeopleNumber();
-        String orderNum = MyOrderManage.getInstance().getOrderNo();
+        String orderNum = "單號：";
+        if (TextUtil.isNotEmptyOrNullOrUndefined(MyOrderManage.getInstance().getOrderNo())) {
-        String createTime = TimeUtils.parseTimeRepeat(tableBean.getCreateTime(), TimeUtils.DEFAULT_DATE_FORMAT);
+            orderNum = "單號：" + MyOrderManage.getInstance().getOrderNo();
+        }
+        String createTime = "日期：" + TimeUtils.parseTimeRepeat(tableBean.getCreateTime(), TimeUtils.DEFAULT_DATE_FORMAT);
        layout.addView(getDiningTableOrderInfo(mContext, tableName, peopleNum, orderNum, createTime));
        layout.addView(getLine(mContext));

--- a/print-module/src/main/java/com/joe/print/mvp/print/PrintServe.java
+++ b/print-module/src/main/java/com/joe/print/mvp/print/PrintServe.java
@@ -17,6 +17,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.other.TextUtil;
 import com.gingersoft.gsa.cloud.base.utils.time.TimeUtils;
 import com.gingersoft.gsa.cloud.database.bean.PrinterDeviceBean;
 import com.joe.print.R;
@@ -127,9 +128,12 @@ public class PrintServe extends PrinterRoot {
        //訂單頭
        layout.addView(getHeader(mContext));
        layout.addView(getLine(mContext));
+        String orderNo = "單號：";
+        if (TextUtil.isNotEmptyOrNullOrUndefined(MyOrderManage.getInstance().getOrderNo())) {
+            orderNo = "單號：" + MyOrderManage.getInstance().getOrderNo();
+        }
        //訂單信息
-        layout.addView(getDiningTableOrderInfo(mContext, "餐檯：" + tableBean.getTableName(), "人數：" + OpenTableManage.getDefault().getPeopleNumber(), "單號：" + MyOrderManage.getInstance().getOrderNo(), "日期：" + TimeUtils.getCurrentTimeInString(TimeUtils.DEFAULT_DATE_FORMAT)));
+        layout.addView(getDiningTableOrderInfo(mContext, "餐檯：" + tableBean.getTableName(), "人數：" + OpenTableManage.getDefault().getPeopleNumber(), orderNo, "日期：" + TimeUtils.getCurrentTimeInString(TimeUtils.DEFAULT_DATE_FORMAT)));
        layout.addView(getLine(mContext));
        layout.addView(getDiningFoodList(mContext, foodList, printerDeviceBean, 0, false));

--- a/print-module/src/main/java/com/joe/print/mvp/ui/adapter/KitChenPrjPrintFoodAdapter.java
+++ b/print-module/src/main/java/com/joe/print/mvp/ui/adapter/KitChenPrjPrintFoodAdapter.java
@@ -52,7 +52,6 @@ public class KitChenPrjPrintFoodAdapter extends BaseQuickAdapter<PrjBean.DataBea
        String[] languageTypes = printerDeviceBean.getLanguageType().split(",");
        LinearLayout layout = helper.getView(R.id.layout_print_kitchen_parent);
        for (String type : languageTypes) {
            String languageType = type;
            if (languageType.contains(".")) {
                languageType = type.substring(0, type.indexOf("."));

--- a/table-module/src/main/java/com/gingersoft/gsa/cloud/bean/mvp/presenter/MealStandPresenter.java
+++ b/table-module/src/main/java/com/gingersoft/gsa/cloud/bean/mvp/presenter/MealStandPresenter.java
@@ -43,6 +43,7 @@ import com.gingersoft.gsa.cloud.database.bean.Modifier;
 import com.gingersoft.gsa.cloud.database.utils.FoodDaoUtils;
 import com.gingersoft.gsa.cloud.database.utils.ModifierDaoUtils;
 import com.gingersoft.gsa.cloud.ui.widget.dialog.CommonTipDialog;
+import com.google.gson.internal.LinkedTreeMap;
 import com.jess.arms.base.DefaultAdapter;
 import com.jess.arms.di.scope.ActivityScope;
 import com.jess.arms.http.imageloader.ImageLoader;
@@ -108,18 +109,28 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod
    private ComboAdapter mComboAdapter;
    private ModifierAdapter mModifierAdapter;
    private DiscountAdapter mDiscountAdapter;
-    /**食品数据*/
+    /**
+     * 食品数据
+     */
    private List<Food> mFoodGroupList = new ArrayList<>();
-    /**當前食品組下食品*/
+    /**
+     * 當前食品組下食品
+     */
    private List<Food> mFoodList = new ArrayList<>();
-    /**套餐细项数据*/
+    /**
+     * 套餐细项数据
+     */
    private List<ComboItem> mFoodComboList = new ArrayList<>();
    private List<Modifier> mModifierList = new ArrayList<>();
-    /**折扣数据*/
+    /**
+     * 折扣数据
+     */
    private List<Discount> mDiscountList = new ArrayList<>();
-    /**沽清食品數據*/
+    /**
+     * 沽清食品數據
+     */
    private List<SoldoutCtrFood> mSoldoutCtrList = new ArrayList<>();
    private boolean RvMealClicked;
@@ -788,7 +799,21 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod
                        if (info != null && info.isSuccess()) {
                            saveCreateTime(info.getSysTime());
                            if (info.getData() != null) {
-                                setOrderId((Double) info.getData());
+                                if (info.getData() instanceof Double) {
+                                    //未上線，避免正式版閃退
+                                    setOrderId((Double) info.getData());
+                                    MyOrderManage.getInstance().getOrderBean().setOrderNo(((Double) info.getData()).longValue() + "");
+                                } else {
+                                    LinkedTreeMap tm = (LinkedTreeMap) info.getData();
+                                    for (Object o : tm.keySet()) {
+                                        String key = (String) o;
+                                        if (key.equals("id")) {
+                                            setOrderId((Double) tm.get(key));
+                                        } else if (key.equals("orderNo")) {
+                                            MyOrderManage.getInstance().getOrderBean().setOrderNo((String) tm.get(key));
+                                        }
+                                    }
+                                }
                            }
                            mRootView.showMessage("送單成功");
                            MyOrderManage.getInstance().setNewFoodList(getOrderFoodLists());
@@ -849,6 +874,7 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod
                    .callAsyncCallbackOnMainThread((cc, result) -> {
                        if (result.isSuccess()) {
                        } else {
                            mRootView.showMessage("打印失敗");
                        }
                        //打印成功