Skip to content

S
supplier
Commit ea4cdbc5 by 宁斌
Options

1、使用會員未送單，結賬前先送單

parent 9f8088c0
Showing with 365 additions and 158 deletions
base-module/src/main/java/com/gingersoft/gsa/cloud/base/application/GsaCloudApplication.java
...@@ -8,8 +8,6 @@ import android.content.res.Configuration; ...@@ -8,8 +8,6 @@ import android.content.res.Configuration;
import android.os.Build; import android.os.Build;
import android.os.RemoteException; import android.os.RemoteException;
import androidx.annotation.NonNull;
import com.billy.cc.core.component.CC; import com.billy.cc.core.component.CC;
import com.elvishew.xlog.LogConfiguration; import com.elvishew.xlog.LogConfiguration;
import com.elvishew.xlog.LogLevel; import com.elvishew.xlog.LogLevel;
...@@ -47,6 +45,11 @@ import com.scwang.smartrefresh.layout.header.ClassicsHeader; ...@@ -47,6 +45,11 @@ import com.scwang.smartrefresh.layout.header.ClassicsHeader;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import androidx.annotation.NonNull;
import io.reactivex.Observable;
import io.reactivex.ObservableEmitter;
import io.reactivex.ObservableOnSubscribe;
import io.reactivex.schedulers.Schedulers;
import me.jessyan.autosize.AutoSize; import me.jessyan.autosize.AutoSize;
import me.jessyan.autosize.AutoSizeConfig; import me.jessyan.autosize.AutoSizeConfig;
import me.jessyan.autosize.onAdaptListener; import me.jessyan.autosize.onAdaptListener;
...@@ -140,13 +143,16 @@ public class GsaCloudApplication extends BaseApplication { ...@@ -140,13 +143,16 @@ public class GsaCloudApplication extends BaseApplication {
} }
private void initExpandInfo() { private void initExpandInfo() {
new Thread(() -> { Observable.create(new ObservableOnSubscribe<Void>() {
ExpandInfoDaoUtils expandInfoDaoUtils = new ExpandInfoDaoUtils(getAppContext()); @Override
List<ExpandInfo> expandInfos = expandInfoDaoUtils.queryAllExpandInfo(); public void subscribe(ObservableEmitter<Void> emitter) throws Exception {
if (expandInfos != null) { ExpandInfoDaoUtils expandInfoDaoUtils = new ExpandInfoDaoUtils(getAppContext());
RestaurantExpandInfoUtils.setCommonExpandInfo(expandInfos); List<ExpandInfo> expandInfos = expandInfoDaoUtils.queryAllExpandInfo();
if (expandInfos != null) {
RestaurantExpandInfoUtils.setCommonExpandInfo(expandInfos);
}
} }
}).start(); }).subscribeOn(Schedulers.io()).subscribe();//在IO线程执行数据库处理操作
} }
public Activity getCurrentActivity() { public Activity getCurrentActivity() {
......
base-module/src/main/java/com/gingersoft/gsa/cloud/base/common/bean/table/TableBean.java
...@@ -165,6 +165,7 @@ public class TableBean { ...@@ -165,6 +165,7 @@ 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.splitStatus = dataBean.splitStatus;
this.tableNumber = dataBean.tableNumber; this.tableNumber = dataBean.tableNumber;
} }
} }
...@@ -185,6 +186,7 @@ public class TableBean { ...@@ -185,6 +186,7 @@ public class TableBean {
tableBean.setUseStatus(dataBean.getInUse()); tableBean.setUseStatus(dataBean.getInUse());
tableBean.setTableNumber(dataBean.getTableNumber()); tableBean.setTableNumber(dataBean.getTableNumber());
tableBean.setServiceCharge(dataBean.getServiceCharge()); tableBean.setServiceCharge(dataBean.getServiceCharge());
tableBean.setSplitStatus(0);
return tableBean; return tableBean;
} }
...@@ -204,6 +206,7 @@ public class TableBean { ...@@ -204,6 +206,7 @@ public class TableBean {
tableBean.setUseStatus(dataBean.getInUse()); tableBean.setUseStatus(dataBean.getInUse());
tableBean.setTableNumber(dataBean.getTableNumber()); tableBean.setTableNumber(dataBean.getTableNumber());
tableBean.setServiceCharge(dataBean.getServiceCharge()); tableBean.setServiceCharge(dataBean.getServiceCharge());
tableBean.setSplitStatus(0);
return tableBean; return tableBean;
} }
} }
base-module/src/main/java/com/gingersoft/gsa/cloud/base/utils/FileUtils.java
...@@ -29,13 +29,20 @@ import java.io.InputStreamReader; ...@@ -29,13 +29,20 @@ import java.io.InputStreamReader;
*/ */
public class FileUtils { public class FileUtils {
public static String FirstFolder = "GSACloud";//一级目录 //一级目录
public static String file = "file";//文件文件夹 public static String FirstFolder = "GSACloud";
public static String Image = "image";//图片文件夹 //文件文件夹
public static String Log = "xLog";//日志存储 public static String file = "file";
public static String ActionLog = "actionLog";//操作日志 //图片文件夹
public static String ErrorLog = "errorLog";//错误日志存储 public static String Image = "image";
public static String APK = "Download";//安装包目录放在系统目录 //日志存储
public static String Log = "xLog";
//操作日志
public static String ActionLog = "actionLog";
//错误日志存储
public static String ErrorLog = "errorLog";
//安装包目录放在系统目录
public static String APK = "Download";
/*ALBUM_PATH取得机器的SD卡位置，File.separator为分隔符“/”*/ /*ALBUM_PATH取得机器的SD卡位置，File.separator为分隔符“/”*/
public final static String ALBUM_PATH = Environment.getExternalStorageDirectory() + File.separator + FirstFolder + File.separator; public final static String ALBUM_PATH = Environment.getExternalStorageDirectory() + File.separator + FirstFolder + File.separator;
public final static String IMAGE_PATH = ALBUM_PATH + Image + File.separator; public final static String IMAGE_PATH = ALBUM_PATH + Image + File.separator;
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/contract/TableContract.java
...@@ -55,9 +55,9 @@ public interface TableContract { ...@@ -55,9 +55,9 @@ public interface TableContract {
String getOperatContentText(); String getOperatContentText();
void setOperatTitle(); void setTableActionTitle();
void canceOperat(); void canceTableAction();
void startMealStandActivity(); void startMealStandActivity();
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/cart/ShoppingCart.java
...@@ -55,16 +55,19 @@ public class ShoppingCart { ...@@ -55,16 +55,19 @@ public class ShoppingCart {
protected List<BillOrderMoney> orderMoneyList = new ArrayList<>(); protected List<BillOrderMoney> orderMoneyList = new ArrayList<>();
public void addNomalDiscount(Discount discount) { public MultyDiscount addNomalDiscount(Discount discount) {
multyDiscounts = new NomalDiscount(multyDiscounts, discount); multyDiscounts = new NomalDiscount(multyDiscounts, discount);
return multyDiscounts;
} }
public void addMemberDiscount(MemberInfo discount) { public MultyDiscount addMemberDiscount(MemberInfo discount) {
multyDiscounts = new MemberDiscount(multyDiscounts, discount); multyDiscounts = new MemberDiscount(multyDiscounts, discount);
return multyDiscounts;
} }
public void addCouponDiscount(CouponDiscountBean discount) { public MultyDiscount addCouponDiscount(CouponDiscountBean discount) {
multyDiscounts = new CouponDiscount(multyDiscounts, discount); multyDiscounts = new CouponDiscount(multyDiscounts, discount);
return multyDiscounts;
} }
public static void main(String[] arg) { public static void main(String[] arg) {
...@@ -75,21 +78,24 @@ public class ShoppingCart { ...@@ -75,21 +78,24 @@ public class ShoppingCart {
MemberInfo memberDiscount = new MemberInfo(); MemberInfo memberDiscount = new MemberInfo();
memberDiscount.setMemberName("斯八達"); memberDiscount.setMemberName("斯八達");
memberDiscount.setDiscount(20); memberDiscount.setMemberDiscount(20);
CouponDiscountBean couponDiscount = new CouponDiscountBean(); CouponDiscountBean couponDiscount = new CouponDiscountBean();
couponDiscount.setCouponType((byte) 2); couponDiscount.setCouponType((byte) 2);
couponDiscount.setCouponTypeName1("立減8元"); couponDiscount.setCouponTypeName1("立減8元");
couponDiscount.setAmount(8); couponDiscount.setAmount(8);
ShoppingCart.getInstance().addNomalDiscount(discount); NomalDiscount nomalDiscountBean = (NomalDiscount) ShoppingCart.getInstance().addNomalDiscount(discount);
ShoppingCart.getInstance().addMemberDiscount(memberDiscount); MemberDiscount memberDiscountBean = (MemberDiscount) ShoppingCart.getInstance().addMemberDiscount(memberDiscount);
ShoppingCart.getInstance().addCouponDiscount(couponDiscount); CouponDiscount couponDiscountBean = (CouponDiscount) ShoppingCart.getInstance().addCouponDiscount(couponDiscount);
MultyDiscount multyDiscount = ShoppingCart.getInstance().getMultyDiscounts(); MultyDiscount multyDiscount = ShoppingCart.getInstance().getMultyDiscounts();
double money = multyDiscount.calculate(100); double money = multyDiscount.calculate(100);
System.out.println("calculate : " + money); System.out.println("calculate : " + money);
System.out.println("NomalDiscount discountMoney : " + nomalDiscountBean.getDiscountMoney());
System.out.println("MemberDiscount discountMoney : " + memberDiscountBean.getDiscountMoney());
System.out.println("CouponDiscount discountMoney : " + couponDiscountBean.getDiscountMoney());
} }
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/app/OrderConentOperatTypeConstant.java → table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/constant/OrderConentActionConstant.java
package com.gingersoft.gsa.cloud.table.app; package com.gingersoft.gsa.cloud.table.mvp.model.constant;
/** /**
* 作者：ELEGANT_BIN * 作者：ELEGANT_BIN
...@@ -7,7 +7,7 @@ package com.gingersoft.gsa.cloud.table.app; ...@@ -7,7 +7,7 @@ package com.gingersoft.gsa.cloud.table.app;
* 修订历史：2020-01-10 * 修订历史：2020-01-10
* 描述： * 描述：
*/ */
public interface OrderConentOperatTypeConstant { public interface OrderConentActionConstant {
/** /**
* 1#賬單內容 * 1#賬單內容
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/app/TableOperatTypeConstant.java → table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/constant/TableActionConstant.java
package com.gingersoft.gsa.cloud.table.app; package com.gingersoft.gsa.cloud.table.mvp.model.constant;
/** /**
* 作者：ELEGANT_BIN * 作者：ELEGANT_BIN
...@@ -7,7 +7,7 @@ package com.gingersoft.gsa.cloud.table.app; ...@@ -7,7 +7,7 @@ package com.gingersoft.gsa.cloud.table.app;
* 修订历史：2020-01-10 * 修订历史：2020-01-10
* 描述： * 描述：
*/ */
public interface TableOperatTypeConstant { public interface TableActionConstant {
/** /**
* 0#全部 * 0#全部
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/discount/CouponDiscount.java
...@@ -3,6 +3,8 @@ package com.gingersoft.gsa.cloud.table.mvp.model.discount; ...@@ -3,6 +3,8 @@ package com.gingersoft.gsa.cloud.table.mvp.model.discount;
import com.gingersoft.gsa.cloud.base.common.bean.discount.CouponDiscountBean; import com.gingersoft.gsa.cloud.base.common.bean.discount.CouponDiscountBean;
import com.gingersoft.gsa.cloud.base.utils.MoneyUtil; import com.gingersoft.gsa.cloud.base.utils.MoneyUtil;
import lombok.Getter;
/** /**
* 作者：ELEGANT_BIN * 作者：ELEGANT_BIN
* 版本：1.6.0 * 版本：1.6.0
...@@ -10,6 +12,7 @@ import com.gingersoft.gsa.cloud.base.utils.MoneyUtil; ...@@ -10,6 +12,7 @@ import com.gingersoft.gsa.cloud.base.utils.MoneyUtil;
* 修订历史：2020-09-19 * 修订历史：2020-09-19
* 描述: 優惠券折扣{@link CouponDiscountBean} * 描述: 優惠券折扣{@link CouponDiscountBean}
*/ */
@Getter
public class CouponDiscount extends MultyDiscount { public class CouponDiscount extends MultyDiscount {
private CouponDiscountBean couponDiscount; private CouponDiscountBean couponDiscount;
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/discount/MemberDiscount.java
...@@ -3,6 +3,8 @@ package com.gingersoft.gsa.cloud.table.mvp.model.discount; ...@@ -3,6 +3,8 @@ package com.gingersoft.gsa.cloud.table.mvp.model.discount;
import com.gingersoft.gsa.cloud.base.common.bean.MemberInfo; import com.gingersoft.gsa.cloud.base.common.bean.MemberInfo;
import com.gingersoft.gsa.cloud.base.utils.MoneyUtil; import com.gingersoft.gsa.cloud.base.utils.MoneyUtil;
import lombok.Getter;
/** /**
* 作者：ELEGANT_BIN * 作者：ELEGANT_BIN
* 版本：1.6.0 * 版本：1.6.0
...@@ -10,6 +12,7 @@ import com.gingersoft.gsa.cloud.base.utils.MoneyUtil; ...@@ -10,6 +12,7 @@ import com.gingersoft.gsa.cloud.base.utils.MoneyUtil;
* 修订历史：2020-09-19 * 修订历史：2020-09-19
* 描述: 會員折扣{@link MemberInfo#memberDiscount} * 描述: 會員折扣{@link MemberInfo#memberDiscount}
*/ */
@Getter
public class MemberDiscount extends MultyDiscount { public class MemberDiscount extends MultyDiscount {
private MemberInfo memberDiscount; private MemberInfo memberDiscount;
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/discount/NomalDiscount.java
...@@ -3,6 +3,8 @@ package com.gingersoft.gsa.cloud.table.mvp.model.discount; ...@@ -3,6 +3,8 @@ package com.gingersoft.gsa.cloud.table.mvp.model.discount;
import com.gingersoft.gsa.cloud.base.utils.MoneyUtil; import com.gingersoft.gsa.cloud.base.utils.MoneyUtil;
import com.gingersoft.gsa.cloud.database.bean.Discount; import com.gingersoft.gsa.cloud.database.bean.Discount;
import lombok.Getter;
/** /**
* 作者：ELEGANT_BIN * 作者：ELEGANT_BIN
* 版本：1.6.0 * 版本：1.6.0
...@@ -10,6 +12,7 @@ import com.gingersoft.gsa.cloud.database.bean.Discount; ...@@ -10,6 +12,7 @@ import com.gingersoft.gsa.cloud.database.bean.Discount;
* 修订历史：2020-09-19 * 修订历史：2020-09-19
* 描述: 整單折扣{@link Discount} * 描述: 整單折扣{@link Discount}
*/ */
@Getter
public class NomalDiscount extends MultyDiscount{ public class NomalDiscount extends MultyDiscount{
private Discount discount; private Discount discount;
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/table/MoveTableAction.java 0 → 100644
package com.gingersoft.gsa.cloud.table.mvp.model.table;
import android.content.Context;
import com.gingersoft.gsa.cloud.base.common.bean.table.TableBean;
/**
* 作者：ELEGANT_BIN
* 版本：1.6.0
* 创建日期：2020-09-23
* 修订历史：2020-09-23
* 描述：餐檯模式-轉台{@link com.gingersoft.gsa.cloud.table.mvp.ui.activity.TableActivity}
*/
public class MoveTableAction extends TableActionStrategy implements SplitTableStrategy{
public MoveTableAction(Context context) {
super(context);
}
@Override
public void action(TableBean.DataBean dataBean) {
}
@Override
public void splitTableAction() {
}
}
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/table/PrintServingPaperAction.java 0 → 100644
package com.gingersoft.gsa.cloud.table.mvp.model.table;
import android.content.Context;
import com.gingersoft.gsa.cloud.base.common.bean.table.TableBean;
/**
* 作者：ELEGANT_BIN
* 版本：1.6.0
* 创建日期：2020-09-23
* 修订历史：2020-09-23
* 描述：餐檯模式-打印上菜紙{@link com.gingersoft.gsa.cloud.table.mvp.ui.activity.TableActivity}
*/
public class PrintServingPaperAction extends TableActionStrategy{
public PrintServingPaperAction(Context context) {
super(context);
}
@Override
public void action(TableBean.DataBean dataBean) {
if (dataBean.getSplitStatus() == 1) {
splitTableAction();
} else {
// showOperatTipDialog(dataBean);
}
}
// public void showOperatTipDialog(TableBean.DataBean dataBean) {
// QMUIDialog.MessageDialogBuilder dialogBuilder = new QMUIDialog.MessageDialogBuilder(mContext);
// dialogBuilder.setTitleIcon(R.drawable.qmui_icon_dialog_doubt);
// dialogBuilder.setMessage("是否確認打印");
// dialogBuilder.addAction(0, "確認", QMUIDialogAction.ACTION_PROP_NEGATIVE, new QMUIDialogAction.ActionListener() {
// @Override
// public void onClick(QMUIDialog dialog, int index) {
// dialog.dismiss();
// loadOrderToPrint(dataBean.getId(), dataBean.getOrderId());
// }
// });
// dialogBuilder.addAction("取消", new QMUIDialogAction.ActionListener() {
// @Override
// public void onClick(QMUIDialog dialog, int index) {
// dialog.dismiss();
// cancel();
// }
// });
// dialogBuilder.create(R.style.MyDialogTheme2).show();
// }
}
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/table/PrintSkyOrderAction.java 0 → 100644
package com.gingersoft.gsa.cloud.table.mvp.model.table;
import android.content.Context;
import com.gingersoft.gsa.cloud.base.common.bean.table.TableBean;
/**
* 作者：ELEGANT_BIN
* 版本：1.6.0
* 创建日期：2020-09-23
* 修订历史：2020-09-23
* 描述：餐檯模式-打印skyorder碼{@link com.gingersoft.gsa.cloud.table.mvp.ui.activity.TableActivity}
*/
public class PrintSkyOrderAction extends TableActionStrategy implements SplitTableStrategy {
public PrintSkyOrderAction(Context context) {
super(context);
}
@Override
public void splitTableAction() {
}
@Override
public void action(TableBean.DataBean dataBean) {
}
@Override
public void cancel() {
}
}
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/table/ResetTableAction.java 0 → 100644
package com.gingersoft.gsa.cloud.table.mvp.model.table;
import android.content.Context;
import com.gingersoft.gsa.cloud.base.common.bean.table.TableBean;
/**
* 作者：ELEGANT_BIN
* 版本：1.6.0
* 创建日期：2020-09-23
* 修订历史：2020-09-23
* 描述：餐檯模式-重置餐檯{@link com.gingersoft.gsa.cloud.table.mvp.ui.activity.TableActivity}
*/
public class ResetTableAction extends TableActionStrategy implements SplitTableStrategy{
public ResetTableAction(Context context) {
super(context);
}
@Override
public void splitTableAction() {
}
@Override
public void action(TableBean.DataBean dataBean) {
}
@Override
public void cancel() {
}
}
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/table/SplitTableAction.java 0 → 100644
package com.gingersoft.gsa.cloud.table.mvp.model.table;
import android.content.Context;
import com.gingersoft.gsa.cloud.base.common.bean.table.TableBean;
/**
* 作者：ELEGANT_BIN
* 版本：1.6.0
* 创建日期：2020-09-23
* 修订历史：2020-09-23
* 描述：餐檯模式-分檯{@link com.gingersoft.gsa.cloud.table.mvp.ui.activity.TableActivity}
*/
public class SplitTableAction extends TableActionStrategy {
public SplitTableAction(Context context) {
super(context);
}
@Override
public void action(TableBean.DataBean dataBean) {
}
@Override
public void cancel() {
}
}
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/table/SplitTableStrategy.java 0 → 100644
package com.gingersoft.gsa.cloud.table.mvp.model.table;
/**
* 作者：ELEGANT_BIN
* 版本：1.6.0
* 创建日期：2020-09-23
* 修订历史：2020-09-23
* 描述：分檯策略接口 需要對分檯進行操作需要實現此接口
*/
public interface SplitTableStrategy {
void splitTableAction();
}
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/table/TableActionStrategy.java 0 → 100644
package com.gingersoft.gsa.cloud.table.mvp.model.table;
import android.content.Context;
import com.gingersoft.gsa.cloud.base.common.bean.table.TableBean;
/**
* 作者：ELEGANT_BIN
* 版本：1.6.0
* 创建日期：2020-09-23
* 修订历史：2020-09-23
* 描述：餐檯功能策略類，所有餐檯功能都需要繼承這個
*/
public abstract class TableActionStrategy {
protected Context mContext;
public TableActionStrategy(Context context) {
this.mContext = context;
}
public abstract void action(TableBean.DataBean dataBean);
protected void splitTableAction(){
if (actionListener != null) {
actionListener.splitTableAction();
}
}
protected void cancel() {
if (actionListener != null) {
actionListener.cancel();
}
}
private OnActionListener actionListener;
public void setActionListener(OnActionListener actionListener) {
this.actionListener = actionListener;
}
public interface OnActionListener {
void splitTableAction();
void cancel();
}
}
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/AllTablePresenter.java
...@@ -6,7 +6,7 @@ import android.content.Context; ...@@ -6,7 +6,7 @@ import android.content.Context;
import com.gingersoft.gsa.cloud.base.utils.VibratorUtils; import com.gingersoft.gsa.cloud.base.utils.VibratorUtils;
import com.gingersoft.gsa.cloud.base.common.bean.table.TableBean; import com.gingersoft.gsa.cloud.base.common.bean.table.TableBean;
import com.gingersoft.gsa.cloud.table.app.TableOperatTypeConstant; import com.gingersoft.gsa.cloud.table.mvp.model.constant.TableActionConstant;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.OrderContentActivity; import com.gingersoft.gsa.cloud.table.mvp.ui.activity.OrderContentActivity;
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.TableAdapter; import com.gingersoft.gsa.cloud.table.mvp.ui.adapter.TableAdapter;
...@@ -146,7 +146,7 @@ public class AllTablePresenter extends BasePresenter<AllTableContract.Model, All ...@@ -146,7 +146,7 @@ public class AllTablePresenter extends BasePresenter<AllTableContract.Model, All
if (tableList != null) { if (tableList != null) {
//这里先清空 //这里先清空
mTableList.clear(); mTableList.clear();
if (status == TableOperatTypeConstant.table_status_0) { if (status == TableActionConstant.table_status_0) {
//显示全部台号 按照狀態排序 //显示全部台号 按照狀態排序
initTableByStauts(tableList); initTableByStauts(tableList);
} else { } else {
...@@ -173,35 +173,35 @@ public class AllTablePresenter extends BasePresenter<AllTableContract.Model, All ...@@ -173,35 +173,35 @@ public class AllTablePresenter extends BasePresenter<AllTableContract.Model, All
return; return;
} }
switch (status) { switch (status) {
case TableOperatTypeConstant.table_status_1: case TableActionConstant.table_status_1:
for (int i = 0; i < datasBeans.size(); i++) { for (int i = 0; i < datasBeans.size(); i++) {
if (datasBeans.get(i).getStatus() == 0 && datasBeans.get(i).getUseStatus() == 0) { if (datasBeans.get(i).getStatus() == 0 && datasBeans.get(i).getUseStatus() == 0) {
mTableList.add(datasBeans.get(i)); mTableList.add(datasBeans.get(i));
} }
} }
break; break;
case TableOperatTypeConstant.table_status_2: case TableActionConstant.table_status_2:
for (int i = 0; i < datasBeans.size(); i++) { for (int i = 0; i < datasBeans.size(); i++) {
if (datasBeans.get(i).getUseStatus() == 1) { if (datasBeans.get(i).getUseStatus() == 1) {
mTableList.add(datasBeans.get(i)); mTableList.add(datasBeans.get(i));
} }
} }
break; break;
case TableOperatTypeConstant.table_status_3: case TableActionConstant.table_status_3:
for (int i = 0; i < datasBeans.size(); i++) { for (int i = 0; i < datasBeans.size(); i++) {
if ((datasBeans.get(i).getStatus() == 1 || datasBeans.get(i).getStatus() == 2) && datasBeans.get(i).getUseStatus() == 0) { if ((datasBeans.get(i).getStatus() == 1 || datasBeans.get(i).getStatus() == 2) && datasBeans.get(i).getUseStatus() == 0) {
mTableList.add(datasBeans.get(i)); mTableList.add(datasBeans.get(i));
} }
} }
break; break;
case TableOperatTypeConstant.table_status_4: case TableActionConstant.table_status_4:
for (int i = 0; i < datasBeans.size(); i++) { for (int i = 0; i < datasBeans.size(); i++) {
if (datasBeans.get(i).getStatus() == 3 && datasBeans.get(i).getUseStatus() == 0) { if (datasBeans.get(i).getStatus() == 3 && datasBeans.get(i).getUseStatus() == 0) {
mTableList.add(datasBeans.get(i)); mTableList.add(datasBeans.get(i));
} }
} }
break; break;
case TableOperatTypeConstant.table_status_5: case TableActionConstant.table_status_5:
for (int i = 0; i < datasBeans.size(); i++) { for (int i = 0; i < datasBeans.size(); i++) {
if (datasBeans.get(i).getSplitStatus() == 1 && datasBeans.get(i).getUseStatus() == 0) { if (datasBeans.get(i).getSplitStatus() == 1 && datasBeans.get(i).getUseStatus() == 0) {
mTableList.add(datasBeans.get(i)); mTableList.add(datasBeans.get(i));
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/BaseOrderPresenter.java
...@@ -1507,9 +1507,12 @@ public abstract class BaseOrderPresenter<M extends BaseOrderContract.Model, V ex ...@@ -1507,9 +1507,12 @@ public abstract class BaseOrderPresenter<M extends BaseOrderContract.Model, V ex
* *
* @return * @return
*/ */
protected BillOrderMoney getNesOrderDiscount() { protected BillOrderMoney getNewDiscount() {
for (BillOrderMoney item : mOrderMoneyList) { for (BillOrderMoney item : mOrderMoneyList) {
if (item.getStatus() == 0 && item.getType() == BillOrderMoney.ORDER_DISCOUNT_TYPE) { if (item.getStatus() == 0 &&
(item.getType() == BillOrderMoney.ORDER_DISCOUNT_TYPE ||
item.getType() == BillOrderMoney.MEMBER_DISCOUNT_TYPE||
item.getType() == BillOrderMoney.COUPON_DISCOUNT_TYPE)) {
return item; return item;
} }
} }
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/MealStandPresenter.java
...@@ -542,38 +542,6 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod ...@@ -542,38 +542,6 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod
updateOrderFoodNumber(); updateOrderFoodNumber();
} }
}); });
// long fid = food.getProductId();
// int itemType = food.getItemType();
//
// List<ComboItem> comboItemList = new ArrayList<>();
// if (itemType == 1) {
// //获取套餐细项数据
// List<ComboItem> comboItems = mModel.queryDB_ComboList(fid);
// comboItemList.addAll(comboItems);
// }
// List<Modifier> modifierList = mModel.queryDB_ModifierList(fid, ModifierDaoUtils.modifierMode_All);
// //設置默認選中套餐食品
// setComboDefModifier(comboItemList);
// //設置默認選中細項
// setModifierDefModifier(modifierList);
//
// //更新套餐数据
// updateComboData(comboItemList);
// //更新细项数据
// updateModifierData(modifierList);
//
// if (comboItemList.size() > 0) {
// mRootView.setModifierTop(10);
// } else {
// mRootView.setModifierTop(0);
// }
//
//// isSelectedMeal = isSelectedMeal && (comboItemList.size() > 0 || modifierList.size() > 0);
// boolean autoMod = food.getAutoMod() == 1 && (comboItemList.size() > 0 || modifierList.size() > 0);
// if (IActivity.getCurrentViewMode() != MealConstant.fine_ViewMode && isSelectedMeal || autoMod) {
// mRootView.showViewModeVisibility(MealConstant.combo_ViewMode, MealConstant.modifier_ViewMode);
// }
} }
/** /**
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/OrderContentPresenter.java
...@@ -191,7 +191,7 @@ public class OrderContentPresenter extends BaseOrderPresenter<OrderContentContra ...@@ -191,7 +191,7 @@ public class OrderContentPresenter extends BaseOrderPresenter<OrderContentContra
if (!canPrint()) { if (!canPrint()) {
return; return;
} }
if (hasNesOrderFoods() || getNesOrderDiscount() != null) { if (hasNesOrderFoods() || getNewDiscount() != null) {
//有未送單食品先送單 //有未送單食品先送單
sendOrder(true, null); sendOrder(true, null);
} else { } else {
...@@ -202,7 +202,7 @@ public class OrderContentPresenter extends BaseOrderPresenter<OrderContentContra ...@@ -202,7 +202,7 @@ public class OrderContentPresenter extends BaseOrderPresenter<OrderContentContra
// if (!canPay()) { // if (!canPay()) {
// return; // return;
// } // }
if (hasNesOrderFoods() || getNesOrderDiscount() != null) { if (hasNesOrderFoods() || getNewDiscount() != null) {
//有未送單食品先送單 //有未送單食品先送單
sendOrder(false, OrderPayActivity.class); sendOrder(false, OrderPayActivity.class);
} else { } else {
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/StateTablePresenter.java
...@@ -6,7 +6,7 @@ import android.content.Context; ...@@ -6,7 +6,7 @@ import android.content.Context;
import com.gingersoft.gsa.cloud.base.utils.VibratorUtils; import com.gingersoft.gsa.cloud.base.utils.VibratorUtils;
import com.gingersoft.gsa.cloud.base.common.bean.table.TableBean; import com.gingersoft.gsa.cloud.base.common.bean.table.TableBean;
import com.gingersoft.gsa.cloud.table.app.TableOperatTypeConstant; import com.gingersoft.gsa.cloud.table.mvp.model.constant.TableActionConstant;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.OrderContentActivity; import com.gingersoft.gsa.cloud.table.mvp.ui.activity.OrderContentActivity;
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.TableAdapter; import com.gingersoft.gsa.cloud.table.mvp.ui.adapter.TableAdapter;
...@@ -101,7 +101,7 @@ public class StateTablePresenter extends BasePresenter<StateTableContract.Model, ...@@ -101,7 +101,7 @@ public class StateTablePresenter extends BasePresenter<StateTableContract.Model,
if (tableList != null) { if (tableList != null) {
//这里先清空 //这里先清空
mTableList.clear(); mTableList.clear();
if (status == TableOperatTypeConstant.table_status_0) { if (status == TableActionConstant.table_status_0) {
//显示全部台号 按照狀態排序 //显示全部台号 按照狀態排序
initTableByStauts(tableList); initTableByStauts(tableList);
} else { } else {
...@@ -161,35 +161,35 @@ public class StateTablePresenter extends BasePresenter<StateTableContract.Model, ...@@ -161,35 +161,35 @@ public class StateTablePresenter extends BasePresenter<StateTableContract.Model,
return; return;
} }
switch (status) { switch (status) {
case TableOperatTypeConstant.table_status_1: case TableActionConstant.table_status_1:
for (int i = 0; i < datasBeans.size(); i++) { for (int i = 0; i < datasBeans.size(); i++) {
if (datasBeans.get(i).getStatus() == 0 && datasBeans.get(i).getUseStatus() == 0) { if (datasBeans.get(i).getStatus() == 0 && datasBeans.get(i).getUseStatus() == 0) {
mTableList.add(datasBeans.get(i)); mTableList.add(datasBeans.get(i));
} }
} }
break; break;
case TableOperatTypeConstant.table_status_2: case TableActionConstant.table_status_2:
for (int i = 0; i < datasBeans.size(); i++) { for (int i = 0; i < datasBeans.size(); i++) {
if (datasBeans.get(i).getUseStatus() == 1) { if (datasBeans.get(i).getUseStatus() == 1) {
mTableList.add(datasBeans.get(i)); mTableList.add(datasBeans.get(i));
} }
} }
break; break;
case TableOperatTypeConstant.table_status_3: case TableActionConstant.table_status_3:
for (int i = 0; i < datasBeans.size(); i++) { for (int i = 0; i < datasBeans.size(); i++) {
if ((datasBeans.get(i).getStatus() == 1 || datasBeans.get(i).getStatus() == 2) && datasBeans.get(i).getUseStatus() == 0) { if ((datasBeans.get(i).getStatus() == 1 || datasBeans.get(i).getStatus() == 2) && datasBeans.get(i).getUseStatus() == 0) {
mTableList.add(datasBeans.get(i)); mTableList.add(datasBeans.get(i));
} }
} }
break; break;
case TableOperatTypeConstant.table_status_4: case TableActionConstant.table_status_4:
for (int i = 0; i < datasBeans.size(); i++) { for (int i = 0; i < datasBeans.size(); i++) {
if (datasBeans.get(i).getStatus() == 3 && datasBeans.get(i).getUseStatus() == 0) { if (datasBeans.get(i).getStatus() == 3 && datasBeans.get(i).getUseStatus() == 0) {
mTableList.add(datasBeans.get(i)); mTableList.add(datasBeans.get(i));
} }
} }
break; break;
case TableOperatTypeConstant.table_status_5: case TableActionConstant.table_status_5:
for (int i = 0; i < datasBeans.size(); i++) { for (int i = 0; i < datasBeans.size(); i++) {
if (datasBeans.get(i).getSplitStatus() == 1 && datasBeans.get(i).getUseStatus() == 0) { if (datasBeans.get(i).getSplitStatus() == 1 && datasBeans.get(i).getUseStatus() == 0) {
mTableList.add(datasBeans.get(i)); mTableList.add(datasBeans.get(i));
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/OrderContentActivity.java
...@@ -24,8 +24,8 @@ import com.gingersoft.gsa.cloud.base.utils.encryption.DESUtil; ...@@ -24,8 +24,8 @@ import com.gingersoft.gsa.cloud.base.utils.encryption.DESUtil;
import com.gingersoft.gsa.cloud.base.utils.log.LogUtil; import com.gingersoft.gsa.cloud.base.utils.log.LogUtil;
import com.gingersoft.gsa.cloud.table.R; import com.gingersoft.gsa.cloud.table.R;
import com.gingersoft.gsa.cloud.table.R2; import com.gingersoft.gsa.cloud.table.R2;
import com.gingersoft.gsa.cloud.table.app.OrderConentOperatTypeConstant; import com.gingersoft.gsa.cloud.table.mvp.model.constant.OrderConentActionConstant;
import com.gingersoft.gsa.cloud.table.app.TableOperatTypeConstant; import com.gingersoft.gsa.cloud.table.mvp.model.constant.TableActionConstant;
import com.gingersoft.gsa.cloud.table.di.component.DaggerOrderContentComponent; import com.gingersoft.gsa.cloud.table.di.component.DaggerOrderContentComponent;
import com.gingersoft.gsa.cloud.table.mvp.contract.OrderContentContract; import com.gingersoft.gsa.cloud.table.mvp.contract.OrderContentContract;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.event.InitTableEvent; import com.gingersoft.gsa.cloud.table.mvp.model.bean.event.InitTableEvent;
...@@ -148,13 +148,13 @@ public class OrderContentActivity extends BaseFragmentActivity<OrderContentPrese ...@@ -148,13 +148,13 @@ public class OrderContentActivity extends BaseFragmentActivity<OrderContentPrese
/** /**
* 當前所顯示餐檯狀態（默認:全部） * 當前所顯示餐檯狀態（默認:全部）
*/ */
private int mCurrentSelectTableStatus = TableOperatTypeConstant.table_status_0; private int mCurrentSelectTableStatus = TableActionConstant.table_status_0;
/** /**
* 当前选择的操作： * 当前选择的操作：
* 1#賬單內容 * 1#賬單內容
* 2#轉移 * 2#轉移
*/ */
private int mCurrentOperatType = OrderConentOperatTypeConstant.order_conetnt_1; private int mCurrentOperatType = OrderConentActionConstant.order_conetnt_1;
private boolean isRefreshData = false; private boolean isRefreshData = false;
...@@ -244,14 +244,14 @@ public class OrderContentActivity extends BaseFragmentActivity<OrderContentPrese ...@@ -244,14 +244,14 @@ public class OrderContentActivity extends BaseFragmentActivity<OrderContentPrese
public void backPressed() { public void backPressed() {
switch (mCurrentOperatType) { switch (mCurrentOperatType) {
case OrderConentOperatTypeConstant.transfer_food_2: case OrderConentActionConstant.transfer_food_2:
hideTransferFoodLayout(); hideTransferFoodLayout();
break; break;
default: default:
killMyself(); killMyself();
break; break;
} }
mCurrentOperatType = OrderConentOperatTypeConstant.order_conetnt_1; mCurrentOperatType = OrderConentActionConstant.order_conetnt_1;
tv_action_name.setVisibility(View.GONE); tv_action_name.setVisibility(View.GONE);
} }
...@@ -323,7 +323,7 @@ public class OrderContentActivity extends BaseFragmentActivity<OrderContentPrese ...@@ -323,7 +323,7 @@ public class OrderContentActivity extends BaseFragmentActivity<OrderContentPrese
return; return;
} }
switch (mCurrentOperatType) { switch (mCurrentOperatType) {
case OrderConentOperatTypeConstant.transfer_food_2: case OrderConentActionConstant.transfer_food_2:
if (dataBean.getSplitStatus() == 1) { if (dataBean.getSplitStatus() == 1) {
mPresenter.showSplitTableDialog(dataBean.getId()); mPresenter.showSplitTableDialog(dataBean.getId());
} else { } else {
...@@ -367,7 +367,7 @@ public class OrderContentActivity extends BaseFragmentActivity<OrderContentPrese ...@@ -367,7 +367,7 @@ public class OrderContentActivity extends BaseFragmentActivity<OrderContentPrese
} catch (Exception e) { } catch (Exception e) {
vs_transfer_food.setVisibility(View.VISIBLE); vs_transfer_food.setVisibility(View.VISIBLE);
} finally { } finally {
mCurrentOperatType = OrderConentOperatTypeConstant.transfer_food_2; mCurrentOperatType = OrderConentActionConstant.transfer_food_2;
tv_table_name.setHint("請選擇目標檯號"); tv_table_name.setHint("請選擇目標檯號");
setActionName(); setActionName();
} }
...@@ -375,7 +375,7 @@ public class OrderContentActivity extends BaseFragmentActivity<OrderContentPrese ...@@ -375,7 +375,7 @@ public class OrderContentActivity extends BaseFragmentActivity<OrderContentPrese
@Override @Override
public void hideTransferFoodLayout() { public void hideTransferFoodLayout() {
mCurrentOperatType = OrderConentOperatTypeConstant.order_conetnt_1; mCurrentOperatType = OrderConentActionConstant.order_conetnt_1;
vs_transfer_food.setVisibility(View.GONE); vs_transfer_food.setVisibility(View.GONE);
} }
...@@ -770,7 +770,7 @@ public class OrderContentActivity extends BaseFragmentActivity<OrderContentPrese ...@@ -770,7 +770,7 @@ public class OrderContentActivity extends BaseFragmentActivity<OrderContentPrese
private void setActionName() { private void setActionName() {
switch (mCurrentOperatType) { switch (mCurrentOperatType) {
case OrderConentOperatTypeConstant.transfer_food_2: case OrderConentActionConstant.transfer_food_2:
tv_action_name.setVisibility(View.VISIBLE); tv_action_name.setVisibility(View.VISIBLE);
tv_action_name.setText("轉移"); tv_action_name.setText("轉移");
tv_action_name.setBackgroundColor(mPresenter.getFunctionList().get(3).getBackgroundColor()); tv_action_name.setBackgroundColor(mPresenter.getFunctionList().get(3).getBackgroundColor());
......
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