2024-06-13 修改

修改

1. 酒店预订 可编辑逻辑修改，完善部分代码

app/src/main/java/com/pan_american/android/ui/group_hotel/hotel_predetermine/AddHotelPredetermineActivity.kt

@@ -305,7 +305,11 @@ class AddHotelPredetermineActivity : BaseActivity<ActivityAddHotelPredetermineBi
     }
 
     private fun canBeEdit(): Boolean {
-        return OASystem.authorization(OASystem.HOTEL_PREDETERMINE, OASystem.EDIT) and (isAuditGM == 0)
+        return if (fromList) {
+            OASystem.authorization(OASystem.HOTEL_PREDETERMINE, OASystem.EDIT) and  (isAuditGM != 1)
+        } else {
+            true
+        }
     }
 
     override fun onStart() {
@@ -347,6 +351,8 @@ class AddHotelPredetermineActivity : BaseActivity<ActivityAddHotelPredetermineBi
                         OASystem.needRefresh = true
 
                         finish()
+                    } else {
+                        showMessage(updateResponse.msg)
                     }
                 }
             }

app/src/main/java/com/pan_american/android/ui/group_hotel/hotel_predetermine/HotelPredetermineBaseFragment.kt

@@ -377,9 +377,6 @@ class HotelPredetermineBaseFragment : BaseFragment<FragmentHotelPredetermineBase
         binding.save.setOnClickListener {
 
             if (hotelBaseDataVerify()) {
-
-                OASystem.hotelPredetermineRequest.diId = groupId
-
                 if (!fromList) {
                     for (i in 1 .. 4) {
                         val hotelContent = HotelReservationsContentDetailsView()
@@ -547,6 +544,7 @@ class HotelPredetermineBaseFragment : BaseFragment<FragmentHotelPredetermineBase
             else -> {
 
                 OASystem.hotelPredetermineRequest.apply {
+                    diId = groupId
                     gtId = customerTypeId
                     reservationsWebsite = websiteId
                     determineNo = binding.hotelConfirmCode.getText()