2024-04-22 修改

bug修复:

1. 酒店费用录入，费用计算逻辑优化

app/src/main/java/com/pan_american/android/OASystem.kt

@@ -149,7 +149,7 @@ class OASystem : Application() {
         // 邀请资料
         const val INVITE_DATA = 25
 
-        // 接团信息(团组操作)
+        // 接团信息
 //        const val GROUP_INFORMATION = 26
 
         //团组操作

app/src/main/java/com/pan_american/android/ui/announcement/AnnouncementFragment.kt

@@ -69,7 +69,6 @@ class AnnouncementFragment : BaseFragment<FragmentAnnouncementBinding>() {
                 messageListRequest.readStatus = 3
             }
         } else {
-
             haveUnread = if (OASystem.announcementUnReadCount > 0) {
                 2
             } else {
@@ -79,7 +78,6 @@ class AnnouncementFragment : BaseFragment<FragmentAnnouncementBinding>() {
             messageListRequest = MessageListRequest(ANNOUNCEMENT_NOTIFICATION, haveUnread)
         }
 
-
         initViews()
         initEvents()
     }

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

@@ -582,11 +582,11 @@ class AddHotelPredetermineActivity : BaseActivity<ActivityAddHotelPredetermineBi
                 if (binding.realitySingleRoom.text.isNullOrBlank()) {
                     showMessage(resources.getString(R.string.single_room_count_input_error))
                     return
-                }
-
-                singleRoomCount = binding.realitySingleRoom.text.toString().toInt()
+                } else {
+                    singleRoomCount = binding.realitySingleRoom.text.toString().toInt()
 
-                calculateRoomPayment(1)
+                    calculateRoomPayment(1)
+                }
             }
         })
 
@@ -1610,6 +1610,17 @@ class AddHotelPredetermineActivity : BaseActivity<ActivityAddHotelPredetermineBi
 
                                 binding.checkInEndTime.text = checkOutDate
 
+                                val days = if(binding.checkInStartTime.text.isNotBlank() && binding.checkInEndTime.text.isNotBlank()) {
+
+                                    val startTime = SimpleDateFormat("yyyy-MM-dd", Locale.CHINA).parse(binding.checkInStartTime.text.toString())
+                                    val endTime = SimpleDateFormat("yyyy-MM-dd", Locale.CHINA).parse(binding.checkInEndTime.text.toString())
+
+                                    getGapCount(startTime!!, endTime!!)
+
+                                } else {
+                                    0
+                                }
+
                                 run {
                                     for (item in checkInTypeList) {
                                         if (item.id == checkType) {
@@ -1633,7 +1644,9 @@ class AddHotelPredetermineActivity : BaseActivity<ActivityAddHotelPredetermineBi
 
                                 binding.singleRoomPrice.setText(singleRoomPrice.toString())
 
-                                this@AddHotelPredetermineActivity.singleRoomPrice = singleRoomPrice
+                                singleRoomUnitPrice = singleRoomPrice
+
+                                this@AddHotelPredetermineActivity.singleRoomPrice = singleRoomUnitPrice * singleRoomCount * days
 
                                 binding.realityDoubleRoom.setText(doubleRoomCount.toString())
 
@@ -1641,7 +1654,9 @@ class AddHotelPredetermineActivity : BaseActivity<ActivityAddHotelPredetermineBi
 
                                 binding.doubleRoomPrice.setText(doubleRoomPrice.toString())
 
-                                this@AddHotelPredetermineActivity.doubleRoomPrice = doubleRoomPrice
+                                doubleRoomUnitPrice = doubleRoomPrice
+
+                                this@AddHotelPredetermineActivity.doubleRoomPrice = doubleRoomUnitPrice * doubleRoomCount * days
 
                                 binding.realitySuiteRoom.setText(suiteRoomCount.toString())
 
@@ -1649,7 +1664,9 @@ class AddHotelPredetermineActivity : BaseActivity<ActivityAddHotelPredetermineBi
 
                                 binding.suiteRoomPrice.setText(suiteRoomPrice.toString())
 
-                                this@AddHotelPredetermineActivity.suiteRoomPrice = suiteRoomPrice
+                                suiteRoomUnitPrice = suiteRoomPrice
+
+                                this@AddHotelPredetermineActivity.suiteRoomPrice = suiteRoomUnitPrice * suiteRoomCount * days
 
                                 binding.realityOtherRoom.setText(otherRoomCount.toString())
 
@@ -1657,7 +1674,9 @@ class AddHotelPredetermineActivity : BaseActivity<ActivityAddHotelPredetermineBi
 
                                 binding.otherRoomPrice.setText(otherRoomPrice.toString())
 
-                                this@AddHotelPredetermineActivity.otherRoomPrice = otherRoomPrice
+                                otherRoomUnitPrice = otherRoomPrice
+
+                                this@AddHotelPredetermineActivity.otherRoomPrice = otherRoomPrice * otherRoomCount * days
 
                                 binding.creditCardPayment.text = cardPrice.toString()