费用审核

商邀 显示内容新增 快递费用，公务活动费，公务翻译费

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -1345,7 +1345,7 @@ namespace OASystem.API.Controllers
                     }
                     else
                     {
-                        CurrPayStr = (entity.PayMoney * (decimal.Parse(entity.PayPercentage.ToString("#0.00")) / 100 * entity.DayRate)).ConvertToDecimal1();
+                        CurrPayStr = (entity.PayMoney * entity.PayPercentage / 100 * entity.DayRate).ConvertToDecimal1();
                     }
                     _detail.CurrPay = CurrPayStr.ToString("#0.00") + " CNY";
 
@@ -1360,8 +1360,6 @@ namespace OASystem.API.Controllers
 
                     _detail.Balance = BalanceStr.ToString("#0.00") + " " + PaymentCurrency_WaitPay;
 
-
-
                     /*
                      * Bus名称
                      */
@@ -1401,9 +1399,9 @@ namespace OASystem.API.Controllers
                                 string isoppayStr = hotelReservations.Isoppay == 0 ? "是" : "否";
                                 _detail.PriceMsgContent = $"信用卡金额：{_detail.WaitPay} ({hotelCurrncyName})<br/>" +
                                                           $"房间说明： {hotelReservations.Remark} <br/>" +
-                                                          $"地税： {hotelReservations.GovernmentRent} {GovernmentRentCode} ({GovernmentRentName})<br/>" +
-                                                          $"城市税： {hotelReservations.CityTax} {CityTaxCode} ({CityTaxName})<br/>" +
-                                                          $"酒店早餐： {hotelReservations.BreakfastPrice} {BreakfastCode} ({BreakfastName})<br/>" +
+                                                          $"地税： {hotelReservations.GovernmentRent.ToString("#0.00")} {GovernmentRentCode} ({GovernmentRentName})<br/>" +
+                                                          $"城市税： {hotelReservations.CityTax.ToString("#0.00")} {CityTaxCode} ({CityTaxName})<br/>" +
+                                                          $"酒店早餐： {hotelReservations.BreakfastPrice.ToString("#0.00")} {BreakfastCode} ({BreakfastName})<br/>" +
                                                           $"酒店早餐是否由地接代付： {isoppayStr}";
                                 _detail.PriceNameContent = hotelReservations.HotelName;
                             }
@@ -1461,24 +1459,50 @@ namespace OASystem.API.Controllers
                             break;
                         case 81: //邀请/公务活动
 
-                            Grp_InvitationOfficialActivities invitationOfficialActivities = _InvitationOfficialActivities.Where(s => s.Id == entity.CId).FirstOrDefault();
-                            if (invitationOfficialActivities != null)
+                            Grp_InvitationOfficialActivities _ioa = _InvitationOfficialActivities.Where(s => s.Id == entity.CId).FirstOrDefault();
+                            if (_ioa != null)
                             {
-
-                                string ioaCurrencyCode = "Unknown";
-                                string ioaCurrencyName = "Unknown";
-
-                                var currencyData = currencyItems.Where(s => s.Id == invitationOfficialActivities.InviteCurrency && s.IsDel == 0).FirstOrDefault();
-                                if (currencyData != null)
+                                string inviteCurrName = "Unknown",     //邀请费用币种 Name
+                                       inviteCurrCode = "Unknown",     //邀请费用币种 Code
+                                       sendCurrName = "Unknown",       //快递费用币种 Name
+                                       sendCurrCode = "Unknown",       //快递费用币种 Code
+                                       eventsCurrName = "Unknown",     //公务活动费币种 Name
+                                       eventsCurrCode = "Unknown",     //公务活动费币种 Code
+                                       translateCurrName = "Unknown",  //公务翻译费 Name
+                                       translateCurrCode = "Unknown";  //公务翻译费 Code
+                                #region 处理费用币种
+                                var inviteCurrData = currencyItems.Where(s => s.Id == _ioa.InviteCurrency && s.IsDel == 0).FirstOrDefault();
+                                if (inviteCurrData != null)
+                                {
+                                    inviteCurrName = inviteCurrData.Remark;
+                                    inviteCurrCode = inviteCurrData.Name;
+                                }
+                                var sendCurrData = currencyItems.Where(s => s.Id == _ioa.SendCurrency && s.IsDel == 0).FirstOrDefault();
+                                if (sendCurrData != null)
                                 {
-                                    ioaCurrencyCode = currencyData.Name;
-                                    ioaCurrencyName = currencyData.Remark;
+                                    sendCurrName = sendCurrData.Remark;
+                                    sendCurrCode = sendCurrData.Name;
                                 }
+                                var eventsCurrData = currencyItems.Where(s => s.Id == _ioa.EventsCurrency && s.IsDel == 0).FirstOrDefault();
+                                if (eventsCurrData != null)
+                                {
+                                    eventsCurrName = eventsCurrData.Remark;
+                                    eventsCurrCode = eventsCurrData.Name;
+                                }
+                                var translateCurrData = currencyItems.Where(s => s.Id == _ioa.TranslateCurrency && s.IsDel == 0).FirstOrDefault();
+                                if (translateCurrData != null)
+                                {
+                                    translateCurrName = translateCurrData.Remark;
+                                    translateCurrCode = translateCurrData.Name;
+                                }
+                                #endregion
 
-                                _detail.PriceNameContent = invitationOfficialActivities.InviterArea;
-                                _detail.PriceMsgContent = "邀请费用：" + invitationOfficialActivities.InviteCost + " " + ioaCurrencyCode + "(" + ioaCurrencyName + ")<br/>" +
-                                                          "活动费用：- <br/>" +
-                                                          "备注：" + invitationOfficialActivities.Remark + "<br/>";
+                                _detail.PriceNameContent = _ioa.InviterArea;
+                                _detail.PriceMsgContent = $@"邀请费用：{_ioa.InviteCost.ToString("#0.00")} {inviteCurrCode}({inviteCurrName})<br/>" +
+                                                          $@"快递费用：{_ioa.SendCost.ToString("#0.00")} {sendCurrCode}({sendCurrName})<br/>" +
+                                                          $@"公务活动费：{_ioa.EventsCost.ToString("#0.00")} {eventsCurrCode}({eventsCurrName})<br/>" +
+                                                          $@"公务翻译费：{_ioa.TranslateCost.ToString("#0.00")} {translateCurrCode}({translateCurrName})<br/>" +
+                                                          $@"备注：" + _ioa.Remark + "<br/>";
 
                             }
 
@@ -2999,19 +3023,18 @@ namespace OASystem.API.Controllers
         {
             try
             {
-
                 _sqlSugar.BeginTran();
                 var res = await _InvitationOfficialActivitiesRep.SoftDeleteByIdAsync<Grp_InvitationOfficialActivities>(dto.Id.ToString(), dto.DeleteUserId);
                 if (res)
                 {
-                    var result = await _sqlSugar.Updateable<Grp_CreditCardPayment>().Where(a => a.CId == dto.Id && a.CTable == 81).SetColumns(a => new Grp_CreditCardPayment()
+                    var result = _sqlSugar.Updateable<Grp_CreditCardPayment>().Where(a => a.CId == dto.Id && a.CTable == 81).SetColumns(a => new Grp_CreditCardPayment()
                     {
                         IsDel = 1,
                         DeleteUserId = dto.DeleteUserId,
                         DeleteTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")
-                    }).ExecuteCommandAsync();
+                    }).ExecuteCommand();
 
-                    if (result > 0 )
+                    if (result > 0)
                     {
                         _sqlSugar.CommitTran();
                         return Ok(JsonView(true, "删除成功！"));