Skip to content

S
supplier
Commit 47147bd1 by 宁斌
Options

1、删除送单食品问题

parent 85c7cde7
Showing with 33 additions and 10 deletions
base-module/src/main/java/com/gingersoft/gsa/cloud/base/common/bean/OrderDetail.java
...@@ -902,6 +902,7 @@ public class OrderDetail implements Serializable { ...@@ -902,6 +902,7 @@ public class OrderDetail implements Serializable {
orderDetail.setTopId(orderDetailsBean.getTopId()); orderDetail.setTopId(orderDetailsBean.getTopId());
orderDetail.setProductName(orderDetailsBean.getProductName()); orderDetail.setProductName(orderDetailsBean.getProductName());
orderDetail.setNumber(orderDetailsBean.getNumber()); orderDetail.setNumber(orderDetailsBean.getNumber());
orderDetail.setUnit_price(orderDetailsBean.getPrice());
orderDetail.setPrice(orderDetailsBean.getPrice() * orderDetailsBean.getNumber()); orderDetail.setPrice(orderDetailsBean.getPrice() * orderDetailsBean.getNumber());
orderDetail.setVisible(orderDetailsBean.getStatus() == 0); orderDetail.setVisible(orderDetailsBean.getStatus() == 0);
orderDetail.setPrintseting(orderDetailsBean.getPrintSetIng()); orderDetail.setPrintseting(orderDetailsBean.getPrintSetIng());
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/MealStandPresenter.java
...@@ -227,6 +227,11 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod ...@@ -227,6 +227,11 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod
mRootView.recordOperat(true); mRootView.recordOperat(true);
//有取消的食品不能操作
OrderDetail currentOrderDetail = mSelectMealAdapter.getCurrentOrderDetail();
if(currentOrderDetail != null && currentOrderDetail.isModify()){
return;
}
if (mSelectMealAdapter.getSelectedMode() == SelectMealAdapter.MULTIPLE_SELECTED) { if (mSelectMealAdapter.getSelectedMode() == SelectMealAdapter.MULTIPLE_SELECTED) {
return; return;
} }
...@@ -829,6 +834,10 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod ...@@ -829,6 +834,10 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod
} else { } else {
item.setNumber(0); item.setNumber(0);
} }
if (item.getNumber() != 0) {
//更新食品金额
item.setPrice(item.getNumber() * item.getUnit_price());
}
item.setCancelReason(reason); item.setCancelReason(reason);
item.setReasonId(reasonId); item.setReasonId(reasonId);
item.setCancelNumber(deleteNumber); item.setCancelNumber(deleteNumber);
...@@ -841,6 +850,9 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod ...@@ -841,6 +850,9 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod
mRootView.showBtnMealModifyRestoreVisibility(true); mRootView.showBtnMealModifyRestoreVisibility(true);
//更新賬單金額
updateOrderMoneyItem();
// String deleteOrderRequest = GsonUtils.GsonString(request); // String deleteOrderRequest = GsonUtils.GsonString(request);
// RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), deleteOrderRequest); // RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), deleteOrderRequest);
// //
...@@ -909,9 +921,15 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod ...@@ -909,9 +921,15 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod
item.setCancelReason(""); item.setCancelReason("");
item.setReasonId(0); item.setReasonId(0);
item.setCancelNumber(0); item.setCancelNumber(0);
if (item.getNumber() != 0) {
//恢复食品金额
item.setPrice(item.getNumber() * item.getUnit_price());
}
} }
myOrderManage.setDeleteOrders(null); myOrderManage.setDeleteOrders(null);
mSelectMealAdapter.notifyDataSetChanged(); mSelectMealAdapter.notifyDataSetChanged();
//更新賬單金額
updateOrderMoneyItem();
} }
public void queryMember(int type, String parm, String shopName, int tableId, String tableNumber) { public void queryMember(int type, String parm, String shopName, int tableId, String tableNumber) {
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/OrderPayPresenter.java
package com.gingersoft.gsa.cloud.table.mvp.presenter; package com.gingersoft.gsa.cloud.table.mvp.presenter;
import android.app.Application; import android.app.Application;
import android.text.TextUtils;
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.BaseResult;
...@@ -236,14 +237,17 @@ public class OrderPayPresenter extends BaseOrderPresenter<OrderPayContract.Model ...@@ -236,14 +237,17 @@ public class OrderPayPresenter extends BaseOrderPresenter<OrderPayContract.Model
mRootView.hideLoading(); mRootView.hideLoading();
if (baseResult.isSuccess()) { if (baseResult.isSuccess()) {
OrderPayRespose orderPayRespose = JsonUtils.parseObject(baseResult.getData(), OrderPayRespose.class); OrderPayRespose orderPayRespose = JsonUtils.parseObject(baseResult.getData(), OrderPayRespose.class);
if (orderPayRespose != null) {
if(myOrderManage.getMemberInfo() != null){
MyOrderManage.getInstance().setAddPoints(orderPayRespose.getAddPoints()); MyOrderManage.getInstance().setAddPoints(orderPayRespose.getAddPoints());
MyOrderManage.getInstance().setNowPoint(orderPayRespose.getNowPoint()); MyOrderManage.getInstance().setNowPoint(orderPayRespose.getNowPoint());
MyOrderManage.getInstance().setOldPoints(orderPayRespose.getOldPoints()); MyOrderManage.getInstance().setOldPoints(orderPayRespose.getOldPoints());
}else {
if(!TextUtils.isEmpty(orderPayRespose.getVerifyCode())){
MyOrderManage.getInstance().setIntegralQrcode(orderPayRespose.getVerifyCode()); MyOrderManage.getInstance().setIntegralQrcode(orderPayRespose.getVerifyCode());
// MemberInfo memberInfo = MyOrderManage.getInstance().getMemberInfo(); }
// if (memberInfo != null) { }
// setPoints(memberInfo); }
// }
//結賬成功 //結賬成功
mRootView.paySuccess(); mRootView.paySuccess();
} }
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/OrderPayActivity.java
...@@ -482,12 +482,12 @@ public class OrderPayActivity extends BaseActivity<OrderPayPresenter> implements ...@@ -482,12 +482,12 @@ public class OrderPayActivity extends BaseActivity<OrderPayPresenter> implements
} }
} }
if (openInstruction) { if (openInstruction) {
// CC.obtainBuilder("Component.Print") CC.obtainBuilder("Component.Print")
// .setActionName("printActivity") .setActionName("printActivity")
// .addParam(PrintConstans.PRINT_TYPE, PrintConstans.PRINT_INSTRUCTION) .addParam(PrintConstans.PRINT_TYPE, PrintConstans.PRINT_INSTRUCTION)
// .build() .build()
// .callAsync((cc, result) -> { .callAsync((cc, result) -> {
// }); });
printBill(); printBill();
} else { } else {
printBill(); printBill();
......
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