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

app/src/main/java/com/xingdata/zzdpos/ui/settle/SettlePresenter.java

@@ -229,10 +229,7 @@ public class SettlePresenter extends SettleContract.Presenter {
     public void payInAli(String payCode) {
         mView.showLoadingDialog();
         commitOrder()
-                .flatMap(orderNo -> {
-                    mSaleorder.setOrderNoOrg(String.valueOf(System.currentTimeMillis()));
-                    return JniFactory.Settle.pay(C.PAY_CHANNEL.ALI, payCode, mSaleorder.getOrderPayAmt(), mSaleorder.getOrderNoOrg());
-                })
+                .flatMap(orderNo -> JniFactory.Settle.pay(C.PAY_CHANNEL.ALI, payCode, mSaleorder.getOrderPayAmt(), orderNo))
                 .doFinally(() -> mView.dismissLoadingDialog())
                 .subscribe(
                         response -> {
@@ -256,10 +253,7 @@ public class SettlePresenter extends SettleContract.Presenter {
     public void payInWechat(String payCode) {
         mView.showLoadingDialog();
         commitOrder()
-                .flatMap(orderNo -> {
-                    mSaleorder.setOrderNoOrg(String.valueOf(System.currentTimeMillis()));
-                    return JniFactory.Settle.pay(C.PAY_CHANNEL.WECHAT, payCode, mSaleorder.getOrderPayAmt(), mSaleorder.getOrderNoOrg());
-                })
+                .flatMap(orderNo -> JniFactory.Settle.pay(C.PAY_CHANNEL.WECHAT, payCode, mSaleorder.getOrderPayAmt(), orderNo))
                 .doFinally(() -> mView.dismissLoadingDialog())
                 .subscribe(
                         response -> {
@@ -362,15 +356,11 @@ public class SettlePresenter extends SettleContract.Presenter {
      * 提交订单
      */
     private Observable<String> commitOrder() {
-        if (StringUtils.isEmpty(mSaleorder.getOrderNo())) {
-            return ApiFactory.Saleorder.addOrderMis(createSaleorderParam())
-                    .doAfterNext(s -> {
-                        mSaleorder.setOrderNo(s);
-                        mView.changeLockState(true);
-                    });
-        } else {
-            return Observable.just(mSaleorder.getOrderNo());
-        }
+        return ApiFactory.Saleorder.addOrderMis(createSaleorderParam())
+                .doAfterNext(s -> {
+                    mSaleorder.setOrderNo(s);
+                    mView.changeLockState(true);
+                });
     }
 
     /**