Skip to content

S
supplier
Commit c96f96c8 by 宁斌
Options

清機數據調整2

parent 1507007e
Showing with 63 additions and 8 deletions
main-module/src/main/java/com/gingersoft/gsa/cloud/main/mvp/model/bean/SendSettlement.java
...@@ -19,6 +19,8 @@ public class SendSettlement { ...@@ -19,6 +19,8 @@ public class SendSettlement {
*/ */
private boolean success; private boolean success;
private String errCode;
private String errMsg;
private long sysTime; private long sysTime;
private DataBean data; private DataBean data;
...@@ -30,6 +32,22 @@ public class SendSettlement { ...@@ -30,6 +32,22 @@ public class SendSettlement {
this.success = success; this.success = success;
} }
public String getErrCode() {
return errCode;
}
public void setErrCode(String errCode) {
this.errCode = errCode;
}
public String getErrMsg() {
return errMsg;
}
public void setErrMsg(String errMsg) {
this.errMsg = errMsg;
}
public long getSysTime() { public long getSysTime() {
return sysTime; return sysTime;
} }
......
main-module/src/main/java/com/gingersoft/gsa/cloud/main/mvp/presenter/SettlementReportPresenter.java
...@@ -12,6 +12,7 @@ import com.gingersoft.gsa.cloud.main.mvp.ui.adapter.SettlementReportItem5Adapter ...@@ -12,6 +12,7 @@ import com.gingersoft.gsa.cloud.main.mvp.ui.adapter.SettlementReportItem5Adapter
import com.gingersoft.gsa.cloud.main.mvp.ui.adapter.SettlementReportItemAdapter; import com.gingersoft.gsa.cloud.main.mvp.ui.adapter.SettlementReportItemAdapter;
import com.gingersoft.gsa.cloud.ui.bean.view.SectionTextItem3; import com.gingersoft.gsa.cloud.ui.bean.view.SectionTextItem3;
import com.gingersoft.gsa.cloud.ui.bean.view.SectionTextItem5; import com.gingersoft.gsa.cloud.ui.bean.view.SectionTextItem5;
import com.gingersoft.gsa.cloud.ui.widget.dialog.CommonTipDialog;
import com.jess.arms.di.scope.ActivityScope; import com.jess.arms.di.scope.ActivityScope;
import com.jess.arms.http.imageloader.ImageLoader; import com.jess.arms.http.imageloader.ImageLoader;
import com.jess.arms.integration.AppManager; import com.jess.arms.integration.AppManager;
...@@ -116,13 +117,25 @@ public class SettlementReportPresenter extends BasePresenter<SettlementReportCon ...@@ -116,13 +117,25 @@ public class SettlementReportPresenter extends BasePresenter<SettlementReportCon
.build(); .build();
mModel.sendSettlement(requestBody) mModel.sendSettlement(requestBody)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.doOnSubscribe(disposable -> mRootView.showLoading(null)) // .doOnSubscribe(disposable -> mRootView.showLoading(null))
.subscribeOn(AndroidSchedulers.mainThread()) .subscribeOn(AndroidSchedulers.mainThread())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.doAfterTerminate(() -> mRootView.hideLoading()) // .doAfterTerminate(() -> mRootView.hideLoading())
.compose(RxLifecycleUtils.bindToLifecycle(mRootView)) .compose(RxLifecycleUtils.bindToLifecycle(mRootView))
.subscribe(new ErrorHandleSubscriber<SendSettlement>(mErrorHandler) { .subscribe(new ErrorHandleSubscriber<SendSettlement>(mErrorHandler) {
// @Override
// public void onComplete() {
// super.onComplete();
// mRootView.hideLoading();
// }
//
// @Override
// public void onError(Throwable t) {
// super.onError(t);
// mRootView.hideLoading();
// }
@Override @Override
public void onNext(@NonNull SendSettlement info) { public void onNext(@NonNull SendSettlement info) {
if (info != null && info.isSuccess()) { if (info != null && info.isSuccess()) {
...@@ -141,7 +154,12 @@ public class SettlementReportPresenter extends BasePresenter<SettlementReportCon ...@@ -141,7 +154,12 @@ public class SettlementReportPresenter extends BasePresenter<SettlementReportCon
//打印清機報表 //打印清機報表
mRootView.printRepore(); mRootView.printRepore();
} }
} else { } else if(info.getErrCode().equals("restaurant.operation.0003")){
Class[] parameterTypes = {};
Object[] parameters = {};
CommonTipDialog.showDoubtDialog(IActivity,"今天已清機過,是否繼續清機", SettlementReportPresenter.class, SettlementReportPresenter.this,
"sendSettlement", parameterTypes, parameters);
}else {
mRootView.showMessage("清機失敗"); mRootView.showMessage("清機失敗");
} }
} }
...@@ -152,10 +170,10 @@ public class SettlementReportPresenter extends BasePresenter<SettlementReportCon ...@@ -152,10 +170,10 @@ public class SettlementReportPresenter extends BasePresenter<SettlementReportCon
int restaurantId = GsaCloudApplication.getRestaurantId(mApplication); int restaurantId = GsaCloudApplication.getRestaurantId(mApplication);
mModel.getSettlementReport(restaurantId) mModel.getSettlementReport(restaurantId)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
// .doOnSubscribe(disposable -> mRootView.showLoading(null)) .doOnSubscribe(disposable -> mRootView.showLoading(null))
.subscribeOn(AndroidSchedulers.mainThread()) .subscribeOn(AndroidSchedulers.mainThread())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
// .doAfterTerminate(() -> mRootView.hideLoading()) .doAfterTerminate(() -> mRootView.hideLoading())
.compose(RxLifecycleUtils.bindToLifecycle(mRootView)) .compose(RxLifecycleUtils.bindToLifecycle(mRootView))
.subscribe(new ErrorHandleSubscriber<SettlementReport>(mErrorHandler) { .subscribe(new ErrorHandleSubscriber<SettlementReport>(mErrorHandler) {
//{"success":false,"errCode":"data_002","errMsg":"沒有查詢到數據","sysTime":1583573772290} //{"success":false,"errCode":"data_002","errMsg":"沒有查詢到數據","sysTime":1583573772290}
...@@ -165,6 +183,11 @@ public class SettlementReportPresenter extends BasePresenter<SettlementReportCon ...@@ -165,6 +183,11 @@ public class SettlementReportPresenter extends BasePresenter<SettlementReportCon
} }
@Override @Override
public void onError(Throwable t) {
super.onError(t);
}
@Override
public void onNext(@NonNull SettlementReport info) { public void onNext(@NonNull SettlementReport info) {
if (info != null && info.isSuccess()) { if (info != null && info.isSuccess()) {
if (info.getData() != null) { if (info.getData() != null) {
......
main-module/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/activity/SettlementReportActivity.java
...@@ -3,6 +3,8 @@ package com.gingersoft.gsa.cloud.main.mvp.ui.activity; ...@@ -3,6 +3,8 @@ package com.gingersoft.gsa.cloud.main.mvp.ui.activity;
import android.content.Intent; import android.content.Intent;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
import android.text.TextUtils; import android.text.TextUtils;
import android.view.View; import android.view.View;
import android.widget.Button; import android.widget.Button;
...@@ -290,10 +292,10 @@ public class SettlementReportActivity extends BaseActivity<SettlementReportPrese ...@@ -290,10 +292,10 @@ 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, cashStr + df.format(voBean.getTotamount()))); settlementReportItem5s.add(new SectionTextItem5(projectTotalSalesText, null, null, null, cashStr + df.format(voBean.getPrices())));
settlementReportItem5s.add(new SectionTextItem5(discountText, null, null, null, cashStr + df.format(voBean.getDisamount()))); settlementReportItem5s.add(new SectionTextItem5(discountText, null, null, null, cashStr + df.format(voBean.getDisamount())));
settlementReportItem5s.add(new SectionTextItem5(serviceFeeText, null, null, null, cashStr + df.format(voBean.getScamount()))); settlementReportItem5s.add(new SectionTextItem5(serviceFeeText, null, null, null, cashStr + df.format(voBean.getScamount())));
settlementReportItem5s.add(new SectionTextItem5(netTurnoverText, null, null, null, cashStr + df.format(voBean.getPrices()))); 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", "信用卡");
...@@ -302,7 +304,7 @@ public class SettlementReportActivity extends BaseActivity<SettlementReportPrese ...@@ -302,7 +304,7 @@ 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(cashAuditText, null, null, null, null)); settlementReportItem5s.add(new SectionTextItem5(cashAuditText, null, null, null, null));
settlementReportItem5s.add(new SectionTextItem5(netTurnoverText, null, null, null, cashStr + df.format(voBean.getPrices()))); settlementReportItem5s.add(new SectionTextItem5(netTurnoverText, null, null, null, cashStr + df.format(voBean.getTotamount())));
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++) {
...@@ -524,9 +526,21 @@ public class SettlementReportActivity extends BaseActivity<SettlementReportPrese ...@@ -524,9 +526,21 @@ public class SettlementReportActivity extends BaseActivity<SettlementReportPrese
if (mPresenter != null) { if (mPresenter != null) {
mPresenter.getSettlementReport(); mPresenter.getSettlementReport();
} }
// handler.sendEmptyMessage(0);
}); });
} }
private Handler handler = new Handler(){
@Override
public void handleMessage(Message msg) {
//打印完之後，清除view
PrintTransitUtils.getInstance().setPrintView(null);
if (mPresenter != null) {
mPresenter.getSettlementReport();
}
}
};
@NotNull @NotNull
private View initPrintView() { private View initPrintView() {
View view = View.inflate(mContext, R.layout.layout_settlement_report, null); View view = View.inflate(mContext, R.layout.layout_settlement_report, null);
......
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