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

.idea/misc.xml

@@ -47,11 +47,13 @@
         <entry key="..\:/workspace/hcp-pad/healthconsultation/src/main/res/drawable/bg_continue_consultation.xml" value="0.155" />
         <entry key="..\:/workspace/hcp-pad/healthconsultation/src/main/res/drawable/bg_doctor_details.xml" value="0.155" />
         <entry key="..\:/workspace/hcp-pad/healthconsultation/src/main/res/drawable/bg_doctor_status.xml" value="0.155" />
+        <entry key="..\:/workspace/hcp-pad/healthconsultation/src/main/res/drawable/bg_evaluate_order.xml" value="0.155" />
         <entry key="..\:/workspace/hcp-pad/healthconsultation/src/main/res/drawable/bg_go_consultation.xml" value="0.155" />
         <entry key="..\:/workspace/hcp-pad/healthconsultation/src/main/res/drawable/bg_home_page_content.xml" value="0.155" />
         <entry key="..\:/workspace/hcp-pad/healthconsultation/src/main/res/drawable/bg_home_page_search.xml" value="0.155" />
         <entry key="..\:/workspace/hcp-pad/healthconsultation/src/main/res/drawable/bg_home_page_title.xml" value="0.155" />
         <entry key="..\:/workspace/hcp-pad/healthconsultation/src/main/res/drawable/bg_image_upload_selector.xml" value="0.155" />
+        <entry key="..\:/workspace/hcp-pad/healthconsultation/src/main/res/drawable/bg_pay_order.xml" value="0.155" />
         <entry key="..\:/workspace/hcp-pad/healthconsultation/src/main/res/drawable/bg_payment_selected.xml" value="0.155" />
         <entry key="..\:/workspace/hcp-pad/healthconsultation/src/main/res/drawable/bg_payment_services.xml" value="0.155" />
         <entry key="..\:/workspace/hcp-pad/healthconsultation/src/main/res/drawable/bg_payment_services_alipay.xml" value="0.155" />

healthconsultation/src/main/java/com/yingyang/healthconsultation/adapter/ConsultationRecordAdapter.kt

@@ -35,12 +35,14 @@ class ConsultationRecordAdapter(override val layoutId: Int = R.layout.item_consu
                     //0未支付
                     binding.tvStastus.text = "待支付"
                     binding.tvStastus.setTextColorResource(R.color.color_FFFFA535)
-                    binding.btnEvaluate.show(true)
                     binding.btnRecord.show(true)
+                    binding.btnEvaluate.text = "取消订单"
                     binding.btnEvaluate.setBackgroundResource(R.drawable.bg_record_cancel_order)
                     binding.btnEvaluate.setTextColorResource(R.color.color_FFA5A5A5)
-                    binding.btnEvaluate.text = "取消订单"
+                    binding.btnEvaluate.show(true)
                     binding.btnRecord.text = "去支付"
+                    binding.btnRecord.setBackgroundResource(R.drawable.bg_pay_order)
+                    binding.btnRecord.setTextColorResource(R.color.color_FFFFFF)
                 }
                 "1" -> {
                     //1待接诊
@@ -48,7 +50,9 @@ class ConsultationRecordAdapter(override val layoutId: Int = R.layout.item_consu
                     binding.tvStastus.setTextColorResource(R.color.color_ff4571ff)
                     binding.btnEvaluate.show(false)
                     binding.btnRecord.show(true)
-                    binding.btnRecord.text = "待医生接诊"
+                    binding.btnRecord.text = "取消订单"
+                    binding.btnRecord.setBackgroundResource(R.drawable.bg_record_cancel_order)
+                    binding.btnRecord.setTextColorResource(R.color.color_FFA5A5A5)
                 }
                 "2" -> {
                     //2接诊中
@@ -57,6 +61,8 @@ class ConsultationRecordAdapter(override val layoutId: Int = R.layout.item_consu
                     binding.btnEvaluate.show(false)
                     binding.btnRecord.show(true)
                     binding.btnRecord.text = "联系医生"
+                    binding.btnRecord.setBackgroundResource(R.drawable.bg_consultation_record)
+                    binding.btnRecord.setTextColorResource(R.color.color_FFFFFF)
                 }
                 "3" -> {
                     //3已拒诊
@@ -65,17 +71,21 @@ class ConsultationRecordAdapter(override val layoutId: Int = R.layout.item_consu
                     binding.btnEvaluate.show(false)
                     binding.btnRecord.show(true)
                     binding.btnRecord.text = "重新问诊"
+                    binding.btnRecord.setBackgroundResource(R.drawable.bg_consultation_record)
+                    binding.btnRecord.setTextColorResource(R.color.color_FFFFFF)
                 }
                 "4" -> {
                     //4已完成
                     binding.tvStastus.text = "已完成"
                     binding.tvStastus.setTextColorResource(R.color.color_FF333333)
                     binding.btnEvaluate.show(true)
-                    binding.btnRecord.show(true)
-                    binding.btnEvaluate.setBackgroundResource(R.drawable.bg_cancel_order)
-                    binding.btnEvaluate.setTextColorResource(R.color.color_FF4A76FF)
                     binding.btnEvaluate.text = "评价"
+                    binding.btnEvaluate.setBackgroundResource(R.drawable.bg_evaluate_order)
+                    binding.btnEvaluate.setTextColorResource(R.color.color_FF4A76FF)
+                    binding.btnRecord.show(true)
                     binding.btnRecord.text = "查看问诊记录"
+                    binding.btnRecord.setBackgroundResource(R.drawable.bg_consultation_record)
+                    binding.btnRecord.setTextColorResource(R.color.color_FFFFFF)
                 }
             }
         }

healthconsultation/src/main/java/com/yingyang/healthconsultation/net/HealthConsultationApiService.kt

@@ -78,4 +78,10 @@ interface HealthConsultationApiService {
      */
     @POST("medical_consultation/doctor/detail")
     suspend fun getDoctorDetail(@Body requestBody: RequestBody): BaseResp<DoctorBean>
+
+    /**
+     * 取消咨询订单
+     */
+    @POST("medical_consultation/cancel")
+    suspend fun cancelConsultation(@Body requestBody: RequestBody): BaseResp<String>
 }

healthconsultation/src/main/java/com/yingyang/healthconsultation/record/ConsultationRecordActivity.kt

@@ -36,7 +36,7 @@ class ConsultationRecordActivity :
                 when (it.status) {
                     "0" -> {
                         //0未支付
-                        cancleOrder(it.doctor)
+                        cancleOrder(it.id)
                     }
                     "1" -> {
                         //1待接诊
@@ -65,6 +65,7 @@ class ConsultationRecordActivity :
                     }
                     "1" -> {
                         //1待接诊
+                        cancleOrder(it.id)
                     }
                     "2" -> {
                         //2接诊中
@@ -90,8 +91,8 @@ class ConsultationRecordActivity :
     /**
      * 取消订单
      */
-    private fun cancleOrder(bean: DoctorBean) {
-        viewModel.delPayOrder("", fail = {
+    private fun cancleOrder(id: String) {
+        viewModel.cancelConsultation(id, fail = {
             it.toast()
         }, success = {
             loadData()

healthconsultation/src/main/java/com/yingyang/healthconsultation/record/ConsultationRecordViewModel.kt

@@ -1,8 +1,11 @@
 package com.yingyang.healthconsultation.record
 
 import com.yingyang.healthconsultation.entity.ConsultationRecordsBean
+import com.yingyang.healthconsultation.entity.GetDoctorDetailsBean
 import com.yingyang.healthconsultation.net.HEALTHCONSULTATION_API
 import com.yingyangfly.baselib.mvvm.BaseViewModel
+import com.yingyangfly.baselib.net.XUtils
+import com.yingyangfly.baselib.utils.GsonUtil
 
 /**
  * @author 王鹏鹏
@@ -19,12 +22,16 @@ class ConsultationRecordViewModel : BaseViewModel() {
         fail
     )
 
-    fun delPayOrder(
-        orderNo: String,
+    fun cancelConsultation(
+        consultationId: String,
         fail: ((msg: String) -> Unit)? = null,
         success: ((success: String?) -> Unit)? = null,
     ) = launchFlow(true) {
-        HEALTHCONSULTATION_API.delPayOrder(orderNo)
+        val requestBean = GetDoctorDetailsBean().apply {
+            id = consultationId
+        }
+        val body = XUtils.createJson(GsonUtil.GsonString(requestBean))
+        HEALTHCONSULTATION_API.cancelConsultation(body)
     }.runUI(
         success,
         fail

healthconsultation/src/main/res/drawable/bg_cancel_order.xml

@@ -3,6 +3,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     tools:ignore="ResourceName">
     <corners android:radius="@dimen/divider_13px" />
-    <stroke android:color="@color/color_FF4A76FF" android:width="@dimen/divider_1px"/>
+    <stroke android:color="@color/color_FFA5A5A5" android:width="@dimen/divider_1px"/>
     <solid android:color="@android:color/white" />
 </shape>

healthconsultation/src/main/res/drawable/bg_evaluate_order.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="ResourceName">
+    <corners android:radius="@dimen/divider_13px" />
+    <stroke
+        android:width="@dimen/divider_1px"
+        android:color="@color/color_FF4A76FF" />
+    <solid android:color="@android:color/white" />
+</shape>

healthconsultation/src/main/res/drawable/bg_pay_order.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="ResourceName">
+    <corners android:radius="@dimen/divider_13px" />
+    <stroke android:color="@color/color_FFFFA535" android:width="@dimen/divider_1px"/>
+    <solid android:color="@color/color_FFFFA535" />
+</shape>

healthconsultation/src/main/res/values/colors.xml

@@ -30,4 +30,5 @@
     <color name="color_FFA5A5A5" tools:ignore="ResourceName">#FFA5A5A5</color>
     <color name="color_FF4A76FF" tools:ignore="ResourceName">#FF4A76FF</color>
     <color name="color_FFFFA535" tools:ignore="ResourceName">#FFFFA535</color>
+    <color name="color_FFFFFF" tools:ignore="ResourceName">#FFFFFF</color>
 </resources>