Skip to content

S
supplier
Commit 25be8c4b by 宁斌
Options

1、获取总金额过滤方法调整

parent 79a55f43
Showing with 35 additions and 27 deletions
base-module/src/main/java/com/gingersoft/gsa/cloud/base/common/bean/TableBean.java
...@@ -85,7 +85,7 @@ public class TableBean { ...@@ -85,7 +85,7 @@ public class TableBean {
private String createBy; private String createBy;
private String qrCodeImg; private String qrCodeImg;
private int posTableId; private int posTableId;
private float serviceCharge; private long serviceCharge;
private long memberId; private long memberId;
/** /**
* 未開檯 0 * 未開檯 0
...@@ -228,11 +228,11 @@ public class TableBean { ...@@ -228,11 +228,11 @@ public class TableBean {
this.posTableId = posTableId; this.posTableId = posTableId;
} }
public float getServiceCharge() { public long getServiceCharge() {
return serviceCharge; return serviceCharge;
} }
public void setServiceCharge(float serviceCharge) { public void setServiceCharge(long serviceCharge) {
this.serviceCharge = serviceCharge; this.serviceCharge = serviceCharge;
} }
......
login-module/src/main/java/com/gingersoft/gsa/cloud/login/mvp/ui/activity/mvp/ui/activity/WelcomeActivity.java
...@@ -282,7 +282,7 @@ public class WelcomeActivity extends LoginInterfaceImpl<WelcomePresenter> implem ...@@ -282,7 +282,7 @@ public class WelcomeActivity extends LoginInterfaceImpl<WelcomePresenter> implem
@Override @Override
public void loginSuccess(LoginBean info) { public void loginSuccess(LoginBean info) {
super.loginSuccess(info); super.loginSuccess(info);
finish(); // finish();
} }
private boolean isChooseRestaurant = false; private boolean isChooseRestaurant = false;
......
manager-module/src/main/java/com/gingersoft/gsa/cloud/manager/mvp/presenter/TableManagePresenter.java
...@@ -184,7 +184,7 @@ public class TableManagePresenter extends BasePresenter<TableManageContract.Mode ...@@ -184,7 +184,7 @@ public class TableManagePresenter extends BasePresenter<TableManageContract.Mode
} }
} else { } else {
mRootView.showEmptyView(false, 0, null); mRootView.showEmptyView(false, 0, null);
mRootView.showMessage("查詢失敗"); // mRootView.showMessage("查詢失敗");
} }
} }
...@@ -329,7 +329,7 @@ public class TableManagePresenter extends BasePresenter<TableManageContract.Mode ...@@ -329,7 +329,7 @@ public class TableManagePresenter extends BasePresenter<TableManageContract.Mode
} }
} else { } else {
mRootView.showEmptyView(false, 0, null); mRootView.showEmptyView(false, 0, null);
mRootView.showMessage("查詢失敗"); // mRootView.showMessage("查詢失敗");
} }
} }
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/BaseOrderPresenter.java
...@@ -116,28 +116,25 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas ...@@ -116,28 +116,25 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas
this.mOrderMoneyList = myOrderManage.getOrderMoneyList(); this.mOrderMoneyList = myOrderManage.getOrderMoneyList();
resetSelected();
initOrderAdapter();
initItemClickListener();
if (IActivity instanceof OrderContentActivity) { if (IActivity instanceof OrderContentActivity) {
mOrderContentActivity = (OrderContentActivity) IActivity; mOrderContentActivity = (OrderContentActivity) IActivity;
} }
if (this instanceof MealStandPresenter) { if (this instanceof MealStandPresenter) {
mMealStandPresenter = (MealStandPresenter) this; mMealStandPresenter = (MealStandPresenter) this;
addTableServiceAmount();
addSentOrderMoney();
addOrderRounding();
} else if (this instanceof OrderContentPresenter) { } else if (this instanceof OrderContentPresenter) {
mOrderContentPresenter = (OrderContentPresenter) this; mOrderContentPresenter = (OrderContentPresenter) this;
} else if (this instanceof OrderPayPresenter) { } else if (this instanceof OrderPayPresenter) {
mOrderPayPresenter = (OrderPayPresenter) this; mOrderPayPresenter = (OrderPayPresenter) this;
} }
// removeOrderMoney(); resetSelected();
// addTableServiceAmount(); initOrderAdapter();
// addSentOrderMoney(); initItemClickListener();
// addOrderRounding();
removeOrderMoney();
addTableServiceAmount();
addSentOrderMoney();
addOrderRounding();
//設置賬單總金額 //設置賬單總金額
myOrderManage.setTotalAmount(getTotalAmount()); myOrderManage.setTotalAmount(getTotalAmount());
...@@ -326,10 +323,11 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas ...@@ -326,10 +323,11 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas
*/ */
private void addTableServiceAmount() { private void addTableServiceAmount() {
TableBean.DataBean dataBean = OpenTableManage.getDefault().getTableBean(); TableBean.DataBean dataBean = OpenTableManage.getDefault().getTableBean();
if (dataBean.getServiceCharge() > 0) { double serviceAmount = getTotalAmountFilterByType(BillOrderMoney.DISCOUNT_TYPE,BillOrderMoney.ROUNDING_TYPE) * dataBean.getServiceCharge() / 100;
if (serviceAmount > 0) {
BillOrderMoney orderMoney = new BillOrderMoney(); BillOrderMoney orderMoney = new BillOrderMoney();
orderMoney.setMoney(getTotalAmountFilterRounding() * dataBean.getServiceCharge() / 100); orderMoney.setMoney(serviceAmount);
orderMoney.setTitle(dataBean.getServiceCharge() + "%" + serviceChargeStr); orderMoney.setTitle(dataBean.getServiceCharge()+ "%" + serviceChargeStr);
orderMoney.setStatus(1); orderMoney.setStatus(1);
orderMoney.setType(BillOrderMoney.SERVERCHARGE_TYPE); orderMoney.setType(BillOrderMoney.SERVERCHARGE_TYPE);
orderMoney.setTextColor(ArmsUtils.getColor(IActivity, R.color.theme_black)); orderMoney.setTextColor(ArmsUtils.getColor(IActivity, R.color.theme_black));
...@@ -338,7 +336,7 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas ...@@ -338,7 +336,7 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas
} }
} }
private void removeTableServiceAmount(){ private void removeTableServiceAmount() {
for (BillOrderMoney item : mOrderMoneyList) { for (BillOrderMoney item : mOrderMoneyList) {
if (item.getType() == BillOrderMoney.SERVERCHARGE_TYPE) { if (item.getType() == BillOrderMoney.SERVERCHARGE_TYPE) {
mOrderMoneyList.remove(item); mOrderMoneyList.remove(item);
...@@ -347,10 +345,11 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas ...@@ -347,10 +345,11 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas
} }
} }
} }
/** /**
* 更新账单折扣 * 更新账单折扣
*/ */
private void updateTableServiceAmount(){ private void updateTableServiceAmount() {
removeTableServiceAmount(); removeTableServiceAmount();
addTableServiceAmount(); addTableServiceAmount();
} }
...@@ -361,7 +360,8 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas ...@@ -361,7 +360,8 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas
* @param discount * @param discount
*/ */
protected void addOrderDiscount(Discount discount, int status) { protected void addOrderDiscount(Discount discount, int status) {
double totalMoney = getFoodTotal(); for (BillOrderMoney item : mOrderMoneyList) { double totalMoney = getFoodTotal();
for (BillOrderMoney item : mOrderMoneyList) {
if (item.getType() == BillOrderMoney.ROUNDING_TYPE) { if (item.getType() == BillOrderMoney.ROUNDING_TYPE) {
mOrderMoneyList.remove(item); mOrderMoneyList.remove(item);
mOrderMoneyAdapter.notifyDataSetChanged(); mOrderMoneyAdapter.notifyDataSetChanged();
...@@ -453,7 +453,7 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas ...@@ -453,7 +453,7 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas
* 添加賬單小數行 * 添加賬單小數行
*/ */
protected void addOrderRounding() { protected void addOrderRounding() {
double m1 = getTotalAmountFilterRounding(); double m1 = getTotalAmountFilterByType(BillOrderMoney.ROUNDING_TYPE);
double m2 = MoneyUtil.getOrderRounding(m1); double m2 = MoneyUtil.getOrderRounding(m1);
double roundingMoney = 0.0; double roundingMoney = 0.0;
if (m2 != 0) { if (m2 != 0) {
...@@ -530,11 +530,11 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas ...@@ -530,11 +530,11 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas
* *
* @return * @return
*/ */
public double getTotalAmountFilterRounding() { public double getTotalAmountFilterByType(int ... filterTypes) {
double foodTotal = getFoodTotal(); double foodTotal = getFoodTotal();
for (BillOrderMoney item : mOrderMoneyList) { for (BillOrderMoney item : mOrderMoneyList) {
//排除賬單小數 // if (item.getType() != BillOrderMoney.ROUNDING_TYPE) {
if (item.getType() != BillOrderMoney.ROUNDING_TYPE) { if (!filterType(item.getType(),filterTypes)) {
foodTotal = MoneyUtil.sum(foodTotal, item.getMoney()); foodTotal = MoneyUtil.sum(foodTotal, item.getMoney());
if (0 > foodTotal) { if (0 > foodTotal) {
//折扣金額不能超出總額 //折扣金額不能超出總額
...@@ -545,6 +545,14 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas ...@@ -545,6 +545,14 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas
return MoneyUtil.get_ItemDecimals_money(foodTotal); return MoneyUtil.get_ItemDecimals_money(foodTotal);
} }
private boolean filterType(int curType,int ... filterTypes){
for (int type: filterTypes) {
if(curType == type){
return true;
}
}
return false;
}
/** /**
* 獲取總金額:已減去折扣,服務費 * 獲取總金額:已減去折扣,服務費
* *
......
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