feat: 订单流程

gradle.properties

@@ -30,7 +30,7 @@ OFFICIAL=false
 IS_RELEASE=true
 
 VERSION_CODE=10
-VERSION_NAME=1.0.0(ahpha 19)
+VERSION_NAME=1.0.0(ahpha 20)
 
 OFFICIAL_UID=10000
 OFFICIAL_CONVERSATION_ID=c2c_10000

module/order/src/main/java/com/adealink/weparty/order/OrderDetailActivity.kt

@@ -113,54 +113,60 @@ class OrderDetailActivity : BaseActivity() {
         binding.tvOrderTimeDetail.text = formatTime(data.createTime, "dd/MM/yyyy HH:mm:ss")
         binding.tvOrderCostDetail.text = getOrderAllCost(data.price, data.purchaseQty)
 
-        when (orderStatus) {
-            OrderStatus.CREATE_ORDER,
-            OrderStatus.WAIT_FOR_ACCEPT -> {
-                binding.clOrderCancel.show()
-                binding.clOrderInProgress.gone()
-                binding.clOrderFinish.gone()
-            }
-
-            OrderStatus.PLAYMATE_ACCEPT,
-            OrderStatus.PLAYMATE_IN_SERVICE -> {
-                binding.clOrderCancel.gone()
-                binding.clOrderInProgress.show()
-                binding.btnRefund.show()
-                binding.btnComplete.gone()
-                binding.clOrderFinish.gone()
-            }
+        if (data.refundApply == true) {
+            binding.clOrderCancel.gone()
+            binding.clOrderInProgress.gone()
+            binding.clOrderFinish.gone()
+        } else {
+            when (orderStatus) {
+                OrderStatus.CREATE_ORDER,
+                OrderStatus.WAIT_FOR_ACCEPT -> {
+                    binding.clOrderCancel.show()
+                    binding.clOrderInProgress.gone()
+                    binding.clOrderFinish.gone()
+                }
 
-            OrderStatus.PLAYMATE_END_SERVICE -> {
-                binding.clOrderCancel.gone()
-                binding.clOrderInProgress.show()
-                binding.btnRefund.show()
-                binding.btnComplete.show()
-                binding.clOrderFinish.gone()
-            }
+                OrderStatus.PLAYMATE_ACCEPT,
+                OrderStatus.PLAYMATE_IN_SERVICE -> {
+                    binding.clOrderCancel.gone()
+                    binding.clOrderInProgress.show()
+                    binding.btnRefund.show()
+                    binding.btnComplete.gone()
+                    binding.clOrderFinish.gone()
+                }
 
-            OrderStatus.PLAYMATE_REFUSE,
-            OrderStatus.USER_CANCEL,
-            OrderStatus.USER_REFUND -> {
-                binding.clOrderCancel.gone()
-                binding.clOrderInProgress.gone()
-                binding.clOrderFinish.gone()
-            }
+                OrderStatus.PLAYMATE_END_SERVICE -> {
+                    binding.clOrderCancel.gone()
+                    binding.clOrderInProgress.show()
+                    binding.btnRefund.show()
+                    binding.btnComplete.show()
+                    binding.clOrderFinish.gone()
+                }
 
-            OrderStatus.COMPLETE -> {
-                binding.clOrderCancel.gone()
-                binding.clOrderInProgress.gone()
-                if (data.star == null || data.star == 0f) {
-                    binding.vEvaluate.gone()
-                    binding.clOrderFinish.show()
-                } else {
-                    binding.vEvaluate.show()
-                    binding.vEvaluate.setScore(data.star ?: 0f)
+                OrderStatus.PLAYMATE_REFUSE,
+                OrderStatus.USER_CANCEL,
+                OrderStatus.USER_REFUND -> {
+                    binding.clOrderCancel.gone()
+                    binding.clOrderInProgress.gone()
                     binding.clOrderFinish.gone()
                 }
-            }
 
-            null -> {
+                OrderStatus.COMPLETE -> {
+                    binding.clOrderCancel.gone()
+                    binding.clOrderInProgress.gone()
+                    if (data.star == null || data.star == 0f) {
+                        binding.vEvaluate.gone()
+                        binding.clOrderFinish.show()
+                    } else {
+                        binding.vEvaluate.show()
+                        binding.vEvaluate.setScore(data.star ?: 0f)
+                        binding.clOrderFinish.gone()
+                    }
+                }
 
+                null -> {
+
+                }
             }
         }
     }