1、删除送单食品问题

base-module/src/main/java/com/gingersoft/gsa/cloud/base/common/bean/OrderDetail.java

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