2024-04-26 修改

修改:

1. 保险费用录入 费用类型默认为 新数据不选此项
2. bug修复

新增

1. 签证费用录入，新增签证描述

app/src/main/java/com/pan_american/android/data/model/group_visa/visa_payment_insert/entity/VisaPaymentListItem.kt

@@ -1,5 +1,6 @@
 package com.pan_american.android.data.model.group_visa.visa_payment_insert.entity
 
-class VisaPaymentListItem(val id: Int, val diId: Int, val visaClient: String, val visaNumber: Int, val visaFreeNumber: Int,
+//2024-04-26 添加签证描述
+class VisaPaymentListItem(val id: Int, val diId: Int, val visaDescription: String, val visaClient: String, val visaNumber: Int, val visaFreeNumber: Int,
                           val visaPrice: Double, val visaCurrencyStr: String, val isAuditGM: Int, val isThird: Int,
                           val createUserId: Int, val createTime: String, val remark: String)

app/src/main/java/com/pan_american/android/data/model/group_visa/visa_payment_insert/network/UpdateVisaPaymentRequest.kt

@@ -7,6 +7,8 @@ class UpdateVisaPaymentRequest {
     var status = 0
     var id = 0
     var diId = 0
+    //2024-04-26 添加签证描述
+    var visaDescription = ""
     var visaClient = ""
     var visaPrice = 0.0
     var visaCurrency = 0

app/src/main/java/com/pan_american/android/data/model/group_visa/visa_payment_insert/network/VisaPaymentDetailResponse.kt

@@ -7,6 +7,7 @@ class VisaPaymentDetailResponse(val data: Data): BaseResponse() {
 
     inner class Data(val visaInfo: VisaInfo, val creditCardPayment: CardPaymentResource)
 
-    inner class VisaInfo(val diId: Int, val visaClient: String, val visaPrice: Double, val visaCurrency: Int, val isThird: Int,
+    //2024-04-26 添加签证描述
+    inner class VisaInfo(val diId: Int, val visaDescription: String, val visaClient: String, val visaPrice: Double, val visaCurrency: Int, val isThird: Int,
                          val passengerType: Int, val visaNumber: Int, val visaFreeNumber: Int, val id: Int, val createUserId: Int, val remark: String)
 }

app/src/main/java/com/pan_american/android/ui/group_common/insurance_payment_insert/InsuranceListFragment.kt

@@ -67,8 +67,6 @@ class InsuranceListFragment : BaseFragment<FragmentInsuranceListBinding>() {
             binding.duringTime.text = getString("duringTime")
         }
 
-        listInit = false
-
         initViews()
         initEvents()
     }

app/src/main/java/com/pan_american/android/ui/group_visa/visa_payment_insert/AddVisaPaymentActivity.kt

@@ -47,8 +47,6 @@ class AddVisaPaymentActivity : BaseActivity<ActivityAddVisaPaymentBinding>() {
 
     private var customerSelectList = ArrayList<Selector>()
 
-    private var priceUnitSelect = false
-
     private var priceUnit = -1
 
     private var priceUnitList = ArrayList<Selector>()
@@ -97,8 +95,6 @@ class AddVisaPaymentActivity : BaseActivity<ActivityAddVisaPaymentBinding>() {
             if (fromList) {
                 binding.priceUnit.text = getStringExtra("paymentCurrency")
                 binding.sumUnit.text = getStringExtra("paymentCurrency")
-
-                priceUnitSelect = true
             }
         }
 
@@ -278,7 +274,6 @@ class AddVisaPaymentActivity : BaseActivity<ActivityAddVisaPaymentBinding>() {
                             binding.priceUnit.text = priceUnitList[position].currencyCode
                             binding.sumUnit.text = priceUnitList[position].currencyCode
                             priceUnit = priceUnitList[position].currencyId
-                            priceUnitSelect = true
 
                             popupWindow.dismiss()
                         }
@@ -459,6 +454,14 @@ class AddVisaPaymentActivity : BaseActivity<ActivityAddVisaPaymentBinding>() {
             updateVisaPaymentRequest.id = paymentId
             updateVisaPaymentRequest.diId = groupId
 
+            //2024-04-26 添加签证描述
+            if (binding.visaDescription.getText().isBlank()) {
+                showMessage(resources.getString(R.string.visa_description_hint))
+                return@setOnClickListener
+            } else {
+                updateVisaPaymentRequest.visaDescription = binding.visaDescription.getText()
+            }
+
             if (customerSelectList.size == 0) {
                 showMessage(resources.getString(R.string.customer_select_hint))
                 return@setOnClickListener
@@ -487,7 +490,7 @@ class AddVisaPaymentActivity : BaseActivity<ActivityAddVisaPaymentBinding>() {
                 updateVisaPaymentRequest.visaPrice = binding.visaPrice.text.toString().toDouble()
             }
 
-            if (!priceUnitSelect) {
+            if (priceUnit == -1) {
                 showMessage(resources.getString(R.string.payment_currency_hint))
                 return@setOnClickListener
             } else {
@@ -810,6 +813,9 @@ class AddVisaPaymentActivity : BaseActivity<ActivityAddVisaPaymentBinding>() {
                     if (visaPaymentDetailResponse != null) {
                         if (visaPaymentDetailResponse.code == 200) {
 
+                            //2024-04-26 添加签证描述
+                            binding.visaDescription.setText(visaPaymentDetailResponse.data.visaInfo.visaDescription)
+
                             val customer =
                                 visaPaymentDetailResponse.data.visaInfo.visaClient.split(",")
 
@@ -827,8 +833,7 @@ class AddVisaPaymentActivity : BaseActivity<ActivityAddVisaPaymentBinding>() {
 
                             binding.visaPrice.setText(visaPaymentDetailResponse.data.visaInfo.visaPrice.toString())
 
-                            updateVisaPaymentRequest.visaCurrency =
-                                visaPaymentDetailResponse.data.visaInfo.visaCurrency
+                            priceUnit = visaPaymentDetailResponse.data.visaInfo.visaCurrency
 
                             when (visaPaymentDetailResponse.data.visaInfo.isThird) {
                                 0 -> {

app/src/main/java/com/pan_american/android/ui/group_visa/visa_payment_insert/VisaPaymentListFragment.kt

@@ -212,16 +212,22 @@ class VisaPaymentListFragment : BaseFragment<FragmentVisaPaymentListBinding>() {
             setCanDelete(OASystem.authorization(OASystem.VISA_PAYMENT_INSERT, OASystem.DELETE))
             addBindView { itemView, data ->
 
-                val clientList = data.visaClient.trim().split("[*TuT*]")
-
-                if (clientList.size == 1) {
-                    itemView.findViewById<TextView>(R.id.visa_client).text = clientList[0]
+                ////2024-04-26 添加签证描述，匹配老数据避免报错
+
+                if (data.visaDescription.isBlank()) {
+                    val clientList = data.visaClient.trim().split("[*TuT*]")
+
+                    if (clientList.size == 1) {
+                        itemView.findViewById<TextView>(R.id.visa_client).text = clientList[0]
+                    } else {
+                        itemView.findViewById<TextView>(R.id.visa_client).text = String.format(
+                            resources.getString(R.string.client_list_title_format),
+                            clientList[0],
+                            clientList.size
+                        )
+                    }
                 } else {
-                    itemView.findViewById<TextView>(R.id.visa_client).text = String.format(
-                        resources.getString(R.string.client_list_title_format),
-                        clientList[0],
-                        clientList.size
-                    )
+                    itemView.findViewById<TextView>(R.id.visa_client).text = data.visaDescription
                 }
 
                 itemView.findViewById<TextView>(R.id.visa_price).text = String.format(

app/src/main/res/layout/activity_add_visa_payment.xml

@@ -154,6 +154,35 @@
                     android:textSize="@dimen/text_size_medium" />
             </LinearLayout>
 
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/line"
+                android:layout_marginTop="@dimen/common_padding"
+                android:layout_marginBottom="@dimen/common_padding"
+                android:background="@color/line_color" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/common_padding"
+                android:layout_marginBottom="@dimen/common_padding"
+                android:orientation="vertical">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="start"
+                    android:text="@string/visa_description"
+                    android:textSize="@dimen/text_size_medium" />
+
+                <com.pan_american.android.util.ScrollEditText
+                    android:id="@+id/visa_description"
+                    android:layout_width="match_parent"
+                    android:layout_height="120dp"
+                    android:layout_marginTop="@dimen/common_padding"
+                    android:scrollbars="none" />
+            </LinearLayout>
+
             <View
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/line"

app/src/main/res/values/strings.xml

@@ -626,6 +626,7 @@
 
     <string name="add_new_visa_payment">新增签证费用</string>
     <string name="update_visa_payment">签证费用修改</string>
+    <string name="visa_description">签证描述</string>
     <string name="visa_customer">签证客户</string>
     <string name="visa_price">签证总费用</string>
     <string name="is_agent">是否第三方代办</string>
@@ -633,6 +634,7 @@
     <string name="visa_handle_number">签证办理人数</string>
     <string name="visa_exemption_number">签证免签人数</string>
 
+    <string name="visa_description_hint">请输入签证描述</string>
     <string name="is_agent_select_hint">请选择是否第三方代办</string>
     <string name="customer_type_select_hint">请选择客户类型</string>
     <string name="visa_handle_number_input_hint">请输入正确的签证办理人数</string>