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

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

@@ -85,7 +85,7 @@ public class TableBean {
         private String createBy;
         private String qrCodeImg;
         private int posTableId;
-        private float serviceCharge;
+        private long serviceCharge;
         private long memberId;
         /**
          * 未開檯   0
@@ -228,11 +228,11 @@ public class TableBean {
             this.posTableId = posTableId;
         }
 
-        public float getServiceCharge() {
+        public long getServiceCharge() {
             return serviceCharge;
         }
 
-        public void setServiceCharge(float serviceCharge) {
+        public void setServiceCharge(long 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
     @Override
     public void loginSuccess(LoginBean info) {
         super.loginSuccess(info);
-        finish();
+//        finish();
     }
 
     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
                             }
                         } else {
                             mRootView.showEmptyView(false, 0, null);
-                            mRootView.showMessage("查詢失敗");
+//                            mRootView.showMessage("查詢失敗");
                         }
                     }
 
@@ -329,7 +329,7 @@ public class TableManagePresenter extends BasePresenter<TableManageContract.Mode
                             }
                         } else {
                             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
         this.mOrderMoneyList = myOrderManage.getOrderMoneyList();
 
 
-        resetSelected();
-        initOrderAdapter();
-        initItemClickListener();
-        
         if (IActivity instanceof OrderContentActivity) {
             mOrderContentActivity = (OrderContentActivity) IActivity;
         }
         if (this instanceof MealStandPresenter) {
             mMealStandPresenter = (MealStandPresenter) this;
-            addTableServiceAmount();
-            addSentOrderMoney();
-            addOrderRounding();
         } else if (this instanceof OrderContentPresenter) {
             mOrderContentPresenter = (OrderContentPresenter) this;
         } else if (this instanceof OrderPayPresenter) {
             mOrderPayPresenter = (OrderPayPresenter) this;
         }
 
-//        removeOrderMoney();
-//        addTableServiceAmount();
-//        addSentOrderMoney();
-//        addOrderRounding();
+        resetSelected();
+        initOrderAdapter();
+        initItemClickListener();
+
+        removeOrderMoney();
+        addTableServiceAmount();
+        addSentOrderMoney();
+        addOrderRounding();
 
         //設置賬單總金額
         myOrderManage.setTotalAmount(getTotalAmount());
@@ -326,10 +323,11 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas
      */
     private void addTableServiceAmount() {
         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();
-            orderMoney.setMoney(getTotalAmountFilterRounding() * dataBean.getServiceCharge() / 100);
-            orderMoney.setTitle(dataBean.getServiceCharge() + "%" + serviceChargeStr);
+            orderMoney.setMoney(serviceAmount);
+            orderMoney.setTitle(dataBean.getServiceCharge()+ "%" + serviceChargeStr);
             orderMoney.setStatus(1);
             orderMoney.setType(BillOrderMoney.SERVERCHARGE_TYPE);
             orderMoney.setTextColor(ArmsUtils.getColor(IActivity, R.color.theme_black));
@@ -338,7 +336,7 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas
         }
     }
 
-    private void removeTableServiceAmount(){
+    private void removeTableServiceAmount() {
         for (BillOrderMoney item : mOrderMoneyList) {
             if (item.getType() == BillOrderMoney.SERVERCHARGE_TYPE) {
                 mOrderMoneyList.remove(item);
@@ -347,21 +345,23 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas
             }
         }
     }
+
     /**
      * 更新账单折扣
      */
-    private void updateTableServiceAmount(){
+    private void updateTableServiceAmount() {
         removeTableServiceAmount();
         addTableServiceAmount();
     }
-    
+
     /**
      * 添加賬單折扣
      *
      * @param discount
      */
     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) {
                 mOrderMoneyList.remove(item);
                 mOrderMoneyAdapter.notifyDataSetChanged();
@@ -453,7 +453,7 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas
      * 添加賬單小數行
      */
     protected void addOrderRounding() {
-        double m1 = getTotalAmountFilterRounding();
+        double m1 = getTotalAmountFilterByType(BillOrderMoney.ROUNDING_TYPE);
         double m2 = MoneyUtil.getOrderRounding(m1);
         double roundingMoney = 0.0;
         if (m2 != 0) {
@@ -530,11 +530,11 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas
      *
      * @return
      */
-    public double getTotalAmountFilterRounding() {
+    public double getTotalAmountFilterByType(int ... filterTypes) {
         double foodTotal = getFoodTotal();
         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());
                 if (0 > foodTotal) {
                     //折扣金額不能超出總額
@@ -545,6 +545,14 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas
         return MoneyUtil.get_ItemDecimals_money(foodTotal);
     }
 
+    private boolean filterType(int curType,int ... filterTypes){
+        for (int type: filterTypes) {
+            if(curType == type){
+                return true;
+            }
+        }
+        return false;
+    }
     /**
      * 獲取總金額:已減去折扣,服務費
      *