Commit b0b87b98 authored by zhang_z's avatar zhang_z

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

parent da02adb3
...@@ -229,7 +229,10 @@ public class SettlePresenter extends SettleContract.Presenter { ...@@ -229,7 +229,10 @@ public class SettlePresenter extends SettleContract.Presenter {
public void payInAli(String payCode) { public void payInAli(String payCode) {
mView.showLoadingDialog(); mView.showLoadingDialog();
commitOrder() commitOrder()
.flatMap(orderNo -> JniFactory.Settle.pay(C.PAY_CHANNEL.ALI, payCode, mSaleorder.getOrderPayAmt(), orderNo)) .flatMap(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 -> {
...@@ -253,7 +256,10 @@ public class SettlePresenter extends SettleContract.Presenter { ...@@ -253,7 +256,10 @@ public class SettlePresenter extends SettleContract.Presenter {
public void payInWechat(String payCode) { public void payInWechat(String payCode) {
mView.showLoadingDialog(); mView.showLoadingDialog();
commitOrder() commitOrder()
.flatMap(orderNo -> JniFactory.Settle.pay(C.PAY_CHANNEL.WECHAT, payCode, mSaleorder.getOrderPayAmt(), orderNo)) .flatMap(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 -> {
......
...@@ -26,7 +26,6 @@ public class PayingDialog extends BaseDialog<SettlePresenter, DialogSettlePaying ...@@ -26,7 +26,6 @@ public class PayingDialog extends BaseDialog<SettlePresenter, DialogSettlePaying
@Override @Override
public void initView() { public void initView() {
mViewBinding.tvCheck.setOnClickListener(view -> mPresenter.checkPayState(mType)); mViewBinding.tvCheck.setOnClickListener(view -> mPresenter.checkPayState(mType));
switch (mType) { switch (mType) {
case C.PAY_CHANNEL.ALI: case C.PAY_CHANNEL.ALI:
......
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