餐廳庫擴類拆分

base-module/src/main/java/com/gingersoft/gsa/cloud/base/Api.java

@@ -34,4 +34,11 @@ public interface Api {
     String upload_app_log = "public/cloud/gsa/upload";
     //獲取顏色表數據
     String color_list = "food/getColorList";
+
+
+    //添加餐廳基表配置
+    String add_restaurant_base_table_configuration = "restaurantBase/add";
+    //同步基表配置到餐廳擴展表
+    String sync_restaurant_base_table_configuration = "restaurantBase/syncConfig";
+
 }

base-module/src/main/java/com/gingersoft/gsa/cloud/base/application/GsaCloudApplication.java

@@ -30,13 +30,14 @@ import com.gingersoft.gsa.cloud.base.utils.crash.AppCrashHandler;
 import com.gingersoft.gsa.cloud.base.utils.log.LogUtil;
 import com.gingersoft.gsa.cloud.base.utils.other.SPUtils;
 import com.gingersoft.gsa.cloud.base.utils.xlog.MyBackupStrategy;
+import com.gingersoft.gsa.cloud.bean.expandInfo.FunctionExtendedConfiguration;
+import com.gingersoft.gsa.cloud.bean.expandInfo.UIStyleExtendedConfiguration;
 import com.gingersoft.gsa.cloud.constans.HttpsConstans;
 import com.gingersoft.gsa.cloud.constans.PrintConstans;
 import com.gingersoft.gsa.cloud.constans.UserConstans;
 import com.gingersoft.gsa.cloud.database.DaoManager;
 import com.gingersoft.gsa.cloud.database.bean.ExpandInfo;
 import com.gingersoft.gsa.cloud.database.utils.ExpandInfoDaoUtils;
-import com.gingersoft.gsa.cloud.bean.RestaurantExpandInfo;
 import com.hyweb.n5.lib.exception.NoInitPrinterException;
 import com.hyweb.n5.lib.util.PrinterUtil;
 import com.jess.arms.base.BaseApplication;
@@ -67,9 +68,8 @@ public class GsaCloudApplication extends BaseApplication {
     private static GsaCloudApplication mAppContext;
     private Activity mCurrentActivity;
 
-    public static RestaurantExpandInfo androidSetting;
-    public static RestaurantExpandInfo.UIStyleConfiguration uiStyleConfiguration;
-    public static RestaurantExpandInfo.FunctionConfiguration functionConfiguration;
+    public static UIStyleExtendedConfiguration uiStyleConfiguration;
+    public static FunctionExtendedConfiguration functionConfiguration;
     /**
      * 是否開啟皮膚切換
      */
@@ -129,9 +129,8 @@ public class GsaCloudApplication extends BaseApplication {
         //初始化crash記錄
         AppCrashHandler.getInstance().init(this);
 
-        androidSetting = new RestaurantExpandInfo();
-        uiStyleConfiguration = new RestaurantExpandInfo.UIStyleConfiguration();
-        functionConfiguration = new RestaurantExpandInfo.FunctionConfiguration();
+        uiStyleConfiguration = new UIStyleExtendedConfiguration();
+        functionConfiguration = new FunctionExtendedConfiguration();
         isLogin = (boolean) SPUtils.get(this, PrintConstans.IS_LOGIN, false);
 
         initExpandInfo();

base-module/src/main/java/com/gingersoft/gsa/cloud/base/utils/RestaurantExpandInfoUtils.java

@@ -3,7 +3,8 @@ package com.gingersoft.gsa.cloud.base.utils;
 import android.text.TextUtils;
 
 import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication;
-import com.gingersoft.gsa.cloud.bean.RestaurantExpandInfo;
+import com.gingersoft.gsa.cloud.bean.expandInfo.FunctionExtendedConfiguration;
+import com.gingersoft.gsa.cloud.bean.expandInfo.UIStyleExtendedConfiguration;
 import com.gingersoft.gsa.cloud.constans.ExpandConstant;
 import com.gingersoft.gsa.cloud.database.bean.ExpandInfo;
 
@@ -91,7 +92,7 @@ public class RestaurantExpandInfoUtils {
             }
         }
 
-        RestaurantExpandInfo.UIStyleConfiguration uiStyleConfiguration = GsaCloudApplication.uiStyleConfiguration;
+        UIStyleExtendedConfiguration uiStyleConfiguration = GsaCloudApplication.uiStyleConfiguration;
         Field uiFields[] = uiStyleConfiguration.getClass().getDeclaredFields();
         for (Field field : uiFields) {
             String expandinfoName = field.getName();
@@ -114,7 +115,7 @@ public class RestaurantExpandInfoUtils {
             }
         }
 
-        RestaurantExpandInfo.FunctionConfiguration functionConfiguration = GsaCloudApplication.functionConfiguration;
+        FunctionExtendedConfiguration functionConfiguration = GsaCloudApplication.functionConfiguration;
         Field functionFields[] = functionConfiguration.getClass().getDeclaredFields();
         for (Field field : functionFields) {
             String expandinfoName = field.getName();

base-module/src/main/java/com/gingersoft/gsa/cloud/bean/expandInfo/ExpandInfoSetting.java

+package com.gingersoft.gsa.cloud.bean.expandInfo;
+
+import lombok.Builder;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @author : bin
+ * @create date: 2020-10-20
+ * @update date: 2020-10-20
+ * @description:
+ */
+
+@Builder
+@Getter
+@Setter
+public class ExpandInfoSetting{
+    private String settingName;
+    private int valueInt;
+    private String valueChar;
+    private boolean valueBoolean;
+    private String valueDateTime;
+    private String valueDateTime2;
+    /**
+     * 數據類型 1：整形，2：字符型，3：布爾型，4：日期類型
+     */
+    private byte dataType;
+    private int sort;
+    private String showName;
+    private String remark;
+}
+

base-module/src/main/java/com/gingersoft/gsa/cloud/bean/expandInfo/FunctionExtendedConfiguration.java

+package com.gingersoft.gsa.cloud.bean.expandInfo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @author : bin
+ * @create date: 2020-10-20
+ * @update date: 2020-10-20
+ * @description:功能擴展配置類（如印單打印次數，是否合併食品）
+ */
+@Getter
+@Setter
+public class FunctionExtendedConfiguration {
+
+    private ExpandInfoSetting Rounding = ExpandInfoSetting.builder()
+            .settingName("Rounding")
+            .valueInt(0)
+            .dataType((byte) 1)
+            .showName("Rounding")
+            .remark("賬單小數相關")
+            .build();
+
+    private ExpandInfoSetting RoundingDecimal = ExpandInfoSetting.builder()
+            .settingName("RoundingDecimal")
+            .valueInt(0)
+            .dataType((byte) 1)
+            .showName("RoundingDecimal")
+            .remark("賬單小數相關")
+            .build();
+
+    private ExpandInfoSetting ItemDecimals = ExpandInfoSetting.builder()
+            .settingName("ItemDecimals")
+            .valueInt(0)
+            .dataType((byte) 1)
+            .showName("ItemDecimals")
+            .remark("小數位金額")
+            .build();
+
+    private ExpandInfoSetting DeliveryPrintCount = ExpandInfoSetting.builder()
+            .settingName("DeliveryPrintCount")
+            .valueInt(0)
+            .dataType((byte) 1)
+            .showName("DeliveryPrintCount")
+            .remark("外送印單打印次數")
+            .build();
+
+    private ExpandInfoSetting DeliveryClosingPC = ExpandInfoSetting.builder()
+            .settingName("DeliveryClosingPC")
+            .valueInt(0)
+            .dataType((byte) 1)
+            .showName("DeliveryClosingPC")
+            .remark("外送結賬打印次數")
+            .build();
+
+    private ExpandInfoSetting TableModePrintCount = ExpandInfoSetting.builder()
+            .settingName("TableModePrintCount")
+            .valueInt(0)
+            .dataType((byte) 1)
+            .showName("TableModePrintCount")
+            .remark("餐檯印單打印次數")
+            .build();
+
+    private ExpandInfoSetting TableModeClosingPC = ExpandInfoSetting.builder()
+            .settingName("TableModeClosingPC")
+            .valueInt(0)
+            .dataType((byte) 1)
+            .showName("TableModeClosingPC")
+            .remark("餐檯模式結賬單打印次數")
+            .build();
+
+    private ExpandInfoSetting OrderReceivingTimeout = ExpandInfoSetting.builder()
+            .settingName("OrderReceivingTimeout")
+            .valueInt(0)
+            .dataType((byte) 1)
+            .showName("OrderReceivingTimeout")
+            .remark("外送接單超時時間")
+            .build();
+
+    private ExpandInfoSetting PrintMemberInfo = ExpandInfoSetting.builder()
+            .settingName("PrintMemberInfo")
+            .valueInt(0)
+            .dataType((byte) 1)
+            .showName("PrintMemberInfo")
+            .remark("是否打印會員信息")
+            .build();
+
+    private ExpandInfoSetting PrintPage = ExpandInfoSetting.builder()
+            .settingName("PrintPage")
+            .valueInt(0)
+            .dataType((byte) 1)
+            .showName("PrintPage")
+            .remark("是否打印頁數")
+            .build();
+
+    private ExpandInfoSetting PrintMergerFood = ExpandInfoSetting.builder()
+            .settingName("PrintMergerFood")
+            .valueInt(0)
+            .dataType((byte) 1)
+            .showName("PrintMergerFood")
+            .remark("是否合併食品")
+            .build();
+
+    private ExpandInfoSetting PrintStatisticsAmount = ExpandInfoSetting.builder()
+            .settingName("PrintStatisticsAmount")
+            .valueInt(0)
+            .dataType((byte) 1)
+            .showName("PrintStatisticsAmount")
+            .remark("是否顯示統計打印數")
+            .build();
+
+    private ExpandInfoSetting PrintFirstOrder = ExpandInfoSetting.builder()
+            .settingName("PrintFirstOrder")
+            .valueInt(0)
+            .dataType((byte) 1)
+            .showName("PrintFirstOrder")
+            .remark("是否打印\"頭單\"文字")
+            .build();
+
+    private ExpandInfoSetting FrozenChainAutoOrder = ExpandInfoSetting.builder()
+            .settingName("FrozenChainAutoOrder")
+            .valueInt(0)
+            .dataType((byte) 1)
+            .showName("FrozenChainAutoOrder")
+            .remark("是否自動接單 為0true")
+            .build();
+
+    private ExpandInfoSetting MergeSendFood = ExpandInfoSetting.builder()
+            .settingName("MergeSendFood")
+            .valueInt(0)
+            .dataType((byte) 1)
+            .showName("MergeSendFood")
+            .remark("送單是否自動合併食品")
+            .build();
+
+    private ExpandInfoSetting AutoPrinterPaper = ExpandInfoSetting.builder()
+            .settingName("AutoPrinterPaper")
+            .valueInt(0)
+            .dataType((byte) 1)
+            .showName("AutoPrinterPaper")
+            .remark("送單自動打印上菜紙")
+            .build();
+
+    private ExpandInfoSetting ToPrintQRCode = ExpandInfoSetting.builder()
+            .settingName("ToPrintQRCode")
+            .valueInt(0)
+            .dataType((byte) 1)
+            .showName("ToPrintQRCode")
+            .remark("結賬是否打印積分二維碼")
+            .build();
+
+    private ExpandInfoSetting AutoQuitTime = ExpandInfoSetting.builder()
+            .settingName("AutoQuitTime")
+            .valueInt(600)
+            .dataType((byte) 1)
+            .showName("AutoQuitTime")
+            .remark("餐檯模式下單頁多少秒不操作返回餐檯頁面")
+            .build();
+
+    private int DeliveryPrintCount;//外送印單打印次數
+    private int DeliveryClosingPC;//外送結賬打印次數
+    private int TableModePrintCount;//餐檯印單打印次數
+    private int TableModeClosingPC;//餐檯模式結賬單打印次數
+    private int OrderReceivingTimeout;//外送接單超時時間
+    private int PrintMemberInfo;//是否打印會員信息
+    private int PrintPage;//是否打印頁數
+    private int PrintMergerFood;//是否合併食品
+    private int PrintStatisticsAmount;//是否顯示統計打印數
+    private int PrintFirstOrder;//是否打印"頭單"文字
+    private int FrozenChainAutoOrder;//是否自動接單 為0true
+
+    private int MergeSendFood;//送單是否自動合併食品
+    private int AutoPrinterPaper;//送單自動打印上菜紙
+    private int ToPrintQRCode;//結賬是否打印積分二維碼
+    private int AutoQuitTime = 600;//餐檯模式下單頁多少秒不操作返回餐檯頁面
+
+
+}

base-module/src/main/java/com/gingersoft/gsa/cloud/bean/expandInfo/UIStyleExtendedConfiguration.java

+package com.gingersoft.gsa.cloud.bean.expandInfo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @author : bin
+ * @create date: 2020-10-20
+ * @update date: 2020-10-20
+ * @description:頁面樣式擴展配置類
+ */
+@Getter
+@Setter
+public class UIStyleExtendedConfiguration {
+
+    /**
+     * 食品組、食品、細項、折扣行列寬高
+     */
+    private int foodGroupRow = 2;
+    private int foodGroupColumn = 5;
+    private int foodColumn = 4;
+    private int comboColumn = 4;
+    private int modColumn = 4;
+    private int discountColumn = 4;
+    /**
+     * 食品組、食品、細項、折扣Item高度
+     */
+    private int foodGroupBtnHeight = 150;
+    private int foodBtnHeight = 120;
+    private int modBtnHeight = 80;
+    private int comboHeight = 90;
+    private int discountHeight = 80;
+
+    private int LayoutQtyHeight = 40;
+    /**
+     * 食品組、食品、細項、折扣字體大小
+     */
+    private int foodGroupFontSize = 14;
+    private int foodFontSize = 14;
+    private int comboFontSize = 12;
+    private int modFontSize = 12;
+    private int discountFontSize = 12;
+
+    private int OrderNumberShowSize = 20;
+    private int OrderNumberFontSize = 7;
+    private int OrderNumberChildShowSize = 20;
+    private int OrderNumberChildFontSize = 10;
+
+    //估清控制食品字體大小
+    private int soldoutCtrlFoodFontSize = 16;
+
+
+}