Bladeren bron

1.添加获取支付状态接口

王鹏鹏 2 jaren geleden
bovenliggende
commit
060586b027

+ 4 - 0
baselib/src/main/java/com/yingyangfly/baselib/utils/RxBusCodes.kt

@@ -14,5 +14,9 @@ object RxBusCodes {
     //获取训练内容
     const val GetTrainContent = 9002
 
+    //查询订单支付状态
+    const val QueryPaymentStatus = 9003
 
+    //订单支付成功
+    const val OrderPaymentSuccess = 9004
 }

+ 12 - 0
workbenches/src/main/java/com/yingyang/workbenches/dialog/PurchaseServicesDialog.kt

@@ -17,6 +17,8 @@ import com.yingyang.workbenches.entity.GetPayImageEvent
 import com.yingyang.workbenches.entity.GetQrCodeEvent
 import com.yingyangfly.baselib.ext.setOnSingleClickListener
 import com.yingyangfly.baselib.ext.show
+import com.yingyangfly.baselib.ext.toast
+import com.yingyangfly.baselib.utils.RxBusCodes
 import com.yingyangfly.baselib.utils.ViewTool
 import gorden.rxbus2.RxBus
 import gorden.rxbus2.Subscribe
@@ -93,6 +95,10 @@ class PurchaseServicesDialog : DialogFragment() {
         alipayLayout?.setOnSingleClickListener {
             RxBus.get().send(GetPayImageEvent(packageId, "2", payMoney, packageName))
         }
+        //查询支付状态
+        paySuccessBtn?.setOnSingleClickListener {
+            RxBus.get().send(RxBusCodes.QueryPaymentStatus, orderNo)
+        }
         val imageClose = rootView.findViewById<AppCompatImageView>(R.id.imageClose)
         imageClose.setOnSingleClickListener {
             dismiss()
@@ -123,4 +129,10 @@ class PurchaseServicesDialog : DialogFragment() {
             Glide.with(this).load(bitmap).into(payImage!!)
         }
     }
+
+    @Subscribe(code = RxBusCodes.OrderPaymentSuccess, threadMode = ThreadMode.MAIN)
+    fun orderPaySuccess() {
+        "订单支付成功".toast()
+        dismiss()
+    }
 }

+ 20 - 0
workbenches/src/main/java/com/yingyang/workbenches/servicepackage/ServicePackageActivity.kt

@@ -15,9 +15,11 @@ import com.yingyangfly.baselib.ext.toast
 import com.yingyangfly.baselib.mvvm.BaseMVVMActivity
 import com.yingyangfly.baselib.router.RouterUrlCommon
 import com.yingyangfly.baselib.utils.JumpUtil
+import com.yingyangfly.baselib.utils.RxBusCodes
 import gorden.rxbus2.RxBus
 import gorden.rxbus2.Subscribe
 import gorden.rxbus2.ThreadMode
+import io.reactivex.disposables.Disposable
 
 /**
  * 服务套餐
@@ -39,6 +41,10 @@ class ServicePackageActivity :
     private var servicePackageList = mutableListOf<PackageInfoBean>()
     private val servicePackageListAdapter by lazy { ServicePackageListAdapter() }
 
+    private val PERIOD: Long = 10 * 1000
+    private val DELAY = 100
+    private var mDisposable: Disposable? = null
+
     override fun initViews() {
         binding {
             rvTrainingPackage.layoutManager = GridLayoutManager(this@ServicePackageActivity, 3)
@@ -124,4 +130,18 @@ class ServicePackageActivity :
             servicePackageListAdapter.setData(servicePackageList)
         })
     }
+
+    /**
+     * 查询支付状态
+     */
+    @Subscribe(code = RxBusCodes.QueryPaymentStatus, threadMode = ThreadMode.MAIN)
+    fun queryPaymentStatus(orderNo: String) {
+        if (orderNo.isNullOrEmpty().not()) {
+            viewModel.getSelectPayResult(orderNo, fail = {
+                it.toast()
+            }, success = {
+                RxBus.get().send(RxBusCodes.OrderPaymentSuccess)
+            })
+        }
+    }
 }