费用审核(酒店模块) --> 酒店名称提示信息更改是否由地接代付 由“是否由地接代付”更改为“是否由地接或其他人代付”

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -2008,22 +2008,22 @@ FROM
 
                                 if (hotelReservations.SingleRoomPrice > 0)
                                 {
-                                    roomFeestr1 += $"<span style='width:70px;display: inline-block;'></span>单间：{hotelReservations.SingleRoomPrice.ToString("#0.00")} * {hotelReservations.SingleRoomCount}<br/>";
+                                    roomFeestr1 += $"<span style='width:70px;display: inline-block;'></span>单间：{hotelReservations.SingleRoomPrice.ToString("#0.00")} * {hotelReservations.SingleRoomCount} * {(int)hotel_days}<br/>";
                                     __isSingle = true;
                                 }
                                 if (hotelReservations.DoubleRoomPrice > 0)
                                 {
-                                    roomFeestr1 += $"<span style='width:70px;display: inline-block;'></span>双人间：{hotelReservations.DoubleRoomPrice.ToString("#0.00")} * {hotelReservations.DoubleRoomCount}<br/>";
+                                    roomFeestr1 += $"<span style='width:70px;display: inline-block;'></span>双人间：{hotelReservations.DoubleRoomPrice.ToString("#0.00")} * {hotelReservations.DoubleRoomCount} * {(int)hotel_days}<br/>";
                                     __isDouble = true;
                                 }
                                 if (hotelReservations.SuiteRoomPrice > 0)
                                 {
-                                    roomFeestr1 += $"<span style='width:70px;display: inline-block;'></span>套房：{hotelReservations.SuiteRoomPrice.ToString("#0.00")} * {hotelReservations.SuiteRoomCount}<br/>";
+                                    roomFeestr1 += $"<span style='width:70px;display: inline-block;'></span>套房：{hotelReservations.SuiteRoomPrice.ToString("#0.00")} * {hotelReservations.SuiteRoomCount} * {(int)hotel_days}<br/>";
                                     __isSuite = true;
                                 }
                                 if (hotelReservations.OtherRoomPrice > 0)
                                 {
-                                    roomFeestr1 += $"<span style='width:70px;display: inline-block;'></span>其他：{hotelReservations.OtherRoomPrice.ToString("#0.00")} * {hotelReservations.OtherRoomCount}";
+                                    roomFeestr1 += $"<span style='width:70px;display: inline-block;'></span>其他：{hotelReservations.OtherRoomPrice.ToString("#0.00")} * {hotelReservations.OtherRoomCount} * {(int)hotel_days}";
                                     __isOther = true;
                                 }
 
@@ -2138,16 +2138,16 @@ FROM
                                 }
 
                                 string hotelBreakfastStr = "", hotelGovernmentRentStr = "", hotelCityTaxStr = "";
-                                if (breakfastFee > 0) hotelBreakfastStr = $"酒店早餐： {breakfastFee.ToString("#0.00")} {breakfastCode} {breakfastName} 当时汇率 {breakfastData?.Rate.ToString("#0.0000")} <br/>是否由地接代付：{breakfastBool}<br/><br/>";
-                                if (governmentRentFee > 0) hotelGovernmentRentStr = $"地税： {governmentRentFee.ToString("#0.00")} {governmentRentCode} {governmentRentName} 当时汇率 {governmentRentData?.Rate.ToString("#0.0000")} <br/>是否由地接代付：{governmentRentBool}<br/><br/>";
-                                if (cityTaxFee > 0) hotelCityTaxStr = $"城市税： {cityTaxFee.ToString("#0.00")} {cityTaxCode} {cityTaxName} 当时汇率 {cityTaxData?.Rate.ToString("#0.0000")} <br/>是否由地接代付：{cityTaxBool}<br/>";
+                                if (breakfastFee > 0) hotelBreakfastStr = $"酒店早餐： {breakfastFee.ToString("#0.00")} {breakfastCode} {breakfastName} 当时汇率 {breakfastData?.Rate.ToString("#0.0000")} <br/>是否由地接或其他人代付：{breakfastBool}<br/><br/>";
+                                if (governmentRentFee > 0) hotelGovernmentRentStr = $"地税： {governmentRentFee.ToString("#0.00")} {governmentRentCode} {governmentRentName} 当时汇率 {governmentRentData?.Rate.ToString("#0.0000")} <br/>是否由地接或其他人代付：{governmentRentBool}<br/><br/>";
+                                if (cityTaxFee > 0) hotelCityTaxStr = $"城市税： {cityTaxFee.ToString("#0.00")} {cityTaxCode} {cityTaxName} 当时汇率 {cityTaxData?.Rate.ToString("#0.0000")} <br/>是否由地接或其他人代付：{cityTaxBool}<br/>";
 
                                 string hotelCostTotalStr = "";// $"&nbsp;&nbsp;成本合计：{hotelCsotTotal.ToString("#0.00")}<br/>";
                                 _detail.PriceMsgContent = $"{hotelCostTitalStr}{hotelCostStr}{hotelCostTotalStr}{hotelCost_day}<br/>" +
                                                           $"<span style='font-weight:800;'>{hotelReservations.HotelName} [{hotelReservations.CheckInDate} - {hotelReservations.CheckOutDate}]</span><br/>" +
                                                           $"信用卡金额：{_detail.WaitPay} ({hotelCurrncyName})<br/>" +
                                                           $"房间说明： {hotelReservations.Remark} <br/>" +
-                                                          $"房间费用： {roomCode} {roomName} 当时汇率：{roomData?.Rate.ToString("#0.0000")}{roomFeeStr}  是否由地接代付：{roomBool}<br/><br/>" +
+                                                          $"房间费用： {roomCode} {roomName} 当时汇率：{roomData?.Rate.ToString("#0.0000")}{roomFeeStr}  是否由地接或其他人代付：{roomBool}<br/><br/>" +
                                                           $"{hotelBreakfastStr}" +
                                                           $"{hotelGovernmentRentStr}" +
                                                           $"{hotelCityTaxStr}";