团组费用审核

标题列表 取消 酒店早餐

OASystem/OASystem.Api/Controllers/BusinessController.cs

@@ -121,7 +121,6 @@ namespace OASystem.API.Controllers
             xc_view = _view1.Where(it => it.Id == 77).FirstOrDefault();
             if (xc_view != null) {  _view1.Remove(xc_view); };
 
-
             List<SetDataInfoView> _view = new List<SetDataInfoView>();
             //_view.Insert(0, new SetDataInfoView { Id = -1, Name = "所有模块" });
 
@@ -139,27 +138,30 @@ namespace OASystem.API.Controllers
 
             SetDataInfoView jdzc_view = new SetDataInfoView();//751	酒店早餐
             jdzc_view = _view1.Where(it => it.Id == 751).FirstOrDefault();
-            if (jdzc_view != null) { _view.Insert(3, jdzc_view); _view1.Remove(jdzc_view); };
+            if (jdzc_view != null) { 
+                _view1.Remove(jdzc_view); 
+                //_view.Insert(3, jdzc_view); _view1.Remove(jdzc_view);
+            };
 
             SetDataInfoView cdy_view = new SetDataInfoView();//79	车/导游地接
             cdy_view = _view1.Where(it => it.Id == 79).FirstOrDefault();
-            if (cdy_view != null) { _view.Insert(4, cdy_view); _view1.Remove(cdy_view); };
+            if (cdy_view != null) { _view.Insert(3, cdy_view); _view1.Remove(cdy_view); };
 
             SetDataInfoView yqgw_view = new SetDataInfoView();//81	邀请/公务活动
             yqgw_view = _view1.Where(it => it.Id == 81).FirstOrDefault();
-            if (yqgw_view != null) { _view.Insert(5, yqgw_view); _view1.Remove(yqgw_view); };
+            if (yqgw_view != null) { _view.Insert(4, yqgw_view); _view1.Remove(yqgw_view); };
 
             SetDataInfoView bx_view = new SetDataInfoView();//82	团组客户保险
             bx_view = _view1.Where(it => it.Id == 82).FirstOrDefault();
-            if (bx_view != null) { _view.Insert(6, bx_view); _view1.Remove(bx_view); };
+            if (bx_view != null) { _view.Insert(5, bx_view); _view1.Remove(bx_view); };
 
             SetDataInfoView qtkx_view = new SetDataInfoView();//98	其他款项
             qtkx_view = _view1.Where(it => it.Id == 98).FirstOrDefault();
-            if (qtkx_view != null) { _view.Insert(7, qtkx_view); _view1.Remove(qtkx_view); };
+            if (qtkx_view != null) { _view.Insert(6, qtkx_view); _view1.Remove(qtkx_view); };
 
             SetDataInfoView skth_view = new SetDataInfoView();//285	收款退还与其他款项
             skth_view = _view1.Where(it => it.Id == 285).FirstOrDefault();
-            if (skth_view != null) { _view.Insert(8, skth_view); _view1.Remove(skth_view); };
+            if (skth_view != null) { _view.Insert(7, skth_view); _view1.Remove(skth_view); };
 
             if (_view1.Count > 0)
             {

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -1390,8 +1390,31 @@ namespace OASystem.API.Controllers
                             Grp_HotelReservations hotelReservations = _HotelReservations.Where(s => s.Id == entity.CId).FirstOrDefault();
                             if (hotelReservations != null)
                             {
-                                _detail.PriceMsgContent = "信用卡金额：" + _detail.WaitPay + " (" + hotelCurrncyName + ")<br/>" +
-                                                          "房间说明：" + hotelReservations.Remark;
+                                string GovernmentRentName = "", CityTaxName = "", BreakfastName = "";
+                                Sys_SetData sdPaymentCurrency_GovernmentRent = currencyItems.Where(s => s.Id == hotelReservations.GovernmentRentCurrency).FirstOrDefault();
+                                if (sdPaymentCurrency_GovernmentRent!= null)
+                                {
+                                    GovernmentRentName = sdPaymentCurrency_GovernmentRent.Remark;
+                                }
+
+                                Sys_SetData sdPaymentCurrency_CityTax = currencyItems.Where(s => s.Id == hotelReservations.CityTaxCurrency).FirstOrDefault(); 
+                                if (sdPaymentCurrency_CityTax != null)
+                                {
+                                    CityTaxName = sdPaymentCurrency_CityTax.Remark;
+                                }
+                                Sys_SetData sdPaymentCurrency_Breakfast = currencyItems.Where(s => s.Id == hotelReservations.BreakfastCurrency).FirstOrDefault();
+                                if (sdPaymentCurrency_Breakfast != null)
+                                {
+                                    BreakfastName = sdPaymentCurrency_Breakfast.Remark;
+                                }
+
+                                string isoppayStr = hotelReservations.Isoppay == 0 ? "是" : "否";
+                                _detail.PriceMsgContent = $"信用卡金额：{_detail.WaitPay} ({hotelCurrncyName})<br/>" +
+                                                          $"房间说明： {hotelReservations.Remark} <br/>" +
+                                                          $"地税： {hotelReservations.GovernmentRent} {hotelReservations.GovernmentRentCurrency} ({GovernmentRentName})<br/>" +
+                                                          $"城市税： {hotelReservations.CityTax} {hotelReservations.CityTaxCurrency} ({CityTaxName})<br/>" +
+                                                          $"酒店早餐： {hotelReservations.BreakfastPrice} {hotelReservations.BreakfastCurrency} ({BreakfastName})<br/>"+
+                                                          $"酒店早餐是否由地接代付： {isoppayStr}";
                                 _detail.PriceNameContent = hotelReservations.HotelName;
                             }
 

OASystem/OASystem.Api/Controllers/SystemController.cs

@@ -142,7 +142,7 @@ namespace OASystem.API.Controllers
 
             if (!typeData.Contains( dto.Type))
             {
-                return Ok(JsonView(false, "请输入有效的Type参数。1020 团组操作通知 1021 任务操作通知 "));
+                return Ok(JsonView(false, "请输入有效的Type参数。1021 团组操作通知 1020 任务操作通知 "));
             }
             if (dto.UserId < 1)
             {
@@ -164,15 +164,15 @@ namespace OASystem.API.Controllers
             List<NotificationTypeView> messageTypeViews = AppSettingsHelper.Get<NotificationTypeView>("MessageNotificationType");
             if (dto.Type == 1020) //任务操作通知 
             {
-                typeStr = String.Join(",", messageTypeViews.Where(it => it.TypeId == 2).FirstOrDefault().MsgTypeIds.ToList());
+                typeStr = String.Join(",", messageTypeViews.Where(it => it.TypeId == 1020).FirstOrDefault().MsgTypeIds.ToList());
             }
             else if (dto.Type == 1021)//团组操作通知
             {
-                typeStr = String.Join(",", messageTypeViews.Where(it => it.TypeId == 1).FirstOrDefault().MsgTypeIds.ToList());
+                typeStr = String.Join(",", messageTypeViews.Where(it => it.TypeId == 1021).FirstOrDefault().MsgTypeIds.ToList());
             }
             else if (dto.Type == 1022)//公告通知
             {
-                typeStr = String.Join(",", messageTypeViews.Where(it => it.TypeId == 0).FirstOrDefault().MsgTypeIds.ToList());
+                typeStr = String.Join(",", messageTypeViews.Where(it => it.TypeId == 1022).FirstOrDefault().MsgTypeIds.ToList());
             }
            
             if (!string.IsNullOrEmpty(typeStr))

OASystem/OASystem.Api/OAMethodLib/GeneralMethod.cs

@@ -96,8 +96,8 @@ namespace OASystem.API.OAMethodLib
             List<NotificationTypeView> notificationTypeViews = AppSettingsHelper.Get<NotificationTypeView>("MessageNotificationType");
             notificationType = notificationTypeViews.Where(it => it.MsgTypeIds.Contains((int)msgTypeEnum)).Select(it => it.TypeId).FirstOrDefault();
 
-            if (notificationType == 1) notificationStr = "操作";
-            else if (notificationType == 2) notificationStr = "任务";
+            if (notificationType == 1021) notificationStr = "操作";
+            else if (notificationType == 1020) notificationStr = "任务";
 
             return notificationStr;
         }

OASystem/OASystem.Api/appsettings.json

@@ -191,22 +191,22 @@
   //消息通知类型
   "MessageNotificationType": [
     {
-      "TypeId": 0, //系统公告
+      "TypeId": 1022, //系统公告
       "MsgTypeIds": [
         1  // 公告消息
       ]
     },
     {
-      "TypeId": 1, //操作通知
+      "TypeId": 1021, //操作通知
       "MsgTypeIds": [
         2, // 团组流程管控消息
         3, // 团组业务操作消息
         4, // 团组费用审核消息
-        5  // 团组签证进度更新消息
+        5 // 团组签证进度更新消息
       ]
     },
     {
-      "TypeId": 2, //任务通知
+      "TypeId": 1020, //任务通知
       "MsgTypeIds": [
         6 //任务进度更新消息
       ]

OASystem/OASystem.Domain/Dtos/System/MsgDto.cs

@@ -29,24 +29,12 @@ namespace OASystem.Domain.Dtos.System
         /// </summary>
         public int UserId { get; set; }
     }
-    /// <summary>
-    /// 
-    /// </summary>
-    public class MessageTypeFirstMsgDto : PortDtoBase
-    {
-        /// <summary>
-        /// 消息类型
-        /// 0 全部 1 团组操作通知 2 任务操作通知 3 公告消息
-        /// </summary>
-        public int Type { get; set; }
-        public int UserId { get; set; }
-    }
-
+   
     public class PotsMessagePageListDto : DtoBase
     {
         /// <summary>
         /// 消息类型
-        /// 1020 团组操作通知 1021 任务操作通知
+        /// 1020 团组操作通知 1021 任务操作通知 1022 系统公告
         /// </summary>
         public int Type { get; set; }
 

OASystem/OASystem.Domain/ViewModels/System/MessageView.cs

@@ -26,10 +26,6 @@ namespace OASystem.Domain.ViewModels.System
 
         /// <summary>
         /// 消息类型
-        /// 1 公告消息
-        /// 2 团组流程管控消息
-        /// 3 团组业务操作消息
-        /// 4费用
         /// </summary>
         public int Type { get; set; }
 

OASystem/OASystem.Infrastructure/Repositories/System/MessageRepository.cs

@@ -190,9 +190,9 @@ namespace OASystem.Infrastructure.Repositories.System
 
             //消息类型
             List<NotificationTypeView> messageTypeViews = AppSettingsHelper.Get<NotificationTypeView>("MessageNotificationType");
-            List<int> _operationTypeList = messageTypeViews.Where(it =>it.TypeId == 1).FirstOrDefault().MsgTypeIds.ToList();
-            List<int> _taskTypeList = messageTypeViews.Where(it => it.TypeId == 2).FirstOrDefault().MsgTypeIds.ToList();
-            List<int> _noticeTypeList = messageTypeViews.Where(it => it.TypeId == 0).FirstOrDefault().MsgTypeIds.ToList();
+            List<int> _operationTypeList = messageTypeViews.Where(it =>it.TypeId == 1021).FirstOrDefault().MsgTypeIds.ToList();
+            List<int> _taskTypeList = messageTypeViews.Where(it => it.TypeId == 1020).FirstOrDefault().MsgTypeIds.ToList();
+            List<int> _noticeTypeList = messageTypeViews.Where(it => it.TypeId == 1022).FirstOrDefault().MsgTypeIds.ToList();
 
 
             string msgSql = string.Format(@"Select * From(