Skip to content

S
supplier
Commit 88719c53 by 宁斌
Options

1、賬單管理有時不能打印支付方式 

2、清機報表數據錯誤調整
parent 62672cb9
Showing with 35 additions and 20 deletions
main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/activity/SettlementReportActivity.java
...@@ -264,8 +264,8 @@ public class SettlementReportActivity extends BaseActivity<SettlementReportPrese ...@@ -264,8 +264,8 @@ public class SettlementReportActivity extends BaseActivity<SettlementReportPrese
SettlementReport.DataBean.VoBean voBean = datasBean.getVo(); SettlementReport.DataBean.VoBean voBean = datasBean.getVo();
if (voBean != null) { if (voBean != null) {
settlementReportItem5s.add(new SectionTextItem5(projectTotalSalesText, null, null, null, "$" + df.format(voBean.getPrices()))); settlementReportItem5s.add(new SectionTextItem5(projectTotalSalesText, null, null, null, cashStr + df.format(voBean.getPrices())));
settlementReportItem5s.add(new SectionTextItem5(netTurnoverText, null, null, null, "$" + df.format(voBean.getTotamount()))); settlementReportItem5s.add(new SectionTextItem5(netTurnoverText, null, null, null, cashStr+ df.format(voBean.getTotamount())));
// if (voBean.getPayNum() > 0) { // if (voBean.getPayNum() > 0) {
// String creditCardText = LanguageUtils.get_language_system(this, "credit.card", "信用卡"); // String creditCardText = LanguageUtils.get_language_system(this, "credit.card", "信用卡");
// SectionTextItem5 printItem = new SectionTextItem5(creditCardText, String.valueOf(voBean.getPayNum()), null,null,"$" + df.format(voBean.getPayamount())); // SectionTextItem5 printItem = new SectionTextItem5(creditCardText, String.valueOf(voBean.getPayNum()), null,null,"$" + df.format(voBean.getPayamount()));
...@@ -273,12 +273,12 @@ public class SettlementReportActivity extends BaseActivity<SettlementReportPrese ...@@ -273,12 +273,12 @@ public class SettlementReportActivity extends BaseActivity<SettlementReportPrese
// } // }
settlementReportItem5s.add(new SectionTextItem5(null, null, null, null, null)); settlementReportItem5s.add(new SectionTextItem5(null, null, null, null, null));
settlementReportItem5s.add(new SectionTextItem5(cashAuditText, null, null, null, null)); settlementReportItem5s.add(new SectionTextItem5(cashAuditText, null, null, null, null));
settlementReportItem5s.add(new SectionTextItem5(netTurnoverText, null, null, null, "$" + df.format(voBean.getPrices()))); settlementReportItem5s.add(new SectionTextItem5(netTurnoverText, null, null, null, cashStr + df.format(voBean.getPrices())));
List<SettlementReport.DataBean.CashBean> cashList = datasBean.getCash(); List<SettlementReport.DataBean.CashBean> cashList = datasBean.getCash();
if (cashList != null && cashList.size() > 0) { if (cashList != null && cashList.size() > 0) {
for (int i = 0; i < cashList.size(); i++) { for (int i = 0; i < cashList.size(); i++) {
SettlementReport.DataBean.CashBean cashBean = cashList.get(i); SettlementReport.DataBean.CashBean cashBean = cashList.get(i);
settlementReportItem5s.add(new SectionTextItem5(cashBean.getPayName(), null, String.valueOf(cashBean.getPayNum()), null, "$" + df.format(cashBean.getPayAmount()))); settlementReportItem5s.add(new SectionTextItem5(cashBean.getPayName(), null, String.valueOf(cashBean.getPayNum()), null, cashStr + df.format(cashBean.getPayAmount())));
} }
} }
} }
...@@ -291,9 +291,9 @@ public class SettlementReportActivity extends BaseActivity<SettlementReportPrese ...@@ -291,9 +291,9 @@ public class SettlementReportActivity extends BaseActivity<SettlementReportPrese
String cashText = LanguageUtils.get_language_system(this, "credit.cash", "現金"); String cashText = LanguageUtils.get_language_system(this, "credit.cash", "現金");
settlementReportItem5s.add(new SectionTextItem5("==============================================================", null, null, null, null)); settlementReportItem5s.add(new SectionTextItem5("==============================================================", null, null, null, null));
settlementReportItem5s.add(new SectionTextItem5(null, null, cashDetailText, null, null)); settlementReportItem5s.add(new SectionTextItem5(null, null, cashDetailText, null, null));
settlementReportItem5s.add(new SectionTextItem5(cashText, null, String.valueOf(cashBean.getPayNum()), null, "$" + df.format(cashBean.getPayAmount()))); settlementReportItem5s.add(new SectionTextItem5(cashText, null, String.valueOf(cashBean.getPayNum()), null, cashStr + df.format(cashBean.getPayAmount())));
//統計 //統計
settlementReportItem5s.add(new SectionTextItem5(headcountOrAverageConsumptionText, null, null, null, "$" + df.format(cashBean.getPayAmount()))); settlementReportItem5s.add(new SectionTextItem5(headcountOrAverageConsumptionText, null, null, null, cashStr + df.format(cashBean.getPayAmount())));
} }
if (voBean != null) { if (voBean != null) {
...@@ -301,21 +301,21 @@ public class SettlementReportActivity extends BaseActivity<SettlementReportPrese ...@@ -301,21 +301,21 @@ public class SettlementReportActivity extends BaseActivity<SettlementReportPrese
settlementReportItem5s.add(new SectionTextItem5("==============================================================", null, null, null, null)); settlementReportItem5s.add(new SectionTextItem5("==============================================================", null, null, null, null));
settlementReportItem5s.add(new SectionTextItem5(null, null, analysisStatisticsText, null, null)); settlementReportItem5s.add(new SectionTextItem5(null, null, analysisStatisticsText, null, null));
//帳單金額總數 //帳單金額總數
settlementReportItem5s.add(new SectionTextItem5(totalbillAmountText, null, null, null, "$" + df.format(voBean.getTotamount()))); settlementReportItem5s.add(new SectionTextItem5(totalbillAmountText, null, null, null, cashStr + df.format(voBean.getTotamount())));
//帳單數目 / 平均 //帳單數目 / 平均
String averagePrice = "0.00"; String averagePrice = "0.00";
if (voBean.getNum() != 0) { if (voBean.getNum() != 0) {
double number = voBean.getPrices() / voBean.getNum(); double number = voBean.getPrices() / voBean.getNum();
averagePrice = df.format(Double.isNaN(number) ? 0 : number); averagePrice = df.format(Double.isNaN(number) ? 0 : number);
} }
settlementReportItem5s.add(new SectionTextItem5(numberBillsOrAverageText, null, String.valueOf(voBean.getNum()), null, "$" + averagePrice)); settlementReportItem5s.add(new SectionTextItem5(numberBillsOrAverageText, null, String.valueOf(voBean.getNum()), null, cashStr + averagePrice));
//人數 / 平均消費 //人數 / 平均消費
String averageConsumption = "0.00"; String averageConsumption = "0.00";
if (voBean.getPerson() != 0) { if (voBean.getPerson() != 0) {
double number = voBean.getPrices() / voBean.getPerson(); double number = voBean.getPrices() / voBean.getPerson();
averageConsumption = df.format(Double.isNaN(number) ? 0 : number); averageConsumption = df.format(Double.isNaN(number) ? 0 : number);
} }
settlementReportItem5s.add(new SectionTextItem5(headcountAndAverageConsumptionText, null, String.valueOf(voBean.getPerson()), null, "$" + averageConsumption)); settlementReportItem5s.add(new SectionTextItem5(headcountAndAverageConsumptionText, null, String.valueOf(voBean.getPerson()), null, cashStr + averageConsumption));
/** 帳單統計*/ /** 帳單統計*/
settlementReportItem5s.add(new SectionTextItem5("==============================================================", null, null, null, null)); settlementReportItem5s.add(new SectionTextItem5("==============================================================", null, null, null, null));
...@@ -337,8 +337,8 @@ public class SettlementReportActivity extends BaseActivity<SettlementReportPrese ...@@ -337,8 +337,8 @@ public class SettlementReportActivity extends BaseActivity<SettlementReportPrese
//new "外賣" //new "外賣"
settlementReportItem5s.add(new SectionTextItem5("類別", null, null, null, totalText)); settlementReportItem5s.add(new SectionTextItem5("類別", null, null, null, totalText));
settlementReportItem5s.add(new SectionTextItem5("賬單", null, null, null, String.valueOf(voBean.getNum()))); settlementReportItem5s.add(new SectionTextItem5("賬單", null, null, null, String.valueOf(voBean.getNum())));
settlementReportItem5s.add(new SectionTextItem5("金額", null, null, null, "$" + df.format(voBean.getTotamount()))); settlementReportItem5s.add(new SectionTextItem5("金額", null, null, null, cashStr + df.format(voBean.getTotamount())));
settlementReportItem5s.add(new SectionTextItem5("平均", null, null, null, "$" + averagePrice2)); settlementReportItem5s.add(new SectionTextItem5("平均", null, null, null, cashStr + averagePrice2));
settlementReportItem5s.add(new SectionTextItem5("金額%", null, null, null, percentage + "%")); settlementReportItem5s.add(new SectionTextItem5("金額%", null, null, null, percentage + "%"));
} }
...@@ -360,21 +360,21 @@ public class SettlementReportActivity extends BaseActivity<SettlementReportPrese ...@@ -360,21 +360,21 @@ public class SettlementReportActivity extends BaseActivity<SettlementReportPrese
int item5PeopleNum = 0; int item5PeopleNum = 0;
if (analysisBeanMap.containsKey(outstandingBillText)) { if (analysisBeanMap.containsKey(outstandingBillText)) {
SettlementReport.DataBean.AnalysisBean analysisBean = analysisBeanMap.get(outstandingBillText); SettlementReport.DataBean.AnalysisBean analysisBean = analysisBeanMap.get(outstandingBillText);
settlementReportItem5s.add(new SectionTextItem5(analysisBean.getTypeName(), String.valueOf(analysisBean.getNum()), String.valueOf(analysisBean.getNum()), null, "$" + df.format(analysisBean.getAmount()))); settlementReportItem5s.add(new SectionTextItem5(analysisBean.getTypeName(), String.valueOf(analysisBean.getNum()), String.valueOf(analysisBean.getPerson()), null, cashStr + df.format(analysisBean.getAmount())));
item5Amount += analysisBean.getAmount(); item5Amount += analysisBean.getAmount();
item5num += analysisBean.getNum(); item5num += analysisBean.getNum();
item5PeopleNum += analysisBean.getNum(); item5PeopleNum += analysisBean.getPerson();
} }
//已收款帳單 //已收款帳單
if (analysisBeanMap.containsKey(billsReceivedText)) { if (analysisBeanMap.containsKey(billsReceivedText)) {
SettlementReport.DataBean.AnalysisBean analysisBean = analysisBeanMap.get(billsReceivedText); SettlementReport.DataBean.AnalysisBean analysisBean = analysisBeanMap.get(billsReceivedText);
settlementReportItem5s.add(new SectionTextItem5(analysisBean.getTypeName(), String.valueOf(analysisBean.getNum()), String.valueOf(analysisBean.getNum()), null, "$" + df.format(analysisBean.getAmount()))); settlementReportItem5s.add(new SectionTextItem5(analysisBean.getTypeName(), String.valueOf(analysisBean.getNum()), String.valueOf(analysisBean.getPerson()), null,cashStr + df.format(analysisBean.getAmount())));
item5Amount += analysisBean.getAmount(); item5Amount += analysisBean.getAmount();
item5num += analysisBean.getNum(); item5num += analysisBean.getNum();
item5PeopleNum += analysisBean.getNum(); item5PeopleNum += analysisBean.getPerson();
} }
//總計 //總計
settlementReportItem5s.add(new SectionTextItem5(totalText, String.valueOf(item5PeopleNum), String.valueOf(item5num), null, "$" + df.format(item5Amount))); settlementReportItem5s.add(new SectionTextItem5(totalText, String.valueOf(item5num), String.valueOf(item5PeopleNum), null, cashStr + df.format(item5Amount)));
/**本月累計營業額*/ /**本月累計營業額*/
...@@ -387,7 +387,7 @@ public class SettlementReportActivity extends BaseActivity<SettlementReportPrese ...@@ -387,7 +387,7 @@ public class SettlementReportActivity extends BaseActivity<SettlementReportPrese
settlementReportItem5s.add(new SectionTextItem5(cumulativeTurnoverMonthText, null, null, null, null)); settlementReportItem5s.add(new SectionTextItem5(cumulativeTurnoverMonthText, null, null, null, null));
settlementReportItem5s.add(new SectionTextItem5(byBusinessDateText + firstDayOfMonth, null, null, null, null)); settlementReportItem5s.add(new SectionTextItem5(byBusinessDateText + firstDayOfMonth, null, null, null, null));
settlementReportItem5s.add(new SectionTextItem5(toBusinessDateText + currentDate, null, null, null, null)); settlementReportItem5s.add(new SectionTextItem5(toBusinessDateText + currentDate, null, null, null, null));
settlementReportItem5s.add(new SectionTextItem5(netTurnoverText, null, null, null, "$" + df.format(analysisBean.getAmount()))); settlementReportItem5s.add(new SectionTextItem5(netTurnoverText, null, null, null, cashStr + df.format(analysisBean.getAmount())));
} }
/**報表完結*/ /**報表完結*/
......
table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/AllOrderPresenter.java
...@@ -5,10 +5,10 @@ import android.content.Context; ...@@ -5,10 +5,10 @@ import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.util.Log; import android.util.Log;
import android.view.View; import android.view.View;
import com.billy.cc.core.component.CC; import com.billy.cc.core.component.CC;
import com.gingersoft.gsa.cloud.base.common.bean.OrderBean; import com.gingersoft.gsa.cloud.base.common.bean.OrderBean;
import com.gingersoft.gsa.cloud.base.common.bean.OrderDetail; import com.gingersoft.gsa.cloud.base.common.bean.OrderDetail;
import com.gingersoft.gsa.cloud.base.common.bean.PayMethod;
import com.gingersoft.gsa.cloud.base.common.bean.TableBean; import com.gingersoft.gsa.cloud.base.common.bean.TableBean;
import com.gingersoft.gsa.cloud.base.common.bean.mealManage.MyOrderManage; import com.gingersoft.gsa.cloud.base.common.bean.mealManage.MyOrderManage;
import com.gingersoft.gsa.cloud.base.common.bean.mealManage.OpenTableManage; import com.gingersoft.gsa.cloud.base.common.bean.mealManage.OpenTableManage;
...@@ -25,9 +25,7 @@ import com.jess.arms.integration.AppManager; ...@@ -25,9 +25,7 @@ import com.jess.arms.integration.AppManager;
import com.jess.arms.di.scope.FragmentScope; import com.jess.arms.di.scope.FragmentScope;
import com.jess.arms.mvp.BasePresenter; import com.jess.arms.mvp.BasePresenter;
import com.jess.arms.http.imageloader.ImageLoader; import com.jess.arms.http.imageloader.ImageLoader;
import me.jessyan.rxerrorhandler.core.RxErrorHandler; import me.jessyan.rxerrorhandler.core.RxErrorHandler;
import javax.inject.Inject; import javax.inject.Inject;
import com.gingersoft.gsa.cloud.table.mvp.contract.AllOrderContract; import com.gingersoft.gsa.cloud.table.mvp.contract.AllOrderContract;
...@@ -157,6 +155,9 @@ public class AllOrderPresenter extends BasePresenter<AllOrderContract.Model, All ...@@ -157,6 +155,9 @@ public class AllOrderPresenter extends BasePresenter<AllOrderContract.Model, All
dataBean.setTableName(orderDetailItem.getTableName()); dataBean.setTableName(orderDetailItem.getTableName());
dataBean.setCreateTime(orderDetailItem.getCreateTime()); dataBean.setCreateTime(orderDetailItem.getCreateTime());
OpenTableManage.getDefault().setTableBean(dataBean); OpenTableManage.getDefault().setTableBean(dataBean);
List<PayMethod> payMethodList = getPayMethodList(orderDetailItem);
//設置打印所需支付方式
MyOrderManage.getInstance().setBillMoney(payMethodList);
CC.obtainBuilder("Component.Print") CC.obtainBuilder("Component.Print")
.setActionName("printActivity") .setActionName("printActivity")
.addParam("type", 2) .addParam("type", 2)
...@@ -170,6 +171,20 @@ public class AllOrderPresenter extends BasePresenter<AllOrderContract.Model, All ...@@ -170,6 +171,20 @@ public class AllOrderPresenter extends BasePresenter<AllOrderContract.Model, All
}); });
} }
/**
* 獲取支付方式
* @param orderDetailItem
* @return
*/
private List<PayMethod> getPayMethodList(OrderDetailItem orderDetailItem) {
List<PayMethod> payMethodList = new ArrayList<>();
PayMethod payMethod = new PayMethod();
payMethod.setPayName(orderDetailItem.getPayName());
payMethod.setPayMoney(orderDetailItem.getTotalAmount());
payMethodList.add(payMethod);
return payMethodList;
}
public void updateOrderData(List<OrderDetailItem> orderItemList) { public void updateOrderData(List<OrderDetailItem> orderItemList) {
if (orderItemList != null) { if (orderItemList != null) {
mOrderItemList.clear(); mOrderItemList.clear();
......
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