Skip to content

T
TangKuPos
Commit 5b0832cc authored by zhang_z's avatar zhang_z
Browse files
Options

修复一个支付失败之后,无法再次支付的问题;

parent b0b87b98
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 17 deletions
app/src/main/java/com/xingdata/zzdpos/ui/settle/SettlePresenter.java
View file @ 5b0832cc
...@@ -229,10 +229,7 @@ public class SettlePresenter extends SettleContract.Presenter { ...@@ -229,10 +229,7 @@ public class SettlePresenter extends SettleContract.Presenter {
public void payInAli(String payCode) { public void payInAli(String payCode) {
mView.showLoadingDialog(); mView.showLoadingDialog();
commitOrder() commitOrder()
.flatMap(orderNo -> { .flatMap(orderNo -> JniFactory.Settle.pay(C.PAY_CHANNEL.ALI, payCode, mSaleorder.getOrderPayAmt(), orderNo))
mSaleorder.setOrderNoOrg(String.valueOf(System.currentTimeMillis()));
return JniFactory.Settle.pay(C.PAY_CHANNEL.ALI, payCode, mSaleorder.getOrderPayAmt(), mSaleorder.getOrderNoOrg());
})
.doFinally(() -> mView.dismissLoadingDialog()) .doFinally(() -> mView.dismissLoadingDialog())
.subscribe( .subscribe(
response -> { response -> {
...@@ -256,10 +253,7 @@ public class SettlePresenter extends SettleContract.Presenter { ...@@ -256,10 +253,7 @@ public class SettlePresenter extends SettleContract.Presenter {
public void payInWechat(String payCode) { public void payInWechat(String payCode) {
mView.showLoadingDialog(); mView.showLoadingDialog();
commitOrder() commitOrder()
.flatMap(orderNo -> { .flatMap(orderNo -> JniFactory.Settle.pay(C.PAY_CHANNEL.WECHAT, payCode, mSaleorder.getOrderPayAmt(), orderNo))
mSaleorder.setOrderNoOrg(String.valueOf(System.currentTimeMillis()));
return JniFactory.Settle.pay(C.PAY_CHANNEL.WECHAT, payCode, mSaleorder.getOrderPayAmt(), mSaleorder.getOrderNoOrg());
})
.doFinally(() -> mView.dismissLoadingDialog()) .doFinally(() -> mView.dismissLoadingDialog())
.subscribe( .subscribe(
response -> { response -> {
...@@ -362,15 +356,11 @@ public class SettlePresenter extends SettleContract.Presenter { ...@@ -362,15 +356,11 @@ public class SettlePresenter extends SettleContract.Presenter {
* 提交订单 * 提交订单
*/ */
private Observable<String> commitOrder() { private Observable<String> commitOrder() {
if (StringUtils.isEmpty(mSaleorder.getOrderNo())) { return ApiFactory.Saleorder.addOrderMis(createSaleorderParam())
return ApiFactory.Saleorder.addOrderMis(createSaleorderParam()) .doAfterNext(s -> {
.doAfterNext(s -> { mSaleorder.setOrderNo(s);
mSaleorder.setOrderNo(s); mView.changeLockState(true);
mView.changeLockState(true); });
});
} else {
return Observable.just(mSaleorder.getOrderNo());
}
} }
/** /**
......
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