瀏覽代碼

1.添加获取单个医生信息接口

王鹏鹏 2 年之前
父節點
當前提交
8227f46303

+ 38 - 1
healthconsultation/src/main/java/com/yingyang/healthconsultation/entity/MedicalConsultationDetailBean.kt

@@ -1,5 +1,8 @@
 package com.yingyang.healthconsultation.entity
 
+import android.text.TextUtils
+import com.yingyangfly.baselib.ext.timeFormat
+
 /**
  * 咨询订单详情
  */
@@ -52,4 +55,38 @@ data class PayOrder(
     val updateTime: String,
     val userIdval: String,
     val userNameval: String,
-)
+    val pay_money: String
+) {
+    fun getPayMethodInfo(): String {
+        return if (TextUtils.equals("1", payMethod)) {
+            "微信"
+        } else {
+            "支付宝"
+        }
+    }
+
+    fun getPayTimeInfo(): String {
+        return if (TextUtils.isEmpty(payTime)) {
+            ""
+        } else {
+            payTime
+        }
+    }
+
+    fun getPayMoneyInfo(): String {
+        return if (TextUtils.isEmpty(pay_money)) {
+            ""
+        } else {
+            pay_money
+        }
+    }
+
+    fun getCreateTimeInfo(): String {
+        return if (TextUtils.isEmpty(createTime)) {
+            ""
+        } else {
+            timeFormat(createTime)
+        }
+    }
+
+}

+ 6 - 6
healthconsultation/src/main/res/layout/activity_paid.xml

@@ -297,6 +297,7 @@
                         android:id="@+id/orderLayout"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
+                        android:visibility="gone"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toBottomOf="@+id/rvUploadData">
@@ -334,7 +335,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginStart="@dimen/divider_38px"
                             android:layout_marginTop="@dimen/divider_16px"
-                            android:text='@{"下单时间:"+payOrder.sendPayTime}'
+                            android:text='@{"下单时间:"+payOrder.getPayTimeInfo()}'
                             android:textColor="@color/color_FF333333"
                             android:textSize="@dimen/divider_24px"
                             app:layout_constraintEnd_toEndOf="parent"
@@ -347,7 +348,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginStart="@dimen/divider_38px"
                             android:layout_marginTop="@dimen/divider_16px"
-                            android:text='@{"应付金额:"+payOrder.sendPayTime}'
+                            android:text='@{"应付金额:"+payOrder.getPayMoneyInfo()}'
                             android:textColor="@color/color_FF333333"
                             android:textSize="@dimen/divider_24px"
                             app:layout_constraintEnd_toEndOf="parent"
@@ -360,7 +361,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginStart="@dimen/divider_38px"
                             android:layout_marginTop="@dimen/divider_16px"
-                            android:text="@string/paid_in_amount"
+                            android:text='@{"实付金额:"+payOrder.getPayMoneyInfo()}'
                             android:textColor="@color/color_FF333333"
                             android:textSize="@dimen/divider_24px"
                             app:layout_constraintEnd_toEndOf="parent"
@@ -373,7 +374,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginStart="@dimen/divider_38px"
                             android:layout_marginTop="@dimen/divider_16px"
-                            android:text="@string/payment_method"
+                            android:text='@{"支付方式:"+payOrder.getPayMethodInfo()}'
                             android:textColor="@color/color_FF333333"
                             android:textSize="@dimen/divider_24px"
                             app:layout_constraintEnd_toEndOf="parent"
@@ -386,14 +387,13 @@
                             android:layout_height="wrap_content"
                             android:layout_marginStart="@dimen/divider_38px"
                             android:layout_marginTop="@dimen/divider_16px"
-                            android:text='@{"支付时间:"+payOrder.sendPayTime}'
+                            android:text='@{"支付时间:"+payOrder.getCreateTimeInfo()}'
                             android:textColor="@color/color_FF333333"
                             android:textSize="@dimen/divider_24px"
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintStart_toStartOf="parent"
                             app:layout_constraintTop_toBottomOf="@+id/tvPaymentMethod" />
 
-
                     </androidx.constraintlayout.widget.ConstraintLayout>
 
                     <androidx.appcompat.widget.AppCompatButton