修改支付成功的逻辑

RvClient/src/main/java/com/xxfc/rv/wxapi/WXPayEntryActivity.java

@@ -6,7 +6,6 @@ import android.os.Bundle;
 import android.util.Log;
 import android.widget.TextView;
 
-import com.base.utils.ui.datetime.selector.util.TextUtil;
 import com.frame.base.bus.PaymentFailedEvent;
 import com.frame.base.bus.PaymentSuccessfulEvent;
 import com.frame.base.bus.RxBus;
@@ -40,6 +39,8 @@ public class WXPayEntryActivity extends BaseStatusActivity<CommonPresenter> impl
 
     private IWXAPI api;
 
+    private int payResult;
+
     @Override
     protected int setLayout() {
         return R.layout.rv_pay_result;
@@ -65,11 +66,12 @@ public class WXPayEntryActivity extends BaseStatusActivity<CommonPresenter> impl
 
     @Override
     public void onResp(BaseResp resp) {
+        payResult = resp.errCode;
         Log.d("Wxpayentryactivity", "onPayFinish, errCode = " + resp.errCode);
         if (resp.getType() == ConstantsAPI.COMMAND_PAY_BY_WX) {
             switch (resp.errCode) {
                 case 0:
-                    RxBus.post(new PaymentSuccessfulEvent());
+                    // 支付成功
                     break;
                 case -1:
                     finish();
@@ -79,13 +81,10 @@ public class WXPayEntryActivity extends BaseStatusActivity<CommonPresenter> impl
                     finish();
                     break;
             }
-//            AlertDialog.Builder builder = new AlertDialog.Builder(this);
-//            builder.setTitle("提示");
-//            builder.setMessage("微信支付结果：" + String.valueOf(resp.errCode));
-//            builder.show();
         }
     }
 
+
     @Override
     public void onShowResult(int requestType, BaseBean result) {
 
@@ -94,7 +93,16 @@ public class WXPayEntryActivity extends BaseStatusActivity<CommonPresenter> impl
 
     @OnClick(R2.id.tv_order)
     public void onViewClicked() {
-        startActivity(OrderListActivity.getIntent(mActivity, 1));
+//        startActivity(OrderListActivity.getIntent(mActivity, 1));
         finish();
     }
+
+
+    @Override
+    public void finish() {
+        if (payResult == 0) {
+            RxBus.post(new PaymentSuccessfulEvent());
+        }
+        super.finish();
+    }
 }
\ No newline at end of file

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/ConfirmOrderActivity.java

@@ -187,6 +187,7 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
                 .subscribe(new Observer<PaymentSuccessfulEvent>(disposable) {
                     @Override
                     public void onNext(PaymentSuccessfulEvent event) {
+                        startActivity(OrderListActivity.getIntent(mActivity, 1));
                         finish();
                     }
                 });

module_tourism/src/main/java/com/rv/tourism/other/TravelerConfirmOrderActivity.java

@@ -212,6 +212,9 @@ public class TravelerConfirmOrderActivity extends BaseStatusActivity<TourismPres
                 .subscribe(new Observer<PaymentSuccessfulEvent>(disposable) {
                     @Override
                     public void onNext(PaymentSuccessfulEvent event) {
+                        ARouter.getInstance().build(Constance.ACTIVITY_URL_ORDERLIST)
+                                .withInt("position", 1)
+                                .navigation();
                         finish();
                     }
                 });