Skip to content

S
supplier
Commit 65b9d944 by 宁斌
Options

结账新增tableId字段传给后台

parent b28ba3bd
Showing with 68 additions and 147 deletions
base-module/build.gradle
......@@ -44,7 +44,7 @@ android {
/**
* 版本号
*/
schemaVersion 13
schemaVersion 14
/**
* greendao输出dao的数据库操作实体类文件夹（相对路径 包名+自定义路径名称，包将创建于包名的直接路径下）
*/
......
base-module/src/main/java/com/gingersoft/gsa/cloud/base/common/bean/OrderPayRequest.java
......@@ -23,11 +23,12 @@ public class OrderPayRequest {
private long orderId;
private int linePayType;
private int orderPayType;
private int tableId;
private String tableNumber;
private List<orderPay> orderPays = new ArrayList<>();
@Data
public static class orderPay{
public static class orderPay {
private int payType;
private double amount;
private double tipsPrice;
......
base-module/src/main/java/com/gingersoft/gsa/cloud/database/bean/Discount.java
......@@ -7,6 +7,7 @@ import org.greenrobot.greendao.annotation.Id;
import org.greenrobot.greendao.annotation.Property;
import java.util.Date;
import org.greenrobot.greendao.annotation.Generated;
import lombok.Data;
......@@ -30,32 +31,34 @@ public class Discount {
private Long id;
private int restaurant_id;
/**金額*/
/**
* 金額
*/
private double amount;
/**折扣*/
/**
* 折扣
*/
private double discount_value;
/**类型#0:金额;1:折扣;*/
/**
* 类型#0:金额;1:折扣;
*/
private int type;
/**折扣可使用范围#0:食品;1:账单;*/
private String discountType ;
/**状态#0:启用;1:禁用;*/
/**
* 折扣可使用范围#0:食品;1:账单;
*/
private String discountType;
/**
* 状态#0:启用;1:禁用;
*/
private int status;
/**折扣描述*/
/**
* 折扣描述
*/
private String remark;
private String begin_time;
private String end_time;
@Generated(hash = 901376651)
public Discount(Long id, int restaurant_id, double amount, double discount_value,
int type, String discountType, int status, String remark, String begin_time,
......@@ -73,231 +76,136 @@ public class Discount {
}
@Generated(hash = 1777606421)
public Discount() {
}
/**
* 計算折扣金額
*
* @param discount
* @param sourcePrice
* @return
*/
public static double calculationDiscount(Discount discount , double sourcePrice){
public static double calculationDiscount(Discount discount, double sourcePrice) {
double discountPrice;
if(discount.getType() == 0){
if (discount.getType() == 0) {
//金額折扣
discountPrice = discount.getAmount();
}else {
} else {
//百分比折扣
discountPrice = MoneyUtil.multiply(sourcePrice, discount.getDiscount_value());
discountPrice = MoneyUtil.divide(MoneyUtil.multiply(sourcePrice, discount.getDiscount_value()), 100).doubleValue();
}
if(sourcePrice < discountPrice){
if (sourcePrice < discountPrice) {
//折扣金額不能超出總額
discountPrice = sourcePrice;
}
// else {
// discountPrice = sourcePrice - discountPrice;
// }
return - MoneyUtil.get_ItemDecimals_money(discountPrice);
return -MoneyUtil.get_ItemDecimals_money(discountPrice);
}
public Long getId() {
return this.id;
}
public void setId(Long id) {
this.id = id;
}
public int getRestaurant_id() {
return this.restaurant_id;
}
public void setRestaurant_id(int restaurant_id) {
this.restaurant_id = restaurant_id;
}
public double getAmount() {
return this.amount;
}
public void setAmount(double amount) {
this.amount = amount;
}
public double getDiscount_value() {
return this.discount_value;
}
public void setDiscount_value(double discount_value) {
this.discount_value = discount_value;
}
public int getType() {
return this.type;
}
public void setType(int type) {
this.type = type;
}
public int getStatus() {
return this.status;
}
public void setStatus(int status) {
this.status = status;
}
public String getRemark() {
return this.remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
public String getBegin_time() {
return this.begin_time;
}
public void setBegin_time(String begin_time) {
this.begin_time = begin_time;
}
public String getEnd_time() {
return this.end_time;
}
public void setEnd_time(String end_time) {
this.end_time = end_time;
}
public String getDiscountType() {
return this.discountType;
}
public void setDiscountType(String discountType) {
this.discountType = discountType;
}
}
base-module/src/main/java/com/gingersoft/gsa/cloud/database/greendao/DaoMaster.java
......@@ -14,10 +14,10 @@ import org.greenrobot.greendao.identityscope.IdentityScopeType;
// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
/**
* Master of DAO (schema version 13): knows all DAOs.
* Master of DAO (schema version 14): knows all DAOs.
*/
public class DaoMaster extends AbstractDaoMaster {
public static final int SCHEMA_VERSION = 13;
public static final int SCHEMA_VERSION = 14;
/** Creates underlying database table using DAOs. */
public static void createAllTables(Database db, boolean ifNotExists) {
......
download-module/src/main/java/com/gingersoft/gsa/cloud/download/mvp/ui/activity/DownloadActivity.java
......@@ -9,14 +9,10 @@ import android.os.Bundle;
import android.view.View;
import android.view.ViewGroup;
import android.view.WindowManager;
import android.widget.FrameLayout;
import android.widget.ImageButton;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.billy.cc.core.component.CC;
import com.billy.cc.core.component.CCUtil;
import com.gingersoft.gsa.cloud.base.utils.toast.ToastUtils;
......@@ -32,8 +28,14 @@ import com.jess.arms.base.BaseActivity;
import com.jess.arms.base.DefaultAdapter;
import com.jess.arms.di.component.AppComponent;
import com.jess.arms.utils.ArmsUtils;
import com.qmuiteam.qmui.alpha.QMUIAlphaImageButton;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView;
import butterknife.OnClick;
import static com.jess.arms.utils.Preconditions.checkNotNull;
......@@ -277,4 +279,5 @@ public class DownloadActivity extends BaseActivity<DownloadPresenter> implements
public int getFromPage() {
return fromPage;
}
}
main-module/src/main/java/com/gingersoft/gsa/cloud/main/mvp/presenter/SettlementReportPresenter.java
......@@ -167,6 +167,7 @@ public class SettlementReportPresenter extends BasePresenter<SettlementReportCon
} else {
if (dataBean != null) {
if (dataBean.getTable() == null || (dataBean.getTable() != null && dataBean.getTable().size() == 0)) {
mRootView.showCrossDaysLayout(false);
mRootView.showMessage("清機成功");
//打印清機報表
mRootView.printRepore();
......@@ -175,6 +176,7 @@ public class SettlementReportPresenter extends BasePresenter<SettlementReportCon
showSettlementErrorDialog("仍有臺號未結賬，請先結賬;" + "\n" + getTables(dataBean.getTable()));
}
} else {
mRootView.showCrossDaysLayout(false);
mRootView.showMessage("清機成功");
//打印清機報表
mRootView.printRepore();
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/contract/OrderContentContract.java
......@@ -83,7 +83,7 @@ public interface OrderContentContract {
Observable<TableBean> getTables(int restaurantId);
Observable<TableDetail> getTable(int tableId);
Observable<TableDetail> getTable(int tableId,String tableNumber);
Observable<BaseRespose> transferFood(RequestBody requestBody);
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/contract/TableContract.java
......@@ -70,7 +70,7 @@ public interface TableContract {
Observable<TableBean> getTables(int restaurantId);
Observable<TableDetail> getTable(int tableId);
Observable<TableDetail> getTable(int tableId,String tableNumber);
Observable<BaseRespose> getOrderById(long orderId);
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/OrderContentModel.java
......@@ -96,9 +96,9 @@ public class OrderContentModel extends BaseModel implements OrderContentContract
}
@Override
public Observable<TableDetail> getTable(int tableId) {
public Observable<TableDetail> getTable(int tableId,String tableNumber) {
return mRepositoryManager.obtainRetrofitService(TableService.class)
.getTable(tableId);
.getTable(tableId,tableNumber);
}
@Override
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/TableModel.java
......@@ -72,9 +72,9 @@ public class TableModel extends BaseModel implements TableContract.Model {
}
@Override
public Observable<TableDetail> getTable(int tableId) {
public Observable<TableDetail> getTable(int tableId,String tableNumber) {
return mRepositoryManager.obtainRetrofitService(TableService.class)
.getTable(tableId);
.getTable(tableId,tableNumber);
}
@Override
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/service/TableService.java
......@@ -26,7 +26,7 @@ public interface TableService {
Observable<TableBean> getTables(@Query("restaurantId") int restaurantId);
@GET("restaurantTable/get" + RetrofitUrlManager.IDENTIFICATION_PATH_SIZE + 2)
Observable<TableDetail> getTable(@Query("id") int table);
Observable<TableDetail> getTable(@Query("id") int table, @Query("tableNumber") String tableNumber);
@POST("restaurantTable/kickOff" + RetrofitUrlManager.IDENTIFICATION_PATH_SIZE + 2)
Observable<BaseRespose> openTable(@Body RequestBody requestBody);
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/OrderContentPresenter.java
......@@ -516,7 +516,7 @@ public class OrderContentPresenter extends BaseOrderPresenter<OrderContentContra
}
public void getTable(TableBean.DataBean dataBean) {
mModel.getTable(dataBean.getId())
mModel.getTable(dataBean.getId(),dataBean.getTableNumber())
.subscribeOn(Schedulers.io())
.doOnSubscribe(disposable -> mRootView.showLoading(null))
.subscribeOn(AndroidSchedulers.mainThread())
......@@ -529,6 +529,7 @@ public class OrderContentPresenter extends BaseOrderPresenter<OrderContentContra
public void onNext(@NonNull TableDetail result) {
if (result.isSuccess()) {
TableBean.DataBean tableBean = result.getData();
if(tableBean != null) {
if (tableBean.getUseStatus() == 0) {
String msg = "轉移到" + tableBean.getTableName() + "號檯?";
Class[] parameterTypes = {TableBean.DataBean.class};
......@@ -539,6 +540,7 @@ public class OrderContentPresenter extends BaseOrderPresenter<OrderContentContra
mRootView.showMessage(tableBean.getTableName() + "號檯操作中");
}
mRootView.setTransferTableName(tableBean.getTableName());
}
} else {
mRootView.showMessage(result.getErrMsg());
}
......@@ -671,6 +673,7 @@ public class OrderContentPresenter extends BaseOrderPresenter<OrderContentContra
mSplitTableDialog.setOnClickListener(new SplitTableDialog.OnClickListener() {
@Override
public void onItemClick(SplitTableDialog dialog, TableBean.DataBean dataBean, int position) {
mSplitTableDialog.closeDialog();
//獲取餐檯狀態
getTable(dataBean);
}
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/OrderPayPresenter.java
......@@ -256,6 +256,7 @@ public class OrderPayPresenter extends BaseOrderPresenter<OrderPayContract.Model
payRequest.setOrderId(MyOrderManage.getInstance().getOrderId());
payRequest.setOrderPayType(orderPayType);
payRequest.setLinePayType(orderPayView.getLinePayType());
payRequest.setTableId(OpenTableManage.getDefault().getTableBean().getId());
payRequest.setTableNumber(OpenTableManage.getDefault().getTableBean().getTableNumber());
for (int i = 0; i < payMethodList.size(); i++) {
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/TablePresenter.java
......@@ -480,8 +480,8 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont
return 0;
}
public void getTable(int tableId) {
mModel.getTable(tableId)
public void getTable(TableBean.DataBean dataBean) {
mModel.getTable(dataBean.getId(), dataBean.getTableNumber())
.subscribeOn(Schedulers.io())
.doOnSubscribe(disposable -> mRootView.showLoading(null))
.subscribeOn(AndroidSchedulers.mainThread())
......@@ -494,6 +494,11 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont
public void onNext(@NonNull TableDetail result) {
if (result.isSuccess()) {
TableBean.DataBean tableBean = result.getData();
if (tableBean != null) {
if (!TextUtils.isEmpty(tableBean.getTableNumber())) {
//如果是分檯拼接分檯名称
tableBean.setTableName(tableBean.getTableName() + "-" + tableBean.getTableNumber());
}
if (originalTableId == 0) {
if (tableBean.getUseStatus() == 1) {
mRootView.showMessage("此檯使用中.");
......@@ -520,6 +525,7 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont
}
showOperatTipDialog(tableBean);
}
}
} else {
mRootView.showMessage(result.getErrMsg());
}
......@@ -745,7 +751,7 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont
case TableOperatTypeConstant.splite_table_1:
for (int i = 0; i < mTableList.size(); i++) {
// if (mTableList.get(i).getStatus() != 0 || mTableList.get(i).getSplitStatus() == 1 ? true : false) {
if (mTableList.get(i).getStatus() != 0 ) {
if (mTableList.get(i).getStatus() != 0) {
filterTableBeanList.add(mTableList.get(i));
}
}
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/TableActivity.java
......@@ -315,7 +315,7 @@ public class TableActivity extends BaseFragmentActivity<TablePresenter> implemen
showSplitTableDialog(dataBean.getId());
} else {
//獲取餐檯狀態
mPresenter.getTable(dataBean.getId());
mPresenter.getTable(dataBean);
}
//獲取餐檯狀態
// mPresenter.getTable(dataBean.getId());
......@@ -415,21 +415,18 @@ public class TableActivity extends BaseFragmentActivity<TablePresenter> implemen
@Override
public void onItemClick(SplitTableDialog dialog, TableBean.DataBean dataBean, int position) {
int currentChooseOperatType = mPresenter.getCurrentChooseOperatType();
// if (currentChooseOperatType == -1) {
// mPresenter.openTable(dataBean.getId(), dataBean);
// } else {
// mPresenter.showOperatTipDialog(dataBean);
// }
switch (currentChooseOperatType) {
case TableOperatTypeConstant.print_parper_2:
case TableOperatTypeConstant.init_table_3:
mPresenter.showOperatTipDialog(dataBean);
break;
case TableOperatTypeConstant.move_table_4:
mSplitTableDialog.closeDialog();
//獲取餐檯狀態
mPresenter.getTable(dataBean.getId());
mPresenter.getTable(dataBean);
break;
default:
mSplitTableDialog.closeDialog();
mPresenter.openTable(dataBean.getId(), dataBean);
break;
}
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/adapter/TableAdapter.java
......@@ -116,7 +116,7 @@ public class TableAdapter extends DefaultAdapter<TableBean.DataBean> {
class TableItemHolder extends BaseHolder<TableBean.DataBean> {
@BindView(R2.id.ll_container)
QMUIConstraintLayout ll_container;
QMUIRelativeLayout ll_container;
@BindView(R2.id.rl_table)
QMUIAlphaRelativeLayout rl_table;
@BindView(R2.id.btn_table)
......
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