1、營業金額淨值計算問題

base-module/src/main/java/com/gingersoft/gsa/cloud/globalconfig/applyOptions/MyResponseErrorListener.java

@@ -59,7 +59,6 @@ public class MyResponseErrorListener implements ResponseErrorListener {
             ToastUtils.show(context, msg);
             ToastUtils.show(context, msg);
         }
         }
     }
     }
-
     private String convertStatusCode(Context context, HttpException httpException) {
     private String convertStatusCode(Context context, HttpException httpException) {
         String msg = null;
         String msg = null;
         if (httpException.code() == 500) {
         if (httpException.code() == 500) {

download-module/src/main/java/com/gingersoft/gsa/cloud/download/mvp/presenter/DownloadPresenter.java

@@ -728,12 +728,13 @@ public class DownloadPresenter extends BasePresenter<DownloadContract.Model, Dow
     }
     }
 
 
     private String[] getDownloadUrls(int restaurantId) {
     private String[] getDownloadUrls(int restaurantId) {
+        String[] urls = new String[urlList.length];
         for (int i = 0; i < urlList.length; i++) {
         for (int i = 0; i < urlList.length; i++) {
             if (i != 0) {
             if (i != 0) {
-                urlList[i] += "?restaurantId=" + restaurantId;
+                urls[i] = urlList[i] += "?restaurantId=" + restaurantId;
             }
             }
         }
         }
-        return urlList;
+        return urls;
     }
     }
 
 
     private List<DownloadRequest> getDownloadRequests(String[] urls, int restaurantId) {
     private List<DownloadRequest> getDownloadRequests(String[] urls, int restaurantId) {

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

@@ -134,7 +134,7 @@ public class BusinessReportPresenter extends BasePresenter<BusinessReportContrac
             //服務費和貼士
             //服務費和貼士
             double extraIncome = MoneyUtil.sum(dataBean.getScamount(), dataBean.getTipsPrice());
             double extraIncome = MoneyUtil.sum(dataBean.getScamount(), dataBean.getTipsPrice());
             //"營業金額淨值"為項目銷售總金額-折扣+服務費-賬單小數-簽單
             //"營業金額淨值"為項目銷售總金額-折扣+服務費-賬單小數-簽單
-            businessBeans.add(new BusinessBean(itemNames[5], String.valueOf(MoneyUtil.sub(MoneyUtil.sum(dataBean.getPrices(), extraIncome), expenditure))));
+            businessBeans.add(new BusinessBean(itemNames[5], String.valueOf(MoneyUtil.sub(MoneyUtil.sum(dataBean.getPrices(), extraIncome), Math.abs(expenditure)))));
             businessBeans.add(new BusinessBean(itemNames[6], String.valueOf(dataBean.getTipsPrice())));
             businessBeans.add(new BusinessBean(itemNames[6], String.valueOf(dataBean.getTipsPrice())));
             businessBeans.add(new BusinessBean(itemNames[7], String.valueOf(dataBean.getTotalMeals())));
             businessBeans.add(new BusinessBean(itemNames[7], String.valueOf(dataBean.getTotalMeals())));
             businessBeans.add(new BusinessBean(itemNames[8], String.valueOf(dataBean.getTakeawayTotal())));
             businessBeans.add(new BusinessBean(itemNames[8], String.valueOf(dataBean.getTakeawayTotal())));

manager-module/src/main/java/com/gingersoft/gsa/cloud/manager/mvp/ui/fragment/AddTableFragment.java

@@ -367,6 +367,9 @@ public class AddTableFragment extends BaseFragment<AddTablePresenter> implements
 
 
     private String getAreaName() {
     private String getAreaName() {
         String areaName = mTableItem.getRegionName();
         String areaName = mTableItem.getRegionName();
+        if(TextUtils.isEmpty(areaName)){
+            areaName = "默認";
+        }
         currentAreaId = mTableItem.getRegionId();
         currentAreaId = mTableItem.getRegionId();
         return areaName;
         return areaName;
     }
     }