+2

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -1667,15 +1667,20 @@ namespace OASystem.API.Controllers
                                     hotelCost_day += @$"</br>";
                                 }
 
+                                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/>";
+
                                 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}  <br/>是否由地接代付：{roomBool}<br/><br/>" +
-                                                          $"酒店早餐： {breakfastFee.ToString("#0.00")} {breakfastCode} {breakfastName} 当时汇率 {breakfastData?.Rate.ToString("#0.0000")} <br/>是否由地接代付：{breakfastBool}<br/><br/>" +
-                                                          $"地税： {governmentRentFee.ToString("#0.00")} {governmentRentCode} {governmentRentName} 当时汇率 {governmentRentData?.Rate.ToString("#0.0000")} <br/>是否由地接代付：{governmentRentBool}<br/><br/>" +
-                                                          $"城市税： {cityTaxFee.ToString("#0.00")} {cityTaxCode} {cityTaxName} 当时汇率 {cityTaxData?.Rate.ToString("#0.0000")} <br/>是否由地接代付：{cityTaxBool}<br/>";
+                                                          $"{hotelBreakfastStr}"+
+                                                          $"{hotelGovernmentRentStr}"+
+                                                          $"{hotelCityTaxStr}";
                                 _detail.PriceNameContent = hotelReservations.HotelName;
                             }