Преглед изворни кода

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

王鹏鹏 пре 2 година
родитељ
комит
57203ff885

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

@@ -17,6 +17,6 @@ object RxBusCodes {
     //查询订单支付状态
     const val QueryPaymentStatus = 9003
 
-    //订单支付成功
-    const val OrderPaymentSuccess = 9004
+    //订单支付状态
+    const val OrderPaymentStatus = 9004
 }

+ 22 - 4
workbenches/src/main/java/com/yingyang/workbenches/dialog/PurchaseServicesDialog.kt

@@ -130,9 +130,27 @@ class PurchaseServicesDialog : DialogFragment() {
         }
     }
 
-    @Subscribe(code = RxBusCodes.OrderPaymentSuccess, threadMode = ThreadMode.MAIN)
-    fun orderPaySuccess() {
-        "订单支付成功".toast()
-        dismiss()
+    @Subscribe(code = RxBusCodes.OrderPaymentStatus, threadMode = ThreadMode.MAIN)
+    fun orderPaySuccess(status: String) {
+        when (status) {
+            "1" -> {
+                "该订单正在支付中".toast()
+            }
+            "2" -> {
+                "订单支付成功".toast()
+                dismiss()
+            }
+            "3" -> {
+                "订单支付失败".toast()
+            }
+            "4" -> {
+                "该订单已退款".toast()
+                dismiss()
+            }
+            "5" -> {
+                "该订单已关闭".toast()
+                dismiss()
+            }
+        }
     }
 }

+ 1 - 1
workbenches/src/main/java/com/yingyang/workbenches/net/WorkbenchesApiService.kt

@@ -97,6 +97,6 @@ interface WorkbenchesApiService {
     @POST("app/pay/selectPayResult")
     suspend fun getSelectPayResult(
         @Query("orderNo") orderNo: String
-    ): BaseResp<PayImageBean>
+    ): BaseResp<String>
 
 }

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

@@ -140,7 +140,7 @@ class ServicePackageActivity :
             viewModel.getSelectPayResult(orderNo, fail = {
                 it.toast()
             }, success = {
-                RxBus.get().send(RxBusCodes.OrderPaymentSuccess)
+                RxBus.get().send(RxBusCodes.OrderPaymentStatus, it)
             })
         }
     }

+ 1 - 1
workbenches/src/main/java/com/yingyang/workbenches/servicepackage/ServicePackageViewModel.kt

@@ -63,7 +63,7 @@ class ServicePackageViewModel : BaseViewModel() {
     fun getSelectPayResult(
         orderNo: String,
         fail: ((msg: String) -> Unit)? = null,
-        success: ((success: PayImageBean) -> Unit)? = null,
+        success: ((success: String) -> Unit)? = null,
     ) = launchFlow(false) {
         WORKBENCHES_API.getSelectPayResult(orderNo)
     }.runUI(