Skip to content

S
supplier
Commit 183a3d74 by 宁斌
Options

1、相同食品主食品數量合併

parent 67a1c0bc
Showing with 789 additions and 1742 deletions
base-module/src/main/java/com/gingersoft/gsa/cloud/base/application/GsaCloudApplication.java
...@@ -22,6 +22,7 @@ import com.elvishew.xlog.printer.file.clean.FileLastModifiedCleanStrategy; ...@@ -22,6 +22,7 @@ import com.elvishew.xlog.printer.file.clean.FileLastModifiedCleanStrategy;
import com.elvishew.xlog.printer.file.naming.DateFileNameGenerator; import com.elvishew.xlog.printer.file.naming.DateFileNameGenerator;
import com.gingersoft.gsa.cloud.base.BuildConfig; import com.gingersoft.gsa.cloud.base.BuildConfig;
import com.gingersoft.gsa.cloud.base.R; import com.gingersoft.gsa.cloud.base.R;
import com.gingersoft.gsa.cloud.base.common.bean.RestaurantExpandInfo;
import com.gingersoft.gsa.cloud.base.utils.AidlUtil; import com.gingersoft.gsa.cloud.base.utils.AidlUtil;
import com.gingersoft.gsa.cloud.base.utils.crash.AppCrashHandler; import com.gingersoft.gsa.cloud.base.utils.crash.AppCrashHandler;
import com.gingersoft.gsa.cloud.base.utils.file.FileUtils; import com.gingersoft.gsa.cloud.base.utils.file.FileUtils;
...@@ -58,6 +59,10 @@ public class GsaCloudApplication extends BaseApplication { ...@@ -58,6 +59,10 @@ public class GsaCloudApplication extends BaseApplication {
private static GsaCloudApplication mAppContext; private static GsaCloudApplication mAppContext;
private Activity mCurrentActivity; private Activity mCurrentActivity;
/**餐廳擴展信息*/
public static RestaurantExpandInfo restaurantExpandInfo;
public static FunctionStyleUtils androidSetting;
/**是否開啟皮膚切換*/ /**是否開啟皮膚切換*/
public static boolean openSkinMake = false; public static boolean openSkinMake = false;
/** /**
...@@ -66,7 +71,6 @@ public class GsaCloudApplication extends BaseApplication { ...@@ -66,7 +71,6 @@ public class GsaCloudApplication extends BaseApplication {
public static int REQUEST_TIMEOUT = 15; public static int REQUEST_TIMEOUT = 15;
public static boolean isLogin = false; public static boolean isLogin = false;
public static FunctionStyleUtils androidSetting;
public static String userName = ""; public static String userName = "";
/** /**
* 商米:V2、V2_PRO N5:N5 * 商米:V2、V2_PRO N5:N5
......
base-module/src/main/java/com/gingersoft/gsa/cloud/base/common/bean/OrderPayRequest.java
...@@ -23,6 +23,7 @@ public class OrderPayRequest { ...@@ -23,6 +23,7 @@ public class OrderPayRequest {
private long orderId; private long orderId;
private int linePayType; private int linePayType;
private int orderPayType; private int orderPayType;
private String tableNumber;
private List<orderPay> orderPays = new ArrayList<>(); private List<orderPay> orderPays = new ArrayList<>();
@Data @Data
......
base-module/src/main/java/com/gingersoft/gsa/cloud/base/common/bean/RestaurantExpandInfo.java 0 → 100644
package com.gingersoft.gsa.cloud.base.common.bean;
import lombok.Data;
/**
* 作者：ELEGANT_BIN
* 版本：1.6.0
* 创建日期：2020-07-28
* 修订历史：2020-07-28
* 描述：
*/
@Data
public class RestaurantExpandInfo {
}
base-module/src/main/java/com/gingersoft/gsa/cloud/base/common/bean/RestaurantExpandInfoUtils.java
package com.gingersoft.gsa.cloud.base.common.bean; package com.gingersoft.gsa.cloud.base.common.bean;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication;
import com.gingersoft.gsa.cloud.base.utils.MoneyUtil; import com.gingersoft.gsa.cloud.base.utils.MoneyUtil;
import com.gingersoft.gsa.cloud.database.bean.ExpandInfo; import com.gingersoft.gsa.cloud.database.bean.ExpandInfo;
...@@ -17,9 +18,10 @@ public class RestaurantExpandInfoUtils { ...@@ -17,9 +18,10 @@ public class RestaurantExpandInfoUtils {
/** /**
* 保存常用信息 * 保存常用信息
*
* @param expandInfoList * @param expandInfoList
*/ */
public static void setCommonExpandInfo(List<ExpandInfo> expandInfoList){ public static void setCommonExpandInfo(List<ExpandInfo> expandInfoList) {
for (ExpandInfo expandInfo : expandInfoList) { for (ExpandInfo expandInfo : expandInfoList) {
if (expandInfo.getSettingName().equals("Rounding")) { if (expandInfo.getSettingName().equals("Rounding")) {
MoneyUtil.rounding = expandInfo.getValueInt(); MoneyUtil.rounding = expandInfo.getValueInt();
...@@ -30,10 +32,12 @@ public class RestaurantExpandInfoUtils { ...@@ -30,10 +32,12 @@ public class RestaurantExpandInfoUtils {
if (expandInfo.getSettingName().equals("ItemDecimals")) { if (expandInfo.getSettingName().equals("ItemDecimals")) {
MoneyUtil.ItemDecimals = expandInfo.getValueInt(); MoneyUtil.ItemDecimals = expandInfo.getValueInt();
} }
if (expandInfo.getSettingName().equals("MergeSendFood")) {
GsaCloudApplication.androidSetting.setMergeSendFood(Boolean.parseBoolean(expandInfo.getValueChar()));
}
} }
} }
} }
base-module/src/main/java/com/gingersoft/gsa/cloud/base/common/bean/TableBean.java
...@@ -2,6 +2,8 @@ package com.gingersoft.gsa.cloud.base.common.bean; ...@@ -2,6 +2,8 @@ package com.gingersoft.gsa.cloud.base.common.bean;
import java.util.List; import java.util.List;
import lombok.Data;
/** /**
* 作者：ELEGANT_BIN * 作者：ELEGANT_BIN
* 版本：1.6.0 * 版本：1.6.0
...@@ -55,6 +57,7 @@ public class TableBean { ...@@ -55,6 +57,7 @@ public class TableBean {
this.data = data; this.data = data;
} }
@Data
public static class DataBean { public static class DataBean {
/** /**
* id : 25839 * id : 25839
...@@ -77,15 +80,19 @@ public class TableBean { ...@@ -77,15 +80,19 @@ public class TableBean {
* maxSeatCount : 8 * maxSeatCount : 8
*/ */
private int id; private long id;
private String tableName; private String tableName;
private int restaurantId; private int restaurantId;
private Long orderId; private Long orderId;
private String qrCode; private String qrCode;
private int seatCount; private int seatCount;
/**最大就餐人數*/ /**
* 最大就餐人數
*/
private Integer maxSeatCount; private Integer maxSeatCount;
/**最小就餐人數*/ /**
* 最小就餐人數
*/
private Integer minSeatCount; private Integer minSeatCount;
private String createTime; private String createTime;
private String createBy; private String createBy;
...@@ -98,6 +105,7 @@ public class TableBean { ...@@ -98,6 +105,7 @@ public class TableBean {
* 已開檯 1 * 已開檯 1
* 已送單 2 * 已送單 2
* 已印单 3 * 已印单 3
* 已分檯 4
*/ */
private int status; private int status;
/** /**
...@@ -106,8 +114,8 @@ public class TableBean { ...@@ -106,8 +114,8 @@ public class TableBean {
private int person; private int person;
/** /**
* 使用狀態: * 使用狀態:
* 未使用 0 * 未使用 0
* 已使用 1 * 已使用 1
*/ */
private int useStatus; private int useStatus;
/** /**
...@@ -115,12 +123,17 @@ public class TableBean { ...@@ -115,12 +123,17 @@ public class TableBean {
*/ */
private int sort; private int sort;
/** /**
0#堂食 * 0#堂食
1#外賣 * 1#外賣
2#自取 * 2#自取
*/ */
private int type; private int type;
/**
* 分檯编号
*/
private String tableNumber;
public DataBean() { public DataBean() {
} }
...@@ -145,158 +158,23 @@ public class TableBean { ...@@ -145,158 +158,23 @@ public class TableBean {
this.useStatus = dataBean.useStatus; this.useStatus = dataBean.useStatus;
this.sort = dataBean.sort; this.sort = dataBean.sort;
this.type = dataBean.type; this.type = dataBean.type;
this.tableNumber = dataBean.tableNumber;
} }
public int getPerson() { }
return person;
}
public void setPerson(int person) {
this.person = person;
}
public int getUseStatus() {
return useStatus;
}
public void setUseStatus(int useStatus) {
this.useStatus = useStatus;
}
public int getId() {
return id;
}
public void setId(int id) {
this.id = id;
}
public String getTableName() {
return tableName;
}
public void setTableName(String tableName) {
this.tableName = tableName;
}
public Long getOrderId() {
return orderId;
}
public void setOrderId(Long orderId) {
this.orderId = orderId;
}
public int getRestaurantId() {
return restaurantId;
}
public void setRestaurantId(int restaurantId) {
this.restaurantId = restaurantId;
}
public String getQrCode() {
return qrCode;
}
public void setQrCode(String qrCode) {
this.qrCode = qrCode;
}
public int getSeatCount() {
return seatCount;
}
public void setSeatCount(int seatCount) {
this.seatCount = seatCount;
}
public Integer getMaxSeatCount() {
return maxSeatCount;
}
public void setMaxSeatCount(Integer maxSeatCount) {
this.maxSeatCount = maxSeatCount;
}
public Integer getMinSeatCount() {
return minSeatCount;
}
public void setMinSeatCount(Integer minSeatCount) {
this.minSeatCount = minSeatCount;
}
public String getCreateTime() {
return createTime;
}
public void setCreateTime(String createTime) {
this.createTime = createTime;
}
public String getCreateBy() {
return createBy;
}
public void setCreateBy(String createBy) {
this.createBy = createBy;
}
public String getQrCodeImg() {
return qrCodeImg;
}
public void setQrCodeImg(String qrCodeImg) {
this.qrCodeImg = qrCodeImg;
}
public int getPosTableId() {
return posTableId;
}
public void setPosTableId(int posTableId) {
this.posTableId = posTableId;
}
public long getServiceCharge() {
return serviceCharge;
}
public void setServiceCharge(long serviceCharge) {
this.serviceCharge = serviceCharge;
}
public long getMemberId() {
return memberId;
}
public void setMemberId(long memberId) {
this.memberId = memberId;
}
public int getStatus() {
return status;
}
public void setStatus(int status) {
this.status = status;
}
public int getSort() {
return sort;
}
public void setSort(int sort) {
this.sort = sort;
}
public int getType() {
return type;
}
public void setType(int type) { public static TableBean.DataBean splitTableTransformTable(TableBean.DataBean mainTable, TableExtBean.DataBean dataBean) {
this.type = type; TableBean.DataBean tableBean = new TableBean.DataBean();
} tableBean.setId(dataBean.getId());
tableBean.setTableName(mainTable.getTableName() + "-" + dataBean.getTableNumber());
tableBean.setOrderId(dataBean.getOrderId());
// tableBean.setRestaurantId();
// tableBean.setQrCode();
// tableBean.setQrCodeImg();
// tableBean.setSeatCount();
// tableBean.setMaxSeatCount();
tableBean.setStatus(dataBean.getTableStatus());
tableBean.setUseStatus(dataBean.getInUse());
return tableBean;
} }
} }
base-module/src/main/java/com/gingersoft/gsa/cloud/base/common/bean/TableExtBean.java 0 → 100644
package com.gingersoft.gsa.cloud.base.common.bean;
import java.util.List;
import lombok.Data;
/**
* 作者：ELEGANT_BIN
* 版本：1.6.0
* 创建日期：2020-07-29
* 修订历史：2020-07-29
* 描述：
*/
@Data
public class TableExtBean {
private TableBean.DataBean restaurantTable;
private List<DataBean> restaurantTableExtList;
@Data
public static class DataBean{
private long id;
private long tableId;
private long orderId;
private int inUse;
private int tableStatus;
private long updateTime;
private long createTime;
private String deviceName;
private String tableNumber;
}
}
base-module/src/main/java/com/gingersoft/gsa/cloud/function/FunctionStyleUtils.java
...@@ -9,6 +9,8 @@ import com.jess.arms.utils.DeviceUtils; ...@@ -9,6 +9,8 @@ import com.jess.arms.utils.DeviceUtils;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;
import lombok.Data;
/** /**
* 作者：ELEGANT_BIN * 作者：ELEGANT_BIN
* 版本：1.6.0 * 版本：1.6.0
...@@ -16,7 +18,7 @@ import java.util.Set; ...@@ -16,7 +18,7 @@ import java.util.Set;
* 修订历史：2018/8/11 * 修订历史：2018/8/11
* 描述： * 描述：
*/ */
@Data
public class FunctionStyleUtils { public class FunctionStyleUtils {
private int ID; private int ID;
...@@ -110,136 +112,11 @@ public class FunctionStyleUtils { ...@@ -110,136 +112,11 @@ public class FunctionStyleUtils {
private int OrderNumberFontSize = 7; private int OrderNumberFontSize = 7;
private int OrderNumberChildShowSize = 20; private int OrderNumberChildShowSize = 20;
private int OrderNumberChildFontSize = 10; private int OrderNumberChildFontSize = 10;
private int ShowPluPad = 0;
//两次点击按钮之间的点击间隔不能少于200毫秒，防止快速点击食品导致不同步问题
private int ClickInterval = 200;
//套餐食品名稱最大長度，超出已....結尾
private int ComboNeedOmitLength = 18;
/**
* 暫存
*/
//組最大數
private int MealTemporay_GroupMaxCount = 4;
//每個組最大數，超出省略
private int MealTemporay_ItemMaxCount = 6;
//暫存食品文字大小
private int MealTemporay_TextSize = 14;
//超出最大顯示數后,標識省略文字
private String MealTemporay_OmittedText = "......";
//顯示結賬按鈕
private boolean ShowPayFunction = true;
//显示IP弹窗密码，在已输入IP时需要输入密码
private String IPLockPassword = "888888";
//當點擊上菜紙, 重置檯號, 轉檯 True=與現時一樣, 讀取數據庫(默認true) False=不讀數據庫, 直接讀取現時介面的檯號
private boolean TableLoadServerData = true;
//主iis是否正常
private boolean mainNotRead = false;
//备份IIS的地址
private String backIIS = "";
private String OrderBottomFunction = "Quit;BillDetails;send";
private boolean MenuUpdateAutoAlert = true;
private boolean UseSystemScan = false;
private String MemberInputMethod = "Phone,Scan";
private int waitconnetiontime = 20;
//是否显示锁屏按钮
private boolean ShowLockScreenButton = true;
//休眠多少時間锁屏（秒）
private int LockScreenChronometerTime = 60;
//鎖屏亮度
private int LockScreenBrightness = 0;
//自動打印上菜紙AllItem=所有食品,NewItem=新食品
private String SendAutoPrintFoodList = "AllItem";
//新加字段
private int TableTextSize = 38;
private boolean SpliteTableAutoBack = true;
private boolean PaperPrintAutoBack = true;
private boolean RestTableAutoBack = true;
private boolean MoveTableAutoBack = true;
/**
* QR檯标识配置
*/
private String QRTable_FlagText = "S";
private int QRTable_FlagTextSize = 16;
private String QRTable_FlagTextColor = "#FFFFFF";
private String QRTable_FlagTextBackGroup = "#f57c00";
private int QRTable_FlagWith = 25;
private int QRTable_FlagHeight = 25;
/**
* 手持设备相关
*/
//打印QRCode大小
private int QR_Size = 5;
private String QR_DeliveryMinute = "00,15,30,45"; //生成QRCode交台时间（分）{使用逗号分隔}
private int QR_DeliveryLaterDefault = 120; //生成QRCode交台时间默认往后推多久(默认2小时 120分钟)
private int QR_SummaryIndexDefault = 0; //默认选中第一个餐种
//打印QRCode頭部、底部字体大小
private int QRBill_TopMsgTextSize = 24;
private int QRBill_NoteTextSize = 24;
//是否Skyorder 模式(SkyorderLock=Y此時手機skyorder長期紅燈著亮是處於skyorder模式 點選台號→人數(人數鍵盤需要調整直接1~20人數不用按√確認)→直接打印QR小票)
private String SkyorderLock = "N";
/**
* 印单字体大小
*/
//订单信息（单号、人数...）
private int PrintOrderInfo_TextSize = 24;
//食品
private int PrintOrderFood_TextSize = 26;
//金额（总金额、服務費）
private int PrintOrderMoney_TextSize = 26;
//会员信息
private int PrintMemberInfo_TextSize = 24;
/**
* 使用机器名配置相关功能开关，使用逗号分隔机器名（默认：N 所有机器）
*/
//使用外部打印机打印 (印单、上菜纸、送单自動打印上菜紙)
private String UseExternalPrintByMachineName = "";
//手持设备是否使用 SkyOrder
private String UseSkyOrderFunctionByMachineName = "";
//印单无会员打印 积分二维码
private String PrintIntegralQRCodeByMachineName = "N";
//印单打印会员信息
private String PrintMemberInfoByMachineName = "N";
//印单印条形码
private String PrintOrderBarCodeByMachineName = "N";
//上菜纸印条形码
private String ServingPaperBarCodeByMachineName = "N";
// 去掉 PrintBarCodeByMachineName
// 新增 PrintOrderBarCodeByMachineName、ServingPaperBarCodeByMachineName
//條形碼寬高
private int BarCode_width = 3;
private int BarCode_Height = 100;
//积分二维码
private int IntegralQR_Size = 6;
private String IntegralTitle = "請掃描二維碼";
private String IntegralTitle2 = "《追加積分到個人賬戶》";
//上菜紙
private String ServingPaperTitle = "收到付款";
/**
* 打印会员信息、积分
*/
private String Print_MemberPointsSort;//印單會員信息打印順序
private String vBlurChar = "*";//通配符
private int vShowMemberPhoneFront = 3;//會員手機號碼通配符顯示位置從哪裡開始
private int vShowMemberPhoneBack = 9;//會員手機號碼通配符顯示位置到哪裡結束
private int vShowMemberNameChar = 0;//會員名稱號碼通配符顯示位置
/** /**
* 结账相关 * 送單是否自動合併未送食品（只處理未有細項的食品）
*/ */
//支持选中几种支付方式(默认支持一种) private boolean MergeSendFood = true;
private int ContemporarySelectedPayWayCount = 2;
private Set<String> customizeSetting = new HashSet<>(); private Set<String> customizeSetting = new HashSet<>();
...@@ -358,1281 +235,4 @@ public class FunctionStyleUtils { ...@@ -358,1281 +235,4 @@ public class FunctionStyleUtils {
} }
public boolean isShowPayFunction() {
return ShowPayFunction;
}
public void setShowPayFunction(boolean showPayFunction) {
ShowPayFunction = showPayFunction;
}
public int getTableTextSize() {
return TableTextSize;
}
public void setTableTextSize(int tableTextSize) {
TableTextSize = tableTextSize;
}
public int getID() {
return ID;
}
public void setID(int ID) {
this.ID = ID;
}
public String getTableNumPadChar() {
return TableNumPadChar;
}
public void setTableNumPadChar(String tableNumPadChar) {
TableNumPadChar = tableNumPadChar;
}
public String getPLUNumPadChar() {
return PLUNumPadChar;
}
public void setPLUNumPadChar(String PLUNumPadChar) {
this.PLUNumPadChar = PLUNumPadChar;
}
public int getFoodTypeFontSize() {
return FoodTypeFontSize;
}
public void setFoodTypeFontSize(int foodTypeFontSize) {
FoodTypeFontSize = foodTypeFontSize;
}
public int getFoodFontSize() {
return FoodFontSize;
}
public void setFoodFontSize(int foodFontSize) {
FoodFontSize = foodFontSize;
}
public String getTableExt() {
return TableExt;
}
public void setTableExt(String tableExt) {
TableExt = tableExt;
}
public int getBaseDpi() {
return BaseDpi;
}
public void setBaseDpi(int baseDpi) {
BaseDpi = baseDpi;
}
public int getBaseHeight() {
return BaseHeight;
}
public void setBaseHeight(int baseHeight) {
BaseHeight = baseHeight;
}
public int getBaseWidth() {
return BaseWidth;
}
public void setBaseWidth(int baseWidth) {
BaseWidth = baseWidth;
}
public int getModFontSize() {
return ModFontSize;
}
public void setModFontSize(int modFontSize) {
ModFontSize = modFontSize;
}
public int getBillListFontSize() {
return BillListFontSize;
}
public void setBillListFontSize(int billListFontSize) {
BillListFontSize = billListFontSize;
}
public int getBillTotalFontSize() {
return BillTotalFontSize;
}
public void setBillTotalFontSize(int billTotalFontSize) {
BillTotalFontSize = billTotalFontSize;
}
public int getFoodlListFontSize() {
return FoodlListFontSize;
}
public void setFoodlListFontSize(int foodlListFontSize) {
FoodlListFontSize = foodlListFontSize;
}
public int getLayoutBillListHeight() {
return LayoutBillListHeight;
}
public void setLayoutBillListHeight(int layoutBillListHeight) {
LayoutBillListHeight = layoutBillListHeight;
}
public int getLayoutQtyHeight() {
return LayoutQtyHeight;
}
public void setLayoutQtyHeight(int layoutQtyHeight) {
LayoutQtyHeight = layoutQtyHeight;
}
public int getLayoutQuitHeight() {
return LayoutQuitHeight;
}
public void setLayoutQuitHeight(int layoutQuitHeight) {
LayoutQuitHeight = layoutQuitHeight;
}
public int getLayoutFoodTypeHeight() {
return LayoutFoodTypeHeight;
}
public void setLayoutFoodTypeHeight(int layoutFoodTypeHeight) {
LayoutFoodTypeHeight = layoutFoodTypeHeight;
}
public int getFoodBtnHeight() {
return FoodBtnHeight;
}
public void setFoodBtnHeight(int foodBtnHeight) {
FoodBtnHeight = foodBtnHeight;
}
public int getModBtnHeight() {
return ModBtnHeight;
}
public void setModBtnHeight(int modBtnHeight) {
ModBtnHeight = modBtnHeight;
}
public int getFoodTypeCol() {
return FoodTypeCol;
}
public void setFoodTypeCol(int foodTypeCol) {
FoodTypeCol = foodTypeCol;
}
public int getFoodTypeRow() {
return FoodTypeRow;
}
public void setFoodTypeRow(int foodTypeRow) {
FoodTypeRow = foodTypeRow;
}
public int getFoodCol() {
return FoodCol;
}
public void setFoodCol(int foodCol) {
FoodCol = foodCol;
}
public int getModCol() {
return ModCol;
}
public void setModCol(int modCol) {
ModCol = modCol;
}
public int getTableDirection() {
return TableDirection;
}
public void setTableDirection(int tableDirection) {
TableDirection = tableDirection;
}
public int getRefreshTime() {
return RefreshTime;
}
public void setRefreshTime(int refreshTime) {
RefreshTime = refreshTime;
}
public int getDiscountCol() {
return DiscountCol;
}
public void setDiscountCol(int discountCol) {
DiscountCol = discountCol;
}
public String getShowTableType() {
return ShowTableType;
}
public void setShowTableType(String showTableType) {
ShowTableType = showTableType;
}
public int getServicecharge_tablemode() {
return servicecharge_tablemode;
}
public void setServicecharge_tablemode(int servicecharge_tablemode) {
this.servicecharge_tablemode = servicecharge_tablemode;
}
public int getServicecharge_tablemode_setting() {
return servicecharge_tablemode_setting;
}
public void setServicecharge_tablemode_setting(int servicecharge_tablemode_setting) {
this.servicecharge_tablemode_setting = servicecharge_tablemode_setting;
}
public int getServicecharge_takeoutmode() {
return servicecharge_takeoutmode;
}
public void setServicecharge_takeoutmode(int servicecharge_takeoutmode) {
this.servicecharge_takeoutmode = servicecharge_takeoutmode;
}
public int getServicecharge_deliverymode() {
return servicecharge_deliverymode;
}
public void setServicecharge_deliverymode(int servicecharge_deliverymode) {
this.servicecharge_deliverymode = servicecharge_deliverymode;
}
public int getServicecharge_pickupmode() {
return servicecharge_pickupmode;
}
public void setServicecharge_pickupmode(int servicecharge_pickupmode) {
this.servicecharge_pickupmode = servicecharge_pickupmode;
}
public int getTableType() {
return tableType;
}
public void setTableType(int tableType) {
this.tableType = tableType;
}
public boolean isServiceChargeIncludeItemDiscount() {
return ServiceChargeIncludeItemDiscount;
}
public void setServiceChargeIncludeItemDiscount(boolean serviceChargeIncludeItemDiscount) {
ServiceChargeIncludeItemDiscount = serviceChargeIncludeItemDiscount;
}
public boolean isBillDiscountIncludeServiceCharge() {
return BillDiscountIncludeServiceCharge;
}
public void setBillDiscountIncludeServiceCharge(boolean billDiscountIncludeServiceCharge) {
BillDiscountIncludeServiceCharge = billDiscountIncludeServiceCharge;
}
public boolean isEdit_Send() {
return Edit_Send;
}
public void setEdit_Send(boolean edit_Send) {
Edit_Send = edit_Send;
}
public int getItemDecimals() {
return ItemDecimals;
}
public void setItemDecimals(int itemDecimals) {
ItemDecimals = itemDecimals;
}
public int getRoundingDecimal() {
return RoundingDecimal;
}
public void setRoundingDecimal(int roundingDecimal) {
RoundingDecimal = roundingDecimal;
}
public int getRounding() {
return Rounding;
}
public void setRounding(int rounding) {
Rounding = rounding;
}
public int getSystemLanguage() {
return SystemLanguage;
}
public void setSystemLanguage(int systemLanguage) {
SystemLanguage = systemLanguage;
}
public int getOpenTableVipFrontColor() {
return OpenTableVipFrontColor;
}
public void setOpenTableVipFrontColor(int openTableVipFrontColor) {
OpenTableVipFrontColor = openTableVipFrontColor;
}
public int getOpenTableVipBackColor() {
return OpenTableVipBackColor;
}
public void setOpenTableVipBackColor(int openTableVipBackColor) {
OpenTableVipBackColor = openTableVipBackColor;
}
public int getNowLanguageIndex() {
return nowLanguageIndex;
}
public void setNowLanguageIndex(int nowLanguageIndex) {
this.nowLanguageIndex = nowLanguageIndex;
}
public String getOrderlanguage() {
return orderlanguage;
}
public void setOrderlanguage(String orderlanguage) {
this.orderlanguage = orderlanguage;
}
public boolean getMemberLoginCover() {
return MemberLoginCover;
}
public void setMemberLoginCover(boolean memberLoginCover) {
MemberLoginCover = memberLoginCover;
}
public String getLanageName() {
return LanageName;
}
public void setLanageName(String lanageName) {
LanageName = lanageName;
}
public int getDataLanguage() {
return DataLanguage;
}
public void setDataLanguage(int dataLanguage) {
DataLanguage = dataLanguage;
}
public int getAutoQuitTime() {
return AutoQuitTime;
}
public void setAutoQuitTime(int autoQuitTime) {
AutoQuitTime = autoQuitTime;
}
public int getModFunctionBarHeight() {
return ModFunctionBarHeight;
}
public void setModFunctionBarHeight(int modFunctionBarHeight) {
ModFunctionBarHeight = modFunctionBarHeight;
}
public boolean isMemberLoginCover() {
return MemberLoginCover;
}
public boolean isEnableErrorLog() {
return EnableErrorLog;
}
public boolean isTableFunction_SplitTable() {
return TableFunction_SplitTable;
}
public boolean isTableFunction_FoodList() {
return TableFunction_FoodList;
}
public boolean isTableFunction_OfflineOrder() {
return TableFunction_OfflineOrder;
}
public boolean isMainFunction_TableMode() {
return MainFunction_TableMode;
}
public boolean isTableFunction_ScanBarcode() {
return TableFunction_ScanBarcode;
}
public boolean isOrderFunction_send() {
return OrderFunction_send;
}
public boolean isTableLoadServerData() {
return TableLoadServerData;
}
public boolean isTableFunction_PayBill() {
return TableFunction_PayBill;
}
public void setTableFunction_PayBill(boolean tableFunction_PayBill) {
TableFunction_PayBill = tableFunction_PayBill;
}
public boolean isOrderFunction_PrePay() {
return OrderFunction_PrePay;
}
public void setOrderFunction_PrePay(boolean orderFunction_PrePay) {
OrderFunction_PrePay = orderFunction_PrePay;
}
public int getBottomBarHeight() {
return BottomBarHeight;
}
public void setBottomBarHeight(int bottomBarHeight) {
BottomBarHeight = bottomBarHeight;
}
public int getReportFontSize() {
return ReportFontSize;
}
public void setReportFontSize(int reportFontSize) {
ReportFontSize = reportFontSize;
}
public String getShopId() {
return ShopId;
}
public void setShoId(String shopCode) {
ShopId = shopCode;
}
public boolean isOrderFunction_Discount() {
return OrderFunction_Discount;
}
public void setOrderFunction_Discount(boolean orderFunction_Discount) {
OrderFunction_Discount = orderFunction_Discount;
}
public boolean isOrderFunction_Transfer() {
return OrderFunction_Transfer;
}
public void setOrderFunction_Transfer(boolean orderFunction_Transfer) {
OrderFunction_Transfer = orderFunction_Transfer;
}
public boolean isOrderFunction_Print() {
return OrderFunction_Print;
}
public void setOrderFunction_Print(boolean orderFunction_Print) {
OrderFunction_Print = orderFunction_Print;
}
public boolean isMainFunction_Report() {
return MainFunction_Report;
}
public void setMainFunction_Report(boolean mainFunction_Report) {
MainFunction_Report = mainFunction_Report;
}
public int getPrinterServerReadTime() {
return printerServerReadTime;
}
public void setPrinterServerReadTime(int printerServerReadTime) {
this.printerServerReadTime = printerServerReadTime;
}
public boolean isOrderFunction_VoidSentItem() {
return OrderFunction_VoidSentItem;
}
public void setOrderFunction_VoidSentItem(boolean orderFunction_VoidSentItem) {
OrderFunction_VoidSentItem = orderFunction_VoidSentItem;
}
public boolean isOrderFunction_ItemDiscount() {
return OrderFunction_ItemDiscount;
}
public void setOrderFunction_ItemDiscount(boolean orderFunction_ItemDiscount) {
OrderFunction_ItemDiscount = orderFunction_ItemDiscount;
}
public boolean isOrderFunction_ItemFoodMerge() {
return OrderFunction_ItemFoodMerge;
}
public void setOrderFunction_ItemFoodMerge(boolean orderFunction_ItemFoodMerge) {
OrderFunction_ItemFoodMerge = orderFunction_ItemFoodMerge;
}
public boolean isOrderFunction_FoodTableMode() {
return OrderFunction_FoodTableMode;
}
public void setOrderFunction_FoodTableMode(boolean orderFunction_FoodTableMode) {
OrderFunction_FoodTableMode = orderFunction_FoodTableMode;
}
public boolean isOrder_InputPax() {
return Order_InputPax;
}
public void setOrder_InputPax(boolean order_InputPax) {
Order_InputPax = order_InputPax;
}
public boolean isOrder_GetTables() {
return Order_GetTables;
}
public void setOrder_GetTables(boolean order_GetTables) {
Order_GetTables = order_GetTables;
}
public int getOrderOperButtonHeight() {
return OrderOperButtonHeight;
}
public void setOrderOperButtonHeight(int orderOperButtonHeight) {
OrderOperButtonHeight = orderOperButtonHeight;
}
public int getOrderInfoHeight() {
return orderInfoHeight;
}
public void setOrderInfoHeight(int orderInfoHeight) {
this.orderInfoHeight = orderInfoHeight;
}
public int getOrderInfoFontSize() {
return orderInfoFontSize;
}
public void setOrderInfoFontSize(int orderInfoFontSize) {
this.orderInfoFontSize = orderInfoFontSize;
}
public int getOrderDataOperBtnWidth() {
return OrderDataOperBtnWidth;
}
public void setOrderDataOperBtnWidth(int orderDataOperBtnWidth) {
OrderDataOperBtnWidth = orderDataOperBtnWidth;
}
public int getOrderDataOperBtnHeight() {
return OrderDataOperBtnHeight;
}
public void setOrderDataOperBtnHeight(int orderDataOperBtnHeight) {
OrderDataOperBtnHeight = orderDataOperBtnHeight;
}
public boolean isBillTextScroll() {
return BillTextScroll;
}
public void setBillTextScroll(boolean billTextScroll) {
BillTextScroll = billTextScroll;
}
public int getTableFunctionTopHeight() {
return TableFunctionTopHeight;
}
public void setTableFunctionTopHeight(int tableFunctionTopHeight) {
TableFunctionTopHeight = tableFunctionTopHeight;
}
public int getTableFunctionBottomHeight() {
return TableFunctionBottomHeight;
}
public void setTableFunctionBottomHeight(int tableFunctionBottomHeight) {
TableFunctionBottomHeight = tableFunctionBottomHeight;
}
public int getTableFunctionFontSize() {
return TableFunctionFontSize;
}
public void setTableFunctionFontSize(int tableFunctionFontSize) {
TableFunctionFontSize = tableFunctionFontSize;
}
public int getTableFunctionTopFontSize() {
return TableFunctionTopFontSize;
}
public void setTableFunctionTopFontSize(int tableFunctionTopFontSize) {
TableFunctionTopFontSize = tableFunctionTopFontSize;
}
public int getTableFunctionBottomFontSize() {
return TableFunctionBottomFontSize;
}
public void setTableFunctionBottomFontSize(int tableFunctionBottomFontSize) {
TableFunctionBottomFontSize = tableFunctionBottomFontSize;
}
public String getMemberinfo() {
return Memberinfo;
}
public void setMemberinfo(String memberinfo) {
Memberinfo = memberinfo;
}
public String getMemberHttp() {
return MemberHttp;
}
public void setMemberHttp(String memberHttp) {
MemberHttp = memberHttp;
}
public boolean getEnableErrorLog() {
return EnableErrorLog;
}
public void setEnableErrorLog(boolean enableErrorLog) {
EnableErrorLog = enableErrorLog;
}
public boolean getTableFunction_SplitTable() {
return TableFunction_SplitTable;
}
public void setTableFunction_SplitTable(boolean tableFunction_SplitTable) {
TableFunction_SplitTable = tableFunction_SplitTable;
}
public boolean getTableFunction_FoodList() {
return TableFunction_FoodList;
}
public void setTableFunction_FoodList(boolean tableFunction_FoodList) {
TableFunction_FoodList = tableFunction_FoodList;
}
public boolean getTableFunction_OfflineOrder() {
return TableFunction_OfflineOrder;
}
public void setTableFunction_OfflineOrder(boolean tableFunction_OfflineOrder) {
TableFunction_OfflineOrder = tableFunction_OfflineOrder;
}
public boolean getMainFunction_TableMode() {
return MainFunction_TableMode;
}
public void setMainFunction_TableMode(boolean mainFunction_TableMode) {
MainFunction_TableMode = mainFunction_TableMode;
}
public boolean getTableFunction_ScanBarcode() {
return TableFunction_ScanBarcode;
}
public void setTableFunction_ScanBarcode(boolean tableFunction_ScanBarcode) {
TableFunction_ScanBarcode = tableFunction_ScanBarcode;
}
public boolean getOrderFunction_send() {
return OrderFunction_send;
}
public void setOrderFunction_send(boolean orderFunction_send) {
OrderFunction_send = orderFunction_send;
}
public int getAutoOpen() {
return AutoOpen;
}
public void setAutoOpen(int autoOpen) {
AutoOpen = autoOpen;
}
public int getOrderNumberShowSize() {
return OrderNumberShowSize;
}
public void setOrderNumberShowSize(int orderNumberShowSize) {
OrderNumberShowSize = orderNumberShowSize;
}
public int getOrderNumberFontSize() {
return OrderNumberFontSize;
}
public void setOrderNumberFontSize(int orderNumberFontSize) {
OrderNumberFontSize = orderNumberFontSize;
}
public int getOrderNumberChildShowSize() {
return OrderNumberChildShowSize;
}
public void setOrderNumberChildShowSize(int orderNumberChildShowSize) {
OrderNumberChildShowSize = orderNumberChildShowSize;
}
public int getOrderNumberChildFontSize() {
return OrderNumberChildFontSize;
}
public void setOrderNumberChildFontSize(int orderNumberChildFontSize) {
OrderNumberChildFontSize = orderNumberChildFontSize;
}
public int getShowPluPad() {
return ShowPluPad;
}
public void setShowPluPad(int showPluPad) {
ShowPluPad = showPluPad;
}
public boolean getTableLoadServerData() {
return TableLoadServerData;
}
public void setTableLoadServerData(boolean tableLoadServerData) {
TableLoadServerData = tableLoadServerData;
}
public boolean isMainNotRead() {
return mainNotRead;
}
public void setMainNotRead(boolean mainNotRead) {
this.mainNotRead = mainNotRead;
}
public String getBackIIS() {
return backIIS;
}
public void setBackIIS(String backIIS) {
this.backIIS = backIIS;
}
public String getOrderBottomFunction() {
return OrderBottomFunction;
}
public void setOrderBottomFunction(String orderBottomFunction) {
OrderBottomFunction = orderBottomFunction;
}
public boolean isMenuUpdateAutoAlert() {
return MenuUpdateAutoAlert;
}
public void setMenuUpdateAutoAlert(boolean menuUpdateAutoAlert) {
MenuUpdateAutoAlert = menuUpdateAutoAlert;
}
public boolean isUseSystemScan() {
return UseSystemScan;
}
public void setUseSystemScan(boolean useSystemScan) {
UseSystemScan = useSystemScan;
}
public String getMemberInputMethod() {
return MemberInputMethod;
}
public void setMemberInputMethod(String memberInputMethod) {
MemberInputMethod = memberInputMethod;
}
public int getWaitconnetiontime() {
return waitconnetiontime;
}
public Set<String> getCustomizeSetting() {
return customizeSetting;
}
public void setCustomizeSetting(Set<String> customizeSetting) {
this.customizeSetting = customizeSetting;
}
public int getScreen_w() {
return screen_w;
}
public void setScreen_w(int screen_w) {
this.screen_w = screen_w;
}
public int getScreen_h() {
return screen_h;
}
public void setScreen_h(int screen_h) {
this.screen_h = screen_h;
}
public int getScreen_density_dpi() {
return screen_density_dpi;
}
public void setScreen_density_dpi(int screen_density_dpi) {
this.screen_density_dpi = screen_density_dpi;
}
public boolean isSpliteTableAutoBack() {
return SpliteTableAutoBack;
}
public void setSpliteTableAutoBack(boolean spliteTableAutoBack) {
SpliteTableAutoBack = spliteTableAutoBack;
}
public boolean isPaperPrintAutoBack() {
return PaperPrintAutoBack;
}
public void setPaperPrintAutoBack(boolean paperPrintAutoBack) {
PaperPrintAutoBack = paperPrintAutoBack;
}
public boolean isRestTableAutoBack() {
return RestTableAutoBack;
}
public void setRestTableAutoBack(boolean restTableAutoBack) {
RestTableAutoBack = restTableAutoBack;
}
public boolean isMoveTableAutoBack() {
return MoveTableAutoBack;
}
public void setMoveTableAutoBack(boolean moveTableAutoBack) {
MoveTableAutoBack = moveTableAutoBack;
}
public String getQR_DeliveryMinute() {
return QR_DeliveryMinute;
}
public void setQR_DeliveryMinute(String QR_DeliveryMinute) {
this.QR_DeliveryMinute = QR_DeliveryMinute;
}
public int getQR_DeliveryLaterDefault() {
return QR_DeliveryLaterDefault;
}
public void setQR_DeliveryLaterDefault(int QR_DeliveryLaterDefault) {
this.QR_DeliveryLaterDefault = QR_DeliveryLaterDefault;
}
public int getQR_SummaryIndexDefault() {
return QR_SummaryIndexDefault;
}
public void setQR_SummaryIndexDefault(int QR_SummaryIndexDefault) {
this.QR_SummaryIndexDefault = QR_SummaryIndexDefault;
}
public int getQRBill_TopMsgTextSize() {
return QRBill_TopMsgTextSize;
}
public void setQRBill_TopMsgTextSize(int QRBill_TopMsgTextSize) {
this.QRBill_TopMsgTextSize = QRBill_TopMsgTextSize;
}
public int getQRBill_NoteTextSize() {
return QRBill_NoteTextSize;
}
public void setQRBill_NoteTextSize(int QRBill_NoteTextSize) {
this.QRBill_NoteTextSize = QRBill_NoteTextSize;
}
public int getQR_Size() {
return QR_Size;
}
public void setQR_Size(int QR_Size) {
this.QR_Size = QR_Size;
}
public String getSendAutoPrintFoodList() {
return SendAutoPrintFoodList;
}
public void setSendAutoPrintFoodList(String sendAutoPrintFoodList) {
SendAutoPrintFoodList = sendAutoPrintFoodList;
}
public String getPrint_MemberPointsSort() {
return Print_MemberPointsSort;
}
public void setPrint_MemberPointsSort(String print_MemberPointsSort) {
Print_MemberPointsSort = print_MemberPointsSort;
}
public String getvBlurChar() {
return vBlurChar;
}
public void setvBlurChar(String vBlurChar) {
this.vBlurChar = vBlurChar;
}
public int getvShowMemberPhoneFront() {
return vShowMemberPhoneFront;
}
public void setvShowMemberPhoneFront(int vShowMemberPhoneFront) {
this.vShowMemberPhoneFront = vShowMemberPhoneFront;
}
public int getvShowMemberPhoneBack() {
return vShowMemberPhoneBack;
}
public void setvShowMemberPhoneBack(int vShowMemberPhoneBack) {
this.vShowMemberPhoneBack = vShowMemberPhoneBack;
}
public int getvShowMemberNameChar() {
return vShowMemberNameChar;
}
public void setvShowMemberNameChar(int vShowMemberNameChar) {
this.vShowMemberNameChar = vShowMemberNameChar;
}
public int getBarCode_Height() {
return BarCode_Height;
}
public void setBarCode_Height(int barCode_Height) {
BarCode_Height = barCode_Height;
}
public int getBarCode_width() {
return BarCode_width;
}
public void setBarCode_width(int barCode_width) {
BarCode_width = barCode_width;
}
public int getIntegralQR_Size() {
return IntegralQR_Size;
}
public void setIntegralQR_Size(int integralQR_Size) {
IntegralQR_Size = integralQR_Size;
}
public String getIntegralTitle() {
return IntegralTitle;
}
public void setIntegralTitle(String integralTitle) {
IntegralTitle = integralTitle;
}
public String getIntegralTitle2() {
return IntegralTitle2;
}
public void setIntegralTitle2(String integralTitle2) {
IntegralTitle2 = integralTitle2;
}
public String getServingPaperTitle() {
return ServingPaperTitle;
}
public void setServingPaperTitle(String servingPaperTitle) {
ServingPaperTitle = servingPaperTitle;
}
public String getUseExternalPrintByMachineName() {
return UseExternalPrintByMachineName;
}
public void setUseExternalPrintByMachineName(String useExternalPrintByMachineName) {
UseExternalPrintByMachineName = useExternalPrintByMachineName;
}
public String getUseSkyOrderFunctionByMachineName() {
return UseSkyOrderFunctionByMachineName;
}
public void setUseSkyOrderFunctionByMachineName(String useSkyOrderFunctionByMachineName) {
UseSkyOrderFunctionByMachineName = useSkyOrderFunctionByMachineName;
}
public String getPrintIntegralQRCodeByMachineName() {
return PrintIntegralQRCodeByMachineName;
}
public void setPrintIntegralQRCodeByMachineName(String printIntegralQRCodeByMachineName) {
PrintIntegralQRCodeByMachineName = printIntegralQRCodeByMachineName;
}
public String getPrintMemberInfoByMachineName() {
return PrintMemberInfoByMachineName;
}
public void setPrintMemberInfoByMachineName(String printMemberInfoByMachineName) {
PrintMemberInfoByMachineName = printMemberInfoByMachineName;
}
public String getPrintOrderBarCodeByMachineName() {
return PrintOrderBarCodeByMachineName;
}
public void setPrintOrderBarCodeByMachineName(String printOrderBarCodeByMachineName) {
PrintOrderBarCodeByMachineName = printOrderBarCodeByMachineName;
}
public String getServingPaperBarCodeByMachineName() {
return ServingPaperBarCodeByMachineName;
}
public void setServingPaperBarCodeByMachineName(String servingPaperBarCodeByMachineName) {
ServingPaperBarCodeByMachineName = servingPaperBarCodeByMachineName;
}
public int getPrintOrderInfo_TextSize() {
return PrintOrderInfo_TextSize;
}
public void setPrintOrderInfo_TextSize(int printOrderInfo_TextSize) {
PrintOrderInfo_TextSize = printOrderInfo_TextSize;
}
public int getPrintOrderFood_TextSize() {
return PrintOrderFood_TextSize;
}
public void setPrintOrderFood_TextSize(int printOrderFood_TextSize) {
PrintOrderFood_TextSize = printOrderFood_TextSize;
}
public int getPrintOrderMoney_TextSize() {
return PrintOrderMoney_TextSize;
}
public void setPrintOrderMoney_TextSize(int printOrderMoney_TextSize) {
PrintOrderMoney_TextSize = printOrderMoney_TextSize;
}
public int getPrintMemberInfo_TextSize() {
return PrintMemberInfo_TextSize;
}
public void setPrintMemberInfo_TextSize(int printMemberInfo_TextSize) {
PrintMemberInfo_TextSize = printMemberInfo_TextSize;
}
public String getQRTable_FlagText() {
return QRTable_FlagText;
}
public void setQRTable_FlagText(String QRTable_FlagText) {
this.QRTable_FlagText = QRTable_FlagText;
}
public int getQRTable_FlagTextSize() {
return QRTable_FlagTextSize;
}
public void setQRTable_FlagTextSize(int QRTable_FlagTextSize) {
this.QRTable_FlagTextSize = QRTable_FlagTextSize;
}
public String getQRTable_FlagTextColor() {
return QRTable_FlagTextColor;
}
public void setQRTable_FlagTextColor(String QRTable_FlagTextColor) {
this.QRTable_FlagTextColor = QRTable_FlagTextColor;
}
public int getComboNeedOmitLength() {
return ComboNeedOmitLength;
}
public void setComboNeedOmitLength(int comboNeedOmitLength) {
ComboNeedOmitLength = comboNeedOmitLength;
}
public String getIPLockInputPassword() {
return IPLockPassword;
}
public void setIPLockInputPassword(String IPLockPassword) {
this.IPLockPassword = IPLockPassword;
}
public int getClickInterval() {
return ClickInterval;
}
public void setClickInterval(int clickInterval) {
ClickInterval = clickInterval;
}
public int getMealTemporay_GroupMaxCount() {
return MealTemporay_GroupMaxCount;
}
public void setMealTemporay_GroupMaxCount(int mealTemporay_GroupMaxCount) {
MealTemporay_GroupMaxCount = mealTemporay_GroupMaxCount;
}
public int getMealTemporay_ItemMaxCount() {
return MealTemporay_ItemMaxCount;
}
public void setMealTemporay_ItemMaxCount(int mealTemporay_ItemMaxCount) {
MealTemporay_ItemMaxCount = mealTemporay_ItemMaxCount;
}
public int getMealTemporay_TextSize() {
return MealTemporay_TextSize;
}
public void setMealTemporay_TextSize(int mealTemporay_TextSize) {
MealTemporay_TextSize = mealTemporay_TextSize;
}
public boolean isOrderFunction_FoodTemporay() {
return OrderFunction_FoodTemporay;
}
public void setOrderFunction_FoodTemporay(boolean orderFunction_FoodTemporay) {
OrderFunction_FoodTemporay = orderFunction_FoodTemporay;
}
public String getMealTemporay_OmittedText() {
return MealTemporay_OmittedText;
}
public void setMealTemporay_OmittedText(String mealTemporay_OmittedText) {
MealTemporay_OmittedText = mealTemporay_OmittedText;
}
public String getQRTable_FlagTextBackGroup() {
return QRTable_FlagTextBackGroup;
}
public void setQRTable_FlagTextBackGroup(String QRTable_FlagTextBackGroup) {
this.QRTable_FlagTextBackGroup = QRTable_FlagTextBackGroup;
}
public int getQRTable_FlagWith() {
return QRTable_FlagWith;
}
public void setQRTable_FlagWith(int QRTable_FlagWith) {
this.QRTable_FlagWith = QRTable_FlagWith;
}
public int getQRTable_FlagHeight() {
return QRTable_FlagHeight;
}
public void setQRTable_FlagHeight(int QRTable_FlagHeight) {
this.QRTable_FlagHeight = QRTable_FlagHeight;
}
public int getContemporarySelectedPayWayCount() {
return ContemporarySelectedPayWayCount;
}
public void setContemporarySelectedPayWayCount(int contemporarySelectedPayWayCount) {
ContemporarySelectedPayWayCount = contemporarySelectedPayWayCount;
}
public void setSkyorderLock(String skyorderLock) {
SkyorderLock = skyorderLock;
}
public int getLockScreenChronometerTime() {
return LockScreenChronometerTime;
}
public void setLockScreenChronometerTime(int lockScreenChronometerTime) {
this.LockScreenChronometerTime = lockScreenChronometerTime;
}
public int getLockScreenBrightness() {
return LockScreenBrightness;
}
public void setLockScreenBrightness(int lockScreenBrightness) {
this.LockScreenBrightness = lockScreenBrightness;
}
public boolean isShowLockScreenButton() {
return ShowLockScreenButton;
}
public void setShowLockScreenButton(boolean showLockScreenButton) {
ShowLockScreenButton = showLockScreenButton;
}
} }
base-module/src/main/java/com/gingersoft/gsa/cloud/ui/widget/dialog/BaseRetryDialog.java 0 → 100644
package com.gingersoft.gsa.cloud.ui.widget.dialog;
import android.app.Dialog;
import android.content.Context;
import android.net.ParseException;
import android.os.Bundle;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.LinearLayout;
import com.gingersoft.gsa.cloud.base.R;
import com.gingersoft.gsa.cloud.base.common.bean.TableBean;
import com.gingersoft.gsa.cloud.database.bean.Discount;
import com.google.gson.JsonIOException;
import com.google.gson.JsonParseException;
import com.jess.arms.base.DefaultAdapter;
import com.jess.arms.utils.DeviceUtils;
import com.qmuiteam.qmui.layout.QMUILinearLayout;
import com.qmuiteam.qmui.util.QMUIDisplayHelper;
import com.qmuiteam.qmui.widget.QMUIEmptyView;
import com.qmuiteam.qmui.widget.QMUITopBar;
import org.json.JSONException;
import java.net.SocketTimeoutException;
import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.List;
import androidx.annotation.NonNull;
import androidx.core.content.ContextCompat;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
/**
* 作者：ELEGANT_BIN
* 版本：1.6.0
* 创建日期：2020-07-29
* 修订历史：2020-07-29
* 描述：
*/
public abstract class BaseRetryDialog extends Dialog {
private static final String TAG = "BaseRetryDialog";
private Context mContext;
public BaseRetryDialog(@NonNull Context context) {
super(context, R.style.MyDialogTheme2);
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
mContext = getContext();
setCanceledOnTouchOutside(true);
}
@Override
public void show() {
super.show();
}
@Override
public void dismiss() {
super.dismiss();
}
protected void showEmptyView(boolean isSuccess, int size, Throwable t, QMUIEmptyView emptyView, RecyclerView recyclerView) {
if (t != null) {
if (t instanceof UnknownHostException) {
//沒有網絡
emptyView.show(false, mContext.getResources().getString(R.string.emptyView_mode_desc_fail_title), mContext.getResources().getString(R.string.emptyView_mode_desc_fail_desc), mContext.getResources().getString(R.string.emptyView_mode_desc_retry), onRetryClickListener);
} else if (t instanceof SocketTimeoutException) {
//請求超時
emptyView.show(false, mContext.getResources().getString(R.string.emptyView_mode_desc_fail_title), mContext.getResources().getString(R.string.emptyView_mode_desc_fail_desc), mContext.getResources().getString(R.string.emptyView_mode_desc_retry), onRetryClickListener);
} else if (t instanceof JsonParseException || t instanceof ParseException || t instanceof JSONException || t instanceof JsonIOException) {
//數據解析錯誤
emptyView.show(false, mContext.getResources().getString(R.string.response_error_data_parsing_error), null, mContext.getResources().getString(R.string.emptyView_mode_desc_retry), onRetryClickListener);
} else {
//其他error
emptyView.show(false, mContext.getResources().getString(R.string.emptyView_mode_desc_fail_title), null, mContext.getResources().getString(R.string.emptyView_mode_desc_retry), onRetryClickListener);
}
recyclerView.setVisibility(View.INVISIBLE);
return;
}
if (!isSuccess) {
emptyView.show(false, mContext.getResources().getString(R.string.emptyView_mode_desc_fail_title), null, mContext.getResources().getString(R.string.emptyView_mode_desc_retry), onRetryClickListener);
recyclerView.setVisibility(View.INVISIBLE);
return;
}
if (size == 0) {
emptyView.show(mContext.getResources().getString(R.string.emptyView_mode_desc_double), null);
recyclerView.setVisibility(View.INVISIBLE);
return;
}
emptyView.hide();
recyclerView.setVisibility(View.VISIBLE);
return;
}
private View.OnClickListener onRetryClickListener = new View.OnClickListener() {
@Override
public void onClick(View v) {
//重新加載
if (onRetryListener != null) {
onRetryListener.onRetryClick();
}
}
};
private OnRetryListener onRetryListener;
public void setOnRetryListener(OnRetryListener onRetryListener) {
this.onRetryListener = onRetryListener;
}
public interface OnRetryListener {
void onRetryClick();
}
}
manager-module/src/main/java/com/gingersoft/gsa/cloud/manager/mvp/ui/fragment/AddTableFragment.java
...@@ -471,6 +471,10 @@ public class AddTableFragment extends BaseFragment<AddTablePresenter> implements ...@@ -471,6 +471,10 @@ public class AddTableFragment extends BaseFragment<AddTablePresenter> implements
showMessage("請輸入餐檯名稱"); showMessage("請輸入餐檯名稱");
return false; return false;
} }
if (Integer.parseInt(peopleMixNumberEditText.getText().toString()) > Integer.parseInt(peopleMaxNumberEditText.getText().toString())) {
showMessage("最少人数不能大于最小人数!");
return false;
}
// if (TextUtils.isEmpty(defalutPeopleNumberEditText.getText().toString())) { // if (TextUtils.isEmpty(defalutPeopleNumberEditText.getText().toString())) {
// showMessage("請輸入就餐人數"); // showMessage("請輸入就餐人數");
// return false; // return false;
......
manager-module/src/main/java/com/gingersoft/gsa/cloud/manager/mvp/ui/fragment/TableListFragment.java
...@@ -270,7 +270,8 @@ public class TableListFragment extends BaseFragment<TableListPresenter> implemen ...@@ -270,7 +270,8 @@ public class TableListFragment extends BaseFragment<TableListPresenter> implemen
} else { } else {
if (isRadioEdit) { if (isRadioEdit) {
item.setChecked(!item.isChecked()); item.setChecked(!item.isChecked());
mAdapter.notifyDataSetChanged(); mAdapter.notifyItemChanged(position);
// mAdapter.notifyDataSetChanged();
} else { } else {
if (item.getStatus() == 0) { if (item.getStatus() == 0) {
start(AddTableFragment.newInstance(item)); start(AddTableFragment.newInstance(item));
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/contract/TableContract.java
...@@ -35,6 +35,8 @@ public interface TableContract { ...@@ -35,6 +35,8 @@ public interface TableContract {
void returnTableList(List<TableBean.DataBean> dataBeanList); void returnTableList(List<TableBean.DataBean> dataBeanList);
void returnSplitTableList(List<TableBean.DataBean> dataBeanList);
AllTableFragment getCurrentTableFragment(); AllTableFragment getCurrentTableFragment();
void clickTableItem(TableBean.DataBean dataBean); void clickTableItem(TableBean.DataBean dataBean);
...@@ -68,7 +70,7 @@ public interface TableContract { ...@@ -68,7 +70,7 @@ public interface TableContract {
Observable<TableBean> getTables(int restaurantId); Observable<TableBean> getTables(int restaurantId);
Observable<TableDetail> getTable(int tableId); Observable<TableDetail> getTable(long tableId);
Observable<BaseRespose> getOrderById(long orderId); Observable<BaseRespose> getOrderById(long orderId);
...@@ -77,5 +79,9 @@ public interface TableContract { ...@@ -77,5 +79,9 @@ public interface TableContract {
Observable<BaseRespose> turnTable(RequestBody requestBody); Observable<BaseRespose> turnTable(RequestBody requestBody);
Observable<BaseRespose> initTable(RequestBody requestBody); Observable<BaseRespose> initTable(RequestBody requestBody);
Observable<BaseResult> getSplitTables(long tableId);
Observable<BaseResult> splitTable(long tableId);
} }
} }
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/TableModel.java
...@@ -2,6 +2,7 @@ package com.gingersoft.gsa.cloud.table.mvp.model; ...@@ -2,6 +2,7 @@ package com.gingersoft.gsa.cloud.table.mvp.model;
import android.app.Application; import android.app.Application;
import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.database.bean.ComboItem; import com.gingersoft.gsa.cloud.database.bean.ComboItem;
import com.gingersoft.gsa.cloud.database.bean.Modifier; import com.gingersoft.gsa.cloud.database.bean.Modifier;
import com.gingersoft.gsa.cloud.database.utils.ComboItemDaoUtils; import com.gingersoft.gsa.cloud.database.utils.ComboItemDaoUtils;
...@@ -71,7 +72,7 @@ public class TableModel extends BaseModel implements TableContract.Model { ...@@ -71,7 +72,7 @@ public class TableModel extends BaseModel implements TableContract.Model {
} }
@Override @Override
public Observable<TableDetail> getTable(int tableId) { public Observable<TableDetail> getTable(long tableId) {
return mRepositoryManager.obtainRetrofitService(TableService.class) return mRepositoryManager.obtainRetrofitService(TableService.class)
.getTable(tableId); .getTable(tableId);
} }
...@@ -100,5 +101,17 @@ public class TableModel extends BaseModel implements TableContract.Model { ...@@ -100,5 +101,17 @@ public class TableModel extends BaseModel implements TableContract.Model {
.initTable(requestBody); .initTable(requestBody);
} }
@Override
public Observable<BaseResult> getSplitTables(long tableId) {
return mRepositoryManager.obtainRetrofitService(TableService.class)
.getSplitTables(tableId);
}
@Override
public Observable<BaseResult> splitTable(long tableId) {
return mRepositoryManager.obtainRetrofitService(TableService.class)
.splitTable(tableId);
}
} }
\ No newline at end of file
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/bean/SplitTableNumber.java 0 → 100644
package com.gingersoft.gsa.cloud.table.mvp.model.bean;
import lombok.Data;
/**
* 作者：ELEGANT_BIN
* 版本：1.6.0
* 创建日期：2020-07-29
* 修订历史：2020-07-29
* 描述：
*/
@Data
public class SplitTableNumber {
/**
* id : 1
* tableNumber : A
*/
private int id;
private String tableNumber;
}
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/bean/request/AddOrderRequest.java
...@@ -5,6 +5,8 @@ import com.gingersoft.gsa.cloud.base.common.bean.OrderBean; ...@@ -5,6 +5,8 @@ import com.gingersoft.gsa.cloud.base.common.bean.OrderBean;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import lombok.Data;
/** /**
* 作者：ELEGANT_BIN * 作者：ELEGANT_BIN
* 版本：1.6.0 * 版本：1.6.0
...@@ -12,65 +14,17 @@ import java.util.Map; ...@@ -12,65 +14,17 @@ import java.util.Map;
* 修订历史：2020-01-06 * 修订历史：2020-01-06
* 描述： * 描述：
*/ */
@Data
public class AddOrderRequest { public class AddOrderRequest {
private long orderId; private long orderId;
private int tableId; private long tableId;
private String tableNumber;
/**賬單小數*/ /**賬單小數*/
private Double rounding; private Double rounding;
/**整單折扣ID*/ /**整單折扣ID*/
private Long discountId; private Long discountId;
private Map<String, List<OrderBean.OrderDetailsBean>> maps; private Map<String, List<OrderBean.OrderDetailsBean>> maps;
public long getOrderId() {
return orderId;
}
public void setOrderId(long orderId) {
this.orderId = orderId;
}
public int getTableId() {
return tableId;
}
public void setTableId(int tableId) {
this.tableId = tableId;
}
public Double getRounding() {
return rounding;
}
public void setRounding(Double rounding) {
this.rounding = rounding;
}
public Long getDiscountId() {
return discountId;
}
public void setDiscountId(Long discountId) {
this.discountId = discountId;
}
public Map<String, List<OrderBean.OrderDetailsBean>> getMaps() {
return maps;
}
public void setMaps(Map<String, List<OrderBean.OrderDetailsBean>> maps) {
this.maps = maps;
}
@Override
public String toString() {
return "AddOrderRequest{" +
"orderId=" + orderId +
", rounding=" + rounding +
", discountId=" + discountId +
", maps=" + maps +
'}';
}
} }
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/bean/request/CreateOrderRequest.java
...@@ -5,6 +5,8 @@ import com.gingersoft.gsa.cloud.base.common.bean.OrderBean; ...@@ -5,6 +5,8 @@ import com.gingersoft.gsa.cloud.base.common.bean.OrderBean;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import lombok.Data;
/** /**
* 作者：ELEGANT_BIN * 作者：ELEGANT_BIN
* 版本：1.6.0 * 版本：1.6.0
...@@ -12,11 +14,12 @@ import java.util.Map; ...@@ -12,11 +14,12 @@ import java.util.Map;
* 修订历史：2020-01-06 * 修订历史：2020-01-06
* 描述： * 描述：
*/ */
@Data
public class CreateOrderRequest { public class CreateOrderRequest {
private int person; private int person;
private int tableId; private long tableId;
private String tableNumber;
private String tableName; private String tableName;
private int restaurantId; private int restaurantId;
/**賬單小數*/ /**賬單小數*/
...@@ -25,62 +28,6 @@ public class CreateOrderRequest { ...@@ -25,62 +28,6 @@ public class CreateOrderRequest {
private Long discountId; private Long discountId;
private Map<Long, List<OrderBean.OrderDetailsBean>> orderDetails; private Map<Long, List<OrderBean.OrderDetailsBean>> orderDetails;
public int getPerson() {
return person;
}
public void setPerson(int person) {
this.person = person;
}
public int getTableId() {
return tableId;
}
public void setTableId(int tableId) {
this.tableId = tableId;
}
public String getTableName() {
return tableName;
}
public void setTableName(String tableName) {
this.tableName = tableName;
}
public int getRestaurantId() {
return restaurantId;
}
public void setRestaurantId(int restaurantId) {
this.restaurantId = restaurantId;
}
public Double getRounding() {
return rounding;
}
public void setRounding(Double rounding) {
this.rounding = rounding;
}
public Long getDiscountId() {
return discountId;
}
public void setDiscountId(Long discountId) {
this.discountId = discountId;
}
public Map<Long, List<OrderBean.OrderDetailsBean>> getOrderDetails() {
return orderDetails;
}
public void setOrderDetails(Map<Long, List<OrderBean.OrderDetailsBean>> orderDetails) {
this.orderDetails = orderDetails;
}
// public static class Request { // public static class Request {
// private long productId; // private long productId;
...@@ -152,18 +99,5 @@ public class CreateOrderRequest { ...@@ -152,18 +99,5 @@ public class CreateOrderRequest {
// } // }
// } // }
@Override
public String toString() {
return "CreateOrderRequest{" +
"person=" + person +
", tableId=" + tableId +
", tableName='" + tableName + '\'' +
", restaurantId=" + restaurantId +
", rounding=" + rounding +
", discountId=" + discountId +
", orderDetails=" + orderDetails +
'}';
}
} }
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/bean/request/DeleteOrderRequest.java
...@@ -18,7 +18,7 @@ public class DeleteOrderRequest { ...@@ -18,7 +18,7 @@ public class DeleteOrderRequest {
private List<Map<Byte, DeleteOrderRequest.DeleteBean>> mapsDelete; private List<Map<Byte, DeleteOrderRequest.DeleteBean>> mapsDelete;
private long orderId ; private long orderId ;
private int tableId; private long tableId;
private byte type; private byte type;
private long reasonId; private long reasonId;
...@@ -38,11 +38,11 @@ public class DeleteOrderRequest { ...@@ -38,11 +38,11 @@ public class DeleteOrderRequest {
this.orderId = orderId; this.orderId = orderId;
} }
public int getTableId() { public long getTableId() {
return tableId; return tableId;
} }
public void setTableId(int tableId) { public void setTableId(long tableId) {
this.tableId = tableId; this.tableId = tableId;
} }
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/service/TableService.java
...@@ -26,7 +26,7 @@ public interface TableService { ...@@ -26,7 +26,7 @@ public interface TableService {
Observable<TableBean> getTables(@Query("restaurantId") int restaurantId); Observable<TableBean> getTables(@Query("restaurantId") int restaurantId);
@GET("restaurantTable/get" + RetrofitUrlManager.IDENTIFICATION_PATH_SIZE + 2) @GET("restaurantTable/get" + RetrofitUrlManager.IDENTIFICATION_PATH_SIZE + 2)
Observable<TableDetail> getTable(@Query("id") int table); Observable<TableDetail> getTable(@Query("id") long table);
@POST("restaurantTable/kickOff" + RetrofitUrlManager.IDENTIFICATION_PATH_SIZE + 2) @POST("restaurantTable/kickOff" + RetrofitUrlManager.IDENTIFICATION_PATH_SIZE + 2)
Observable<BaseRespose> openTable(@Body RequestBody requestBody); Observable<BaseRespose> openTable(@Body RequestBody requestBody);
...@@ -36,4 +36,10 @@ public interface TableService { ...@@ -36,4 +36,10 @@ public interface TableService {
@POST("restaurantTable/set/status" + RetrofitUrlManager.IDENTIFICATION_PATH_SIZE + 2) @POST("restaurantTable/set/status" + RetrofitUrlManager.IDENTIFICATION_PATH_SIZE + 2)
Observable<BaseRespose> initTable(@Body RequestBody requestBody); Observable<BaseRespose> initTable(@Body RequestBody requestBody);
@GET("restaurantTable/getSplitTableAvailable" + RetrofitUrlManager.IDENTIFICATION_PATH_SIZE + 2)
Observable<BaseResult> getSplitTables(@Query("tableId") long tableId);
@GET("restaurantTable/getSplitTable" + RetrofitUrlManager.IDENTIFICATION_PATH_SIZE + 2)
Observable<BaseResult> splitTable(@Query("tableId") long tableId);
} }
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/BaseOrderPresenter.java
...@@ -324,7 +324,7 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas ...@@ -324,7 +324,7 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas
/** /**
* 添加會員項 * 添加會員項
*/ */
private void addOrderMember(){ private void addOrderMember() {
} }
...@@ -729,9 +729,16 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas ...@@ -729,9 +729,16 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas
} }
protected CreateOrderRequest getCreateOrderRequest(List<OrderDetail> foodList) { protected CreateOrderRequest getCreateOrderRequest(List<OrderDetail> foodList) {
List<OrderDetail> newFoodList = new ArrayList<>();
newFoodList.addAll(foodList);
if (GsaCloudApplication.androidSetting.isMergeSendFood()) {
//合并未送单主食品
mergeMainFoodNumber(newFoodList);
}
int restaurantId = GsaCloudApplication.getRestaurantId(mApplication); int restaurantId = GsaCloudApplication.getRestaurantId(mApplication);
CreateOrderRequest request = new CreateOrderRequest(); CreateOrderRequest request = new CreateOrderRequest();
request.setOrderDetails(orderDetailBeanToFoodRequest(foodList)); request.setOrderDetails(orderDetailBeanToFoodRequest(newFoodList));
request.setPerson(OpenTableManage.getDefault().getPeopleNumber()); request.setPerson(OpenTableManage.getDefault().getPeopleNumber());
request.setTableId(OpenTableManage.getDefault().getTableBean().getId()); request.setTableId(OpenTableManage.getDefault().getTableBean().getId());
request.setTableName(OpenTableManage.getDefault().getTableBean().getTableName()); request.setTableName(OpenTableManage.getDefault().getTableBean().getTableName());
...@@ -745,8 +752,15 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas ...@@ -745,8 +752,15 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas
} }
protected AddOrderRequest getAddOrderRequest(List<OrderDetail> foodList) { protected AddOrderRequest getAddOrderRequest(List<OrderDetail> foodList) {
List<OrderDetail> newFoodList = new ArrayList<>();
newFoodList.addAll(foodList);
if (GsaCloudApplication.androidSetting.isMergeSendFood()) {
//合并未送单主食品
mergeMainFoodNumber(newFoodList);
}
AddOrderRequest request = new AddOrderRequest(); AddOrderRequest request = new AddOrderRequest();
request.setMaps(orderDetailBeanToAddFoodRequest(foodList)); request.setMaps(orderDetailBeanToAddFoodRequest(newFoodList));
request.setOrderId(MyOrderManage.getInstance().getOrderId()); request.setOrderId(MyOrderManage.getInstance().getOrderId());
request.setTableId(OpenTableManage.getDefault().getTableBean().getId()); request.setTableId(OpenTableManage.getDefault().getTableBean().getId());
Double rounding = getRounding(); Double rounding = getRounding();
...@@ -758,6 +772,7 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas ...@@ -758,6 +772,7 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas
return request; return request;
} }
protected Map<Long, List<OrderBean.OrderDetailsBean>> orderDetailBeanToFoodRequest(List<OrderDetail> foodList) { protected Map<Long, List<OrderBean.OrderDetailsBean>> orderDetailBeanToFoodRequest(List<OrderDetail> foodList) {
Map<Long, List<OrderBean.OrderDetailsBean>> orderDetails = new HashMap<>(); Map<Long, List<OrderBean.OrderDetailsBean>> orderDetails = new HashMap<>();
if (foodList != null) { if (foodList != null) {
...@@ -906,6 +921,54 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas ...@@ -906,6 +921,54 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas
} }
/** /**
* 合并新下单主食品数量
*
* @param foodList
*/
private void mergeMainFoodNumber(List<OrderDetail> foodList) {
for (int i = 0; i < foodList.size(); i++) {
OrderDetail orderFood = foodList.get(i);
if (!orderFood.isNew() || orderFood.getItemType() != 1)
continue;
if (hasChildFood(foodList, orderFood))
continue;
//合并总数量
int mergeNum = orderFood.getNumber();
for (int j = i; j < foodList.size(); j++) {
if (!orderFood.isNew() || i == j)
continue;
OrderDetail mergeFood = foodList.get(j);
boolean canMerge = mergeFood.getItemType() == 1 && mergeFood.getProductId() == orderFood.getProductId() && !hasChildFood(foodList, mergeFood);
if (canMerge) {
//合并数量
mergeNum += mergeFood.getNumber();
//移除已合并的食品
foodList.remove(j);
}
}
orderFood.setNumber(mergeNum);
}
}
/**
* 是否包含子项
*
* @param orderDetailList
* @param orderDetail
* @return
*/
private boolean hasChildFood(List<OrderDetail> orderDetailList, OrderDetail orderDetail) {
if (orderDetail.getItemType() == 3)
return false;
for (int i = 0; i < orderDetailList.size(); i++) {
if (orderDetailList.get(i).getParentIndex() == orderDetail.getMyIndex()) {
return true;
}
}
return false;
}
/**
* 根據主食品ID獲取對應折扣ID * 根據主食品ID獲取對應折扣ID
* *
* @param orderItems * @param orderItems
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/OrderContentPresenter.java
...@@ -385,7 +385,7 @@ public class OrderContentPresenter extends BaseOrderPresenter<OrderContentContra ...@@ -385,7 +385,7 @@ public class OrderContentPresenter extends BaseOrderPresenter<OrderContentContra
// }); // });
} }
public void printOrder(int tableId, boolean isSend) { public void printOrder(long tableId, boolean isSend) {
RequestBody requestBody = new FormBody.Builder() RequestBody requestBody = new FormBody.Builder()
.add("tableId", tableId + "") .add("tableId", tableId + "")
.build(); .build();
...@@ -530,7 +530,7 @@ public class OrderContentPresenter extends BaseOrderPresenter<OrderContentContra ...@@ -530,7 +530,7 @@ public class OrderContentPresenter extends BaseOrderPresenter<OrderContentContra
}); });
} }
public void getTable(int tableId, TextView tv_table_name) { public void getTable(long tableId, TextView tv_table_name) {
mModel.getTable(tableId) mModel.getTable(tableId)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.doOnSubscribe(disposable -> mRootView.showLoading(null)) .doOnSubscribe(disposable -> mRootView.showLoading(null))
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/TablePresenter.java
...@@ -6,12 +6,15 @@ import android.view.View; ...@@ -6,12 +6,15 @@ import android.view.View;
import com.billy.cc.core.component.CC; import com.billy.cc.core.component.CC;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication; import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication;
import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.base.common.bean.OrderBean; import com.gingersoft.gsa.cloud.base.common.bean.OrderBean;
import com.gingersoft.gsa.cloud.base.common.bean.OrderDetail; import com.gingersoft.gsa.cloud.base.common.bean.OrderDetail;
import com.gingersoft.gsa.cloud.base.common.bean.TableBean; import com.gingersoft.gsa.cloud.base.common.bean.TableBean;
import com.gingersoft.gsa.cloud.base.common.bean.TableExtBean;
import com.gingersoft.gsa.cloud.base.common.bean.mealManage.MyOrderManage; import com.gingersoft.gsa.cloud.base.common.bean.mealManage.MyOrderManage;
import com.gingersoft.gsa.cloud.base.common.bean.mealManage.OpenTableManage; import com.gingersoft.gsa.cloud.base.common.bean.mealManage.OpenTableManage;
import com.gingersoft.gsa.cloud.base.utils.CommonConfiguration; import com.gingersoft.gsa.cloud.base.utils.CommonConfiguration;
import com.gingersoft.gsa.cloud.base.utils.JsonUtils;
import com.gingersoft.gsa.cloud.base.utils.time.TimeUtils; import com.gingersoft.gsa.cloud.base.utils.time.TimeUtils;
import com.gingersoft.gsa.cloud.base.utils.toast.ToastUtils; import com.gingersoft.gsa.cloud.base.utils.toast.ToastUtils;
import com.gingersoft.gsa.cloud.constans.GoldConstants; import com.gingersoft.gsa.cloud.constans.GoldConstants;
...@@ -26,10 +29,15 @@ import com.gingersoft.gsa.cloud.table.R; ...@@ -26,10 +29,15 @@ import com.gingersoft.gsa.cloud.table.R;
import com.gingersoft.gsa.cloud.table.app.TableOperatTypeConstant; import com.gingersoft.gsa.cloud.table.app.TableOperatTypeConstant;
import com.gingersoft.gsa.cloud.table.mvp.contract.TableContract; import com.gingersoft.gsa.cloud.table.mvp.contract.TableContract;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.BaseRespose; import com.gingersoft.gsa.cloud.table.mvp.model.bean.BaseRespose;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.FoodReason;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.SplitTableNumber;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.TableDetail; import com.gingersoft.gsa.cloud.table.mvp.model.bean.TableDetail;
import com.gingersoft.gsa.cloud.table.mvp.model.utils.OrderAssemblyUtil; import com.gingersoft.gsa.cloud.table.mvp.model.utils.OrderAssemblyUtil;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.TableActivity; import com.gingersoft.gsa.cloud.table.mvp.ui.activity.TableActivity;
import com.gingersoft.gsa.cloud.table.mvp.ui.adapter.BottomFunctionAdapter; import com.gingersoft.gsa.cloud.table.mvp.ui.adapter.BottomFunctionAdapter;
import com.gingersoft.gsa.cloud.table.mvp.ui.widget.CancelFoodDialog;
import com.gingersoft.gsa.cloud.table.mvp.ui.widget.SplitTableDialog;
import com.gingersoft.gsa.cloud.ui.widget.dialog.BaseRetryDialog;
import com.gingersoft.gsa.cloud.ui.widget.dialog.CommonTipDialog; import com.gingersoft.gsa.cloud.ui.widget.dialog.CommonTipDialog;
import com.jess.arms.base.DefaultAdapter; import com.jess.arms.base.DefaultAdapter;
import com.jess.arms.di.scope.ActivityScope; import com.jess.arms.di.scope.ActivityScope;
...@@ -113,12 +121,12 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont ...@@ -113,12 +121,12 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont
* 选中操作的台名、id * 选中操作的台名、id
*/ */
private String originalTableName = ""; private String originalTableName = "";
private int originalTableId; private long originalTableId;
/** /**
* 转台需要转到台名、id * 转台需要转到台名、id
*/ */
private String targetTableName = ""; private String targetTableName = "";
private int targetTableId; private long targetTableId;
@Inject @Inject
...@@ -173,24 +181,24 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont ...@@ -173,24 +181,24 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont
// //上菜紙 // //上菜紙
// mRootView.setCurrentOperatType(TableOperatTypeConstant.print_parper_2); // mRootView.setCurrentOperatType(TableOperatTypeConstant.print_parper_2);
// } // }
switch (position) { switch (position) {
case 0: case 0:
//重置 //重置
mRootView.setCurrentOperatType(TableOperatTypeConstant.init_table_3); mRootView.setCurrentOperatType(TableOperatTypeConstant.init_table_3);
break; break;
case 1: case 1:
//轉檯 //轉檯
mRootView.setCurrentOperatType(TableOperatTypeConstant.move_table_4); mRootView.setCurrentOperatType(TableOperatTypeConstant.move_table_4);
break; break;
case 2: case 2:
//分檯 //分檯
mRootView.setCurrentOperatType(TableOperatTypeConstant.splite_table_1); mRootView.setCurrentOperatType(TableOperatTypeConstant.splite_table_1);
break; break;
case 3: case 3:
//上菜紙 //上菜紙
mRootView.setCurrentOperatType(TableOperatTypeConstant.print_parper_2); mRootView.setCurrentOperatType(TableOperatTypeConstant.print_parper_2);
break; break;
} }
} }
}); });
} }
...@@ -293,7 +301,7 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont ...@@ -293,7 +301,7 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont
}); });
} }
public void loadOrderToPrint(int tableId, Long orderId) { public void loadOrderToPrint(long tableId, Long orderId) {
if (orderId == null) if (orderId == null)
return; return;
mModel.getOrderById(orderId) mModel.getOrderById(orderId)
...@@ -363,9 +371,10 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont ...@@ -363,9 +371,10 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont
}); });
} }
public void openTable(int tableId) { public void openTable(long tableId, String tableNumber) {
RequestBody requestBody = new FormBody.Builder() RequestBody requestBody = new FormBody.Builder()
.add("id", String.valueOf(tableId)) .add("id", String.valueOf(tableId))
.add("tableNumber", tableNumber)
.build(); .build();
mModel.openTable(requestBody) mModel.openTable(requestBody)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
...@@ -384,6 +393,7 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont ...@@ -384,6 +393,7 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont
TableBean.DataBean dataBean = getTableById(tableId); TableBean.DataBean dataBean = getTableById(tableId);
TableBean.DataBean openTableBean = null; TableBean.DataBean openTableBean = null;
if (dataBean != null) { if (dataBean != null) {
dataBean.setTableNumber(dataBean.getTableNumber());
openTableBean = new TableBean.DataBean(dataBean); openTableBean = new TableBean.DataBean(dataBean);
} }
...@@ -462,7 +472,7 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont ...@@ -462,7 +472,7 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont
return 0; return 0;
} }
public void getTable(int tableId) { public void getTable(long tableId) {
mModel.getTable(tableId) mModel.getTable(tableId)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.doOnSubscribe(disposable -> mRootView.showLoading(null)) .doOnSubscribe(disposable -> mRootView.showLoading(null))
...@@ -509,7 +519,7 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont ...@@ -509,7 +519,7 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont
}); });
} }
public void turnTable(int originalTableId, int targetTableId, boolean isMergeTable) { public void turnTable(long originalTableId, long targetTableId, boolean isMergeTable) {
RequestBody requestBody = new FormBody.Builder() RequestBody requestBody = new FormBody.Builder()
.add("id", String.valueOf(originalTableId)) .add("id", String.valueOf(originalTableId))
...@@ -543,7 +553,7 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont ...@@ -543,7 +553,7 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont
}); });
} }
public void initTable(int tableId, boolean showMessage) { public void initTable(long tableId, boolean showMessage) {
RequestBody requestBody = new FormBody.Builder() RequestBody requestBody = new FormBody.Builder()
.add("id", tableId + "") .add("id", tableId + "")
...@@ -590,6 +600,91 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont ...@@ -590,6 +600,91 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont
}); });
} }
public void getSplitTables(long tableId) {
SplitTableDialog splitTableDialog = IActivity.getSplitTableDialog();
mModel.getSplitTables(tableId)
.subscribeOn(Schedulers.io())
.doOnSubscribe(disposable -> mRootView.showLoading(null))
.subscribeOn(AndroidSchedulers.mainThread())
.observeOn(AndroidSchedulers.mainThread())
.doAfterTerminate(() -> mRootView.hideLoading())
.compose(RxLifecycleUtils.bindToLifecycle(mRootView))
.subscribe(new ErrorHandleSubscriber<BaseResult>(mErrorHandler) {
@Override
public void onSubscribe(Disposable d) {
super.onSubscribe(d);
splitTableDialog.setProgressVisibility(true);
}
@Override
public void onNext(@NonNull BaseResult info) {
if (info != null && info.isSuccess()) {
if (info.getData() != null) {
TableExtBean tableExtBean = JsonUtils.parseObject(info.getData(), TableExtBean.class);
List<TableBean.DataBean> dataBeanList = assemblyTableExt(tableExtBean.getRestaurantTable(), tableExtBean.getRestaurantTableExtList());
splitTableDialog.addItems(dataBeanList);
splitTableDialog.notifyDataSetChanged();
} else {
splitTableDialog.showEmptyView(true, 0, null);
}
} else {
splitTableDialog.showEmptyView(false, 0, null);
}
splitTableDialog.setProgressVisibility(false);
}
@Override
public void onError(Throwable t) {
super.onError(t);
splitTableDialog.setProgressVisibility(false);
splitTableDialog.showEmptyView(false, 0, t);
}
private List<TableBean.DataBean> assemblyTableExt(TableBean.DataBean mainTable, List<TableExtBean.DataBean> restaurantTableExtList) {
List<TableBean.DataBean> dataBeans = new ArrayList<>();
//添加主檯
dataBeans.add(mainTable);
//添加分檯
for (TableExtBean.DataBean dataBean : restaurantTableExtList) {
dataBeans.add(TableBean.splitTableTransformTable(mainTable, dataBean));
}
return dataBeans;
}
});
}
public void splitTable(long tableId) {
mModel.splitTable(tableId)
.subscribeOn(Schedulers.io())
.doOnSubscribe(disposable -> mRootView.showLoading(null))
.subscribeOn(AndroidSchedulers.mainThread())
.observeOn(AndroidSchedulers.mainThread())
.doAfterTerminate(() -> mRootView.hideLoading())
.compose(RxLifecycleUtils.bindToLifecycle(mRootView))
.subscribe(new ErrorHandleSubscriber<BaseResult>(mErrorHandler) {
@Override
public void onNext(@NonNull BaseResult result) {
if (result.isSuccess()) {
if (result.getData() != null) {
SplitTableNumber splitTable = JsonUtils.parseObject(result.getData(), SplitTableNumber.class);
//分檯编号
String splitNumber = splitTable.getTableNumber();
//分檯开檯
openTable(tableId, splitNumber);
}
} else {
mRootView.showMessage(result.getErrMsg());
}
}
});
}
public void loadOrderList(long orderId, boolean isPrintParper) { public void loadOrderList(long orderId, boolean isPrintParper) {
RequestBody requestBody = new FormBody.Builder() RequestBody requestBody = new FormBody.Builder()
...@@ -635,13 +730,14 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont ...@@ -635,13 +730,14 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont
List<TableBean.DataBean> filterTableBeanList = new ArrayList<>(); List<TableBean.DataBean> filterTableBeanList = new ArrayList<>();
//如果是餐檯操作過一遍筛选 //如果是餐檯操作過一遍筛选
switch (mCurrentOperatType) { switch (mCurrentOperatType) {
// case TableOperatTypeConstant.splite_table_1: case TableOperatTypeConstant.splite_table_1:
// for (int i = 0; i < datasBeans.size(); i++) { for (int i = 0; i < mTableList.size(); i++) {
// if (datasBeans.get(i).getStatus() != 0 || datasBeans.get(i).getSplitStatus() == 1 ? true : false) { // if (mTableList.get(i).getStatus() != 0 || mTableList.get(i).getSplitStatus() == 1 ? true : false) {
// mTableList.add(datasBeans.get(i)); if (mTableList.get(i).getStatus() != 0) {
// } filterTableBeanList.add(mTableList.get(i));
// } }
// break; }
break;
case TableOperatTypeConstant.print_parper_2: case TableOperatTypeConstant.print_parper_2:
for (int i = 0; i < mTableList.size(); i++) { for (int i = 0; i < mTableList.size(); i++) {
if (mTableList.get(i).getStatus() != 0) { if (mTableList.get(i).getStatus() != 0) {
...@@ -744,7 +840,7 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont ...@@ -744,7 +840,7 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont
targetTableId = 0; targetTableId = 0;
} }
private TableBean.DataBean getTableById(int id) { private TableBean.DataBean getTableById(long id) {
for (int i = 0; i < mTableList.size(); i++) { for (int i = 0; i < mTableList.size(); i++) {
TableBean.DataBean dataBean = mTableList.get(i); TableBean.DataBean dataBean = mTableList.get(i);
if (dataBean.getId() == id) if (dataBean.getId() == id)
...@@ -816,7 +912,7 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont ...@@ -816,7 +912,7 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont
this.originalTableName = originalTableName; this.originalTableName = originalTableName;
} }
public int getOriginalTableId() { public long getOriginalTableId() {
return originalTableId; return originalTableId;
} }
...@@ -832,7 +928,7 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont ...@@ -832,7 +928,7 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont
this.targetTableName = targetTableName; this.targetTableName = targetTableName;
} }
public int getTargetTableId() { public long getTargetTableId() {
return targetTableId; return targetTableId;
} }
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/MealStandActivity.java
...@@ -345,7 +345,11 @@ public class MealStandActivity extends BaseFragmentActivity<MealStandPresenter> ...@@ -345,7 +345,11 @@ public class MealStandActivity extends BaseFragmentActivity<MealStandPresenter>
private void initOrderDetail() { private void initOrderDetail() {
TableBean.DataBean dataBean = OpenTableManage.getDefault().getTableBean(); TableBean.DataBean dataBean = OpenTableManage.getDefault().getTableBean();
if (dataBean != null) { if (dataBean != null) {
btn_table.setText(dataBean.getTableName()); if (TextUtils.isEmpty(dataBean.getTableNumber())) {
btn_table.setText(dataBean.getTableName());
} else {
btn_table.setText(dataBean.getTableName());
}
btn_numberman.setText("人數:" + OpenTableManage.getDefault().getPeopleNumber() + ""); btn_numberman.setText("人數:" + OpenTableManage.getDefault().getPeopleNumber() + "");
} }
} }
...@@ -676,6 +680,10 @@ public class MealStandActivity extends BaseFragmentActivity<MealStandPresenter> ...@@ -676,6 +680,10 @@ public class MealStandActivity extends BaseFragmentActivity<MealStandPresenter>
if (mPresenter.getSelectMealAdapter().getSelectedMode() == SelectMealAdapter.MULTIPLE_SELECTED) if (mPresenter.getSelectMealAdapter().getSelectedMode() == SelectMealAdapter.MULTIPLE_SELECTED)
return; return;
mPresenter.deleteFoodItem(1); mPresenter.deleteFoodItem(1);
showViewModeVisibility(MealConstant.food_group_ViewMode, MealConstant.food_ViewMode);
SPUtils.put(this, MealConstant.EXIT_IS_PLU_MODE, false);
setPluMode();
} else if (id == R.id.btn_send_order) { } else if (id == R.id.btn_send_order) {
mPresenter.sendOrder(false); mPresenter.sendOrder(false);
} else if (id == R.id.fl_order_content) { } else if (id == R.id.fl_order_content) {
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/TableActivity.java
...@@ -9,6 +9,7 @@ import android.widget.ImageView; ...@@ -9,6 +9,7 @@ import android.widget.ImageView;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.SimpleAdapter; import android.widget.SimpleAdapter;
import android.widget.TextView; import android.widget.TextView;
import com.billy.cc.core.component.CC; import com.billy.cc.core.component.CC;
import com.gingersoft.gsa.cloud.base.common.bean.mealManage.MyOrderManage; import com.gingersoft.gsa.cloud.base.common.bean.mealManage.MyOrderManage;
import com.gingersoft.gsa.cloud.base.common.bean.mealManage.OpenTableManage; import com.gingersoft.gsa.cloud.base.common.bean.mealManage.OpenTableManage;
...@@ -22,6 +23,8 @@ import com.gingersoft.gsa.cloud.base.common.bean.TableBean; ...@@ -22,6 +23,8 @@ import com.gingersoft.gsa.cloud.base.common.bean.TableBean;
import com.gingersoft.gsa.cloud.table.mvp.presenter.OrderContentPresenter; import com.gingersoft.gsa.cloud.table.mvp.presenter.OrderContentPresenter;
import com.gingersoft.gsa.cloud.table.mvp.ui.fragment.AllTableFragment; import com.gingersoft.gsa.cloud.table.mvp.ui.fragment.AllTableFragment;
import com.gingersoft.gsa.cloud.table.mvp.ui.fragment.InputTableFragment; import com.gingersoft.gsa.cloud.table.mvp.ui.fragment.InputTableFragment;
import com.gingersoft.gsa.cloud.table.mvp.ui.widget.SplitTableDialog;
import com.gingersoft.gsa.cloud.ui.widget.dialog.BaseRetryDialog;
import com.gingersoft.gsa.cloud.ui.widget.dialog.CommonTipDialog; import com.gingersoft.gsa.cloud.ui.widget.dialog.CommonTipDialog;
import com.gingersoft.gsa.cloud.ui.widget.dialog.LoadingDialog; import com.gingersoft.gsa.cloud.ui.widget.dialog.LoadingDialog;
import com.jess.arms.base.BaseActivity; import com.jess.arms.base.BaseActivity;
...@@ -118,6 +121,10 @@ public class TableActivity extends BaseFragmentActivity<TablePresenter> implemen ...@@ -118,6 +121,10 @@ public class TableActivity extends BaseFragmentActivity<TablePresenter> implemen
private String[] mTabTitles = {"編號", "全部", "狀態:全部"}; private String[] mTabTitles = {"編號", "全部", "狀態:全部"};
/** /**
* 分檯弹窗
*/
private SplitTableDialog mSplitTableDialog;
/**
* 切換餐檯狀態下拉框 * 切換餐檯狀態下拉框
*/ */
private QMUIPopup mTableStatusPopup; private QMUIPopup mTableStatusPopup;
...@@ -265,6 +272,11 @@ public class TableActivity extends BaseFragmentActivity<TablePresenter> implemen ...@@ -265,6 +272,11 @@ public class TableActivity extends BaseFragmentActivity<TablePresenter> implemen
} }
@Override @Override
public void returnSplitTableList(List<TableBean.DataBean> dataBeanList) {
}
@Override
public AllTableFragment getCurrentTableFragment() { public AllTableFragment getCurrentTableFragment() {
switch (mCurrentPageIndex) { switch (mCurrentPageIndex) {
case FUNCTION_STATE_TABLE: case FUNCTION_STATE_TABLE:
...@@ -280,7 +292,8 @@ public class TableActivity extends BaseFragmentActivity<TablePresenter> implemen ...@@ -280,7 +292,8 @@ public class TableActivity extends BaseFragmentActivity<TablePresenter> implemen
return; return;
switch (mPresenter.getCurrentChooseOperatType()) { switch (mPresenter.getCurrentChooseOperatType()) {
case TableOperatTypeConstant.splite_table_1: case TableOperatTypeConstant.splite_table_1:
setOperatContentText(dataBean.getTableName());
mPresenter.splitTable(dataBean.getId());
break; break;
case TableOperatTypeConstant.print_parper_2: case TableOperatTypeConstant.print_parper_2:
setOperatContentText(dataBean.getTableName()); setOperatContentText(dataBean.getTableName());
...@@ -291,7 +304,7 @@ public class TableActivity extends BaseFragmentActivity<TablePresenter> implemen ...@@ -291,7 +304,7 @@ public class TableActivity extends BaseFragmentActivity<TablePresenter> implemen
mPresenter.showOperatTipDialog(dataBean); mPresenter.showOperatTipDialog(dataBean);
break; break;
case TableOperatTypeConstant.move_table_4: case TableOperatTypeConstant.move_table_4:
if(mPresenter.getOriginalTableId() == dataBean.getId()){ if (mPresenter.getOriginalTableId() == dataBean.getId()) {
CommonTipDialog.showCancelDialog(this, "相同檯不能转檯", OrderContentPresenter.class, mPresenter, "", null, null); CommonTipDialog.showCancelDialog(this, "相同檯不能转檯", OrderContentPresenter.class, mPresenter, "", null, null);
return; return;
} }
...@@ -302,7 +315,11 @@ public class TableActivity extends BaseFragmentActivity<TablePresenter> implemen ...@@ -302,7 +315,11 @@ public class TableActivity extends BaseFragmentActivity<TablePresenter> implemen
break; break;
default: default:
mPresenter.openTable(dataBean.getId()); if (dataBean.getStatus() == 4) {
showSplitTableDialog(dataBean.getId());
} else {
mPresenter.openTable(dataBean.getId(), "");
}
break; break;
} }
} }
...@@ -378,10 +395,29 @@ public class TableActivity extends BaseFragmentActivity<TablePresenter> implemen ...@@ -378,10 +395,29 @@ public class TableActivity extends BaseFragmentActivity<TablePresenter> implemen
killMyself(); killMyself();
} }
}); });
mPresenter.initTableParameter(); mPresenter.initTableParameter();
mPresenter.filterTableByOperatType(); mPresenter.filterTableByOperatType();
}
private void showSplitTableDialog(long tableId) {
if (mSplitTableDialog == null) {
mSplitTableDialog = new SplitTableDialog(this);
mSplitTableDialog.setOnClickListener(new SplitTableDialog.OnClickListener() {
@Override
public void onItemClick(SplitTableDialog dialog,TableBean.DataBean item, int position) {
dialog.dismiss();
mPresenter.openTable(item.getId(),item.getTableNumber());
}
});
mSplitTableDialog.setOnRetryListener(new BaseRetryDialog.OnRetryListener() {
@Override
public void onRetryClick() {
mPresenter.getSplitTables(tableId);
}
});
}
mSplitTableDialog.show();
mPresenter.getSplitTables(tableId);
} }
@Override @Override
...@@ -629,4 +665,8 @@ public class TableActivity extends BaseFragmentActivity<TablePresenter> implemen ...@@ -629,4 +665,8 @@ public class TableActivity extends BaseFragmentActivity<TablePresenter> implemen
public void setCurrentSelectTableStatus(int mCurrentSelectTableStatus) { public void setCurrentSelectTableStatus(int mCurrentSelectTableStatus) {
this.mCurrentSelectTableStatus = mCurrentSelectTableStatus; this.mCurrentSelectTableStatus = mCurrentSelectTableStatus;
} }
public SplitTableDialog getSplitTableDialog() {
return mSplitTableDialog;
}
} }
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/adapter/meal/SelectMealAdapter.java
...@@ -647,7 +647,7 @@ public class SelectMealAdapter extends DefaultAdapter<OrderDetail> { ...@@ -647,7 +647,7 @@ public class SelectMealAdapter extends DefaultAdapter<OrderDetail> {
return false; return false;
} }
private boolean hasChildFood(OrderDetail orderDetail) { public boolean hasChildFood(OrderDetail orderDetail) {
if (orderDetail.getItemType() == 3) if (orderDetail.getItemType() == 3)
return false; return false;
for (int i = 0; i < mInfos.size(); i++) { for (int i = 0; i < mInfos.size(); i++) {
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/widget/SplitTableDialog.java 0 → 100644
package com.gingersoft.gsa.cloud.table.mvp.ui.widget;
import android.app.Dialog;
import android.content.Context;
import android.os.Bundle;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.ProgressBar;
import com.gingersoft.gsa.cloud.base.common.bean.TableBean;
import com.gingersoft.gsa.cloud.database.bean.Discount;
import com.gingersoft.gsa.cloud.table.R;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.TableActivity;
import com.gingersoft.gsa.cloud.table.mvp.ui.adapter.TableAdapter;
import com.gingersoft.gsa.cloud.table.mvp.ui.adapter.meal.DiscountAdapter;
import com.gingersoft.gsa.cloud.ui.widget.dialog.BaseRetryDialog;
import com.jess.arms.base.DefaultAdapter;
import com.jess.arms.utils.DeviceUtils;
import com.qmuiteam.qmui.layout.QMUILinearLayout;
import com.qmuiteam.qmui.util.QMUIDisplayHelper;
import com.qmuiteam.qmui.widget.QMUIEmptyView;
import com.qmuiteam.qmui.widget.QMUITopBar;
import java.util.ArrayList;
import java.util.List;
import androidx.annotation.NonNull;
import androidx.core.content.ContextCompat;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
/**
* 作者：ELEGANT_BIN
* 版本：1.6.0
* 创建日期：2020-07-29
* 修订历史：2020-07-29
* 描述：
*/
public class SplitTableDialog extends BaseRetryDialog {
private static final String TAG = "SplitTableDialog";
private Context mContext;
private SplitTableDialog mDialog;
private int spanCount = 3;
private int mRadius;
private float mShadowAlpha = 0.25f;
private int mShadowElevationDp = 14;
private int mBagcolor;
private List<TableBean.DataBean> mItems;
private TableAdapter mAdapter;
private QMUITopBar mTopBar;
private QMUILinearLayout ll_container;
private QMUIEmptyView mEmptyView;
private ProgressBar progress;
private RecyclerView recycler_table;
private ImageView btn_close;
public SplitTableDialog(@NonNull Context context) {
super(context);
mContext = context;
mItems = new ArrayList<>();
mRadius = QMUIDisplayHelper.dp2px(mContext, 8);
}
public void addItem(TableBean.DataBean item) {
mItems.add(item);
}
public void addItems(List<TableBean.DataBean> items) {
if (mItems.size() > 0)
mItems.clear();
mItems.addAll(items);
}
public void notifyDataSetChanged(){
mAdapter.notifyDataSetChanged();
}
public SplitTableDialog build() {
if (mDialog != null) {
return mDialog;
}
mDialog = new SplitTableDialog(mContext);
View contentView = buildViews();
int screenHeight = (int) (QMUIDisplayHelper.getScreenHeight(mContext) * 0.7);
mDialog.setContentView(contentView, new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, screenHeight));
return mDialog;
}
private View buildViews() {
View view = View.inflate(mContext, getContentViewLayoutId(), null);
mTopBar = view.findViewById(R.id.topbar);
recycler_table = view.findViewById(R.id.recycler_table);
ll_container = view.findViewById(R.id.ll_container);
mEmptyView = view.findViewById(R.id.emptyView);
progress = view.findViewById(R.id.progress);
// btn_close = view.findViewById(R.id.btn_close);
// btn_close.setOnClickListener(new View.OnClickListener() {
// @Override
// public void onClick(View v) {
// closeDialog() ;
// }
// });
ll_container.setRadiusAndShadow(mRadius, QMUIDisplayHelper.dp2px(mContext, mShadowElevationDp), mShadowAlpha);
initTopbar();
initTableRecycleView();
return view;
}
private void initTopbar() {
if (mBagcolor != 0) {
mTopBar.setBackgroundColor(mBagcolor);
} else {
mTopBar.setBackgroundColor(ContextCompat.getColor(mContext, R.color.theme_color));
}
mTopBar.setTitle("分檯");
}
private void initTableRecycleView() {
if (mAdapter == null) {
mAdapter = new TableAdapter(mContext, mItems, DeviceUtils.getScreenHeight(mContext), TableActivity.FUNCTION_ALL_TABLE);
}
mAdapter.setOnItemClickListener(new DefaultAdapter.OnRecyclerViewItemClickListener() {
@Override
public void onItemClick(View view, int viewType, Object data, int position) {
if (onClickListener != null) {
onClickListener.onItemClick(SplitTableDialog.this,(TableBean.DataBean) data, position);
}
// closeDialog();
}
});
recycler_table.setLayoutManager(createLayoutManager());
recycler_table.setAdapter(mAdapter);
}
private RecyclerView.LayoutManager createLayoutManager() {
return new GridLayoutManager(mContext, spanCount, LinearLayoutManager.VERTICAL, false) {
@Override
public RecyclerView.LayoutParams generateDefaultLayoutParams() {
return new RecyclerView.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
}
};
}
public void showEmptyView(boolean isSuccess, int size, Throwable t) {
showEmptyView(isSuccess, size, t,mEmptyView,recycler_table);
}
public void setProgressVisibility(boolean show) {
progress.setVisibility(show ? View.VISIBLE : View.INVISIBLE);
}
public void closeDialog() {
mDialog.dismiss();
}
public void setTopBarBagcolor(int mBagcolor) {
this.mBagcolor = mBagcolor;
}
protected int getContentViewLayoutId() {
return R.layout.table_dialog_split;
}
private SplitTableDialog.OnClickListener onClickListener;
public void setOnClickListener(SplitTableDialog.OnClickListener onClickListener) {
this.onClickListener = onClickListener;
}
public interface OnClickListener {
void onItemClick(SplitTableDialog dialog,TableBean.DataBean item, int position);
}
}
table-module/src/main/res/layout/table_dialog_split.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<com.qmuiteam.qmui.layout.QMUILinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/ll_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/theme_white_color"
android:orientation="vertical">
<com.qmuiteam.qmui.widget.QMUITopBar
android:id="@+id/topbar"
android:layout_width="match_parent"
android:layout_height="?attr/qmui_topbar_height"
app:qmui_topbar_title_color="@color/theme_white_color" />
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.qmuiteam.qmui.widget.QMUIEmptyView
android:id="@+id/emptyView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true" />
<ProgressBar
android:id="@+id/progress"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:visibility="invisible"/>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler_table"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
app:spanCount="3" />
</FrameLayout>
<!-- <ImageView-->
<!-- android:id="@+id/btn_close"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_margin="@dimen/dp_20"-->
<!-- android:src="@drawable/icon_dialog_close" />-->
</com.qmuiteam.qmui.layout.QMUILinearLayout>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment