1、印單，結賬不打印合計問題

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

@@ -60,6 +60,8 @@ public class MyOrderManage {
     protected List<BillOrderMoney> orderMoneyList = new ArrayList<>();
     /**本次支付方式，用於打印*/
     private List<PayMethod> billMoney = new ArrayList<>();
+    /**合計*/
+    private double wholeAmount = 0.0;
     /**總金額*/
     private double totalAmount = 0.0;
 
@@ -1028,6 +1030,7 @@ public class MyOrderManage {
         if (billMoney != null) {
             billMoney.clear();
         }
+        wholeAmount = 0.0;
         totalAmount = 0.0;
         orderBean = null;
         modifyOrder = false;
@@ -1175,6 +1178,14 @@ public class MyOrderManage {
         this.totalAmount = totalAmount;
     }
 
+    public double getWholeAmount() {
+        return wholeAmount;
+    }
+
+    public void setWholeAmount(double wholeAmount) {
+        this.wholeAmount = wholeAmount;
+    }
+
     //
 //    public List<DatasBean> getComboOrders() {
 //        return comboOrders;

print-module/src/main/java/com/joe/print/mvp/print/PrintBill.java

@@ -92,6 +92,9 @@ public class PrintBill extends PrinterRoot {
         rvFood.setAdapter(foodAdapter);
 
         List<BillingBean> billingBeans = new ArrayList<>();
+        //添加合計項
+        billingBeans.add(new BillingBean("合計",MyOrderManage.getInstance().getWholeAmount()));
+        //添加其他金額項
         if (MyOrderManage.getInstance().getOrderMoneyList().size() > 0) {
             for (BillOrderMoney item : MyOrderManage.getInstance().getOrderMoneyList()) {
                 billingBeans.add(new BillingBean(item.getTitle(), item.getMoney()));

print-module/src/main/java/com/joe/print/mvp/print/PrintSlip.java

@@ -91,6 +91,9 @@ public class PrintSlip extends PrinterRoot {
         rvFood.setAdapter(foodAdapter);
 
         List<BillingBean> billingBeans = new ArrayList<>();
+        //添加合計項
+        billingBeans.add(new BillingBean("合計",MyOrderManage.getInstance().getWholeAmount()));
+        //添加其他金額項
         if (MyOrderManage.getInstance().getOrderMoneyList().size() > 0) {
             for (BillOrderMoney item : MyOrderManage.getInstance().getOrderMoneyList()) {
                 billingBeans.add(new BillingBean(item.getTitle(), item.getMoney()));

table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/BaseOrderPresenter.java

@@ -246,6 +246,7 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas
         return true;
     }
 
+
     /**
      * 送單
      *
@@ -324,7 +325,7 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas
      */
     private void addTableServiceAmount() {
         TableBean.DataBean dataBean = OpenTableManage.getDefault().getTableBean();
-        if(dataBean == null){
+        if (dataBean == null) {
             return;
         }
         double serviceAmount = getTotalAmountFilterByType(BillOrderMoney.SERVERCHARGE_TYPE, BillOrderMoney.DISCOUNT_TYPE, BillOrderMoney.ROUNDING_TYPE) * dataBean.getServiceCharge() / 100;
@@ -355,7 +356,7 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas
             double serviceAmount = getTotalAmountFilterByType(BillOrderMoney.SERVERCHARGE_TYPE, BillOrderMoney.DISCOUNT_TYPE, BillOrderMoney.ROUNDING_TYPE) * dataBean.getServiceCharge() / 100;
             if (serviceAmount > 0) {
                 billOrderMoney.setMoney(serviceAmount);
-            }else {
+            } else {
                 mOrderMoneyList.remove(billOrderMoney);
             }
             mOrderMoneyAdapter.notifyDataSetChanged();
@@ -975,6 +976,16 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas
         return false;
     }
 
+    protected boolean hasNewBillOrderItem() {
+        boolean hasNewBillOrder = false;
+        for (BillOrderMoney orderMoney : mOrderMoneyList) {
+            if (orderMoney.getStatus() == 0) {
+                hasNewBillOrder = true;
+            }
+        }
+        return hasNewBillOrder;
+    }
+
     public List<OrderDetail> getOrderFoodLists() {
         return myOrderManage.getOrderFoodList();
     }

table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/OrderContentPresenter.java

@@ -187,7 +187,7 @@ public class OrderContentPresenter extends BaseOrderPresenter<OrderContentContra
                         if (!canPrint()) {
                             return;
                         }
-                        if (hasNesOrderFoods()) {
+                        if (hasNesOrderFoods() || getNesOrderDiscount() != null) {
                             //有未送單食品先送單
                             sendOrder(true);
                         } else {
@@ -626,7 +626,7 @@ public class OrderContentPresenter extends BaseOrderPresenter<OrderContentContra
             mDiscountDialog.setOnClickListener(new DiscountDialog.Builder.OnClickListener() {
                 @Override
                 public void onItemClick(Discount item, int position) {
-                    addOrderDiscount(false,item, 0);
+                    addOrderDiscount(false, item, 0);
                     updateOrderMoneyItem();
                 }
             });

table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/OrderContentActivity.java

@@ -196,8 +196,12 @@ public class OrderContentActivity extends BaseFragmentActivity<OrderContentPrese
         } else {
             btn_order_count.setVisibility(View.INVISIBLE);
         }
-        tv_whole.setText("合計  $" + mPresenter.getFoodTotal());
+        double wholeAmount = mPresenter.getFoodTotal();
+
+        tv_whole.setText("合計  $" + wholeAmount);
         tv_total.setText("$" + mPresenter.getTotalAmount());
+
+        MyOrderManage.getInstance().setWholeAmount(wholeAmount);
     }
 
     private void initTopInfo() {

table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/OrderPayActivity.java

@@ -226,7 +226,11 @@ public class OrderPayActivity extends BaseActivity<OrderPayPresenter> implements
 //        } else {
 //            btn_order_count.setVisibility(View.INVISIBLE);
 //        }
-        tv_whole.setText("合計  $" + mPresenter.getFoodTotal());
+        double wholeAmount = mPresenter.getFoodTotal();
+        tv_whole.setText("合計  $" + wholeAmount);
+
+        MyOrderManage.getInstance().setWholeAmount(wholeAmount);
+
 //        tv_total.setText("$" + mPresenter.getTotalAmount());
 //        setDifferenceText();
     }

table-module/src/main/res/layout/table_activity_order_pay.xml

@@ -103,7 +103,7 @@
         android:id="@+id/tv_whole"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="合計 $1328.0"
+        android:text="合計:"
         android:textSize="@dimen/sp_20"
         android:textStyle="bold"
         android:textColor="@color/theme_text_color"