|
@@ -1,26 +1,11 @@
|
|
|
using AutoMapper;
|
|
|
-using MathNet.Numerics.Statistics.Mcmc;
|
|
|
-using MySqlX.XDevAPI.Common;
|
|
|
-using NPOI.SS.Formula.Functions;
|
|
|
using OASystem.Domain;
|
|
|
-using OASystem.Domain.Dtos.Financial;
|
|
|
using OASystem.Domain.Dtos.Groups;
|
|
|
using OASystem.Domain.Dtos.Resource;
|
|
|
-using OASystem.Domain.Entities.Financial;
|
|
|
using OASystem.Domain.Entities.Groups;
|
|
|
-using OASystem.Domain.ViewModels.Financial;
|
|
|
using OASystem.Domain.ViewModels.Groups;
|
|
|
using OASystem.Infrastructure.Repositories.Resource;
|
|
|
using OASystem.Infrastructure.Tools;
|
|
|
-using Org.BouncyCastle.Asn1.Ocsp;
|
|
|
-using SqlSugar;
|
|
|
-using StackExchange.Redis;
|
|
|
-using System;
|
|
|
-using System.Collections.Generic;
|
|
|
-using System.Linq;
|
|
|
-using System.Text;
|
|
|
-using System.Threading.Tasks;
|
|
|
-using static NPOI.HSSF.Util.HSSFColor;
|
|
|
using Result = OASystem.Domain.Result;
|
|
|
|
|
|
namespace OASystem.Infrastructure.Repositories.Groups
|
|
@@ -33,8 +18,8 @@ namespace OASystem.Infrastructure.Repositories.Groups
|
|
|
private readonly TeamRateRepository _teamRateRep;
|
|
|
private readonly TourClientListRepository _tourClientListRep;
|
|
|
private readonly HotelDataRepository _hotelDataRep;
|
|
|
- public HotelPriceRepository(SqlSugarClient sqlSugar, IMapper mapper, TeamRateRepository teamRateRep, TourClientListRepository tourClientListRep, HotelDataRepository hotelDataRep)
|
|
|
- :base(sqlSugar)
|
|
|
+ public HotelPriceRepository(SqlSugarClient sqlSugar, IMapper mapper, TeamRateRepository teamRateRep, TourClientListRepository tourClientListRep, HotelDataRepository hotelDataRep)
|
|
|
+ : base(sqlSugar)
|
|
|
{
|
|
|
this._mapper = mapper;
|
|
|
_result = new Result() { Code = -1, Msg = MsgTips.Fail };
|
|
@@ -50,7 +35,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
|
|
|
/// </summary>
|
|
|
/// <param name="dto"></param>
|
|
|
/// <returns></returns>
|
|
|
- public async Task<JsonView> _ItemsByDiId(int portType,int diId)
|
|
|
+ public async Task<JsonView> ItemsByDiId(int portType, int diId)
|
|
|
{
|
|
|
|
|
|
string sql = string.Format(@"Select row_number() over(order by hr.CheckInDate asc) as Row_Number,
|
|
@@ -87,7 +72,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
|
|
|
/// </summary>
|
|
|
/// <param name="dto"></param>
|
|
|
/// <returns></returns>
|
|
|
- public async Task<JsonView> _BasicsDataInit(int portType, int diId)
|
|
|
+ public async Task<JsonView> BasicsDataInit(int portType, int diId)
|
|
|
{
|
|
|
List<Sys_SetData> _dataSouruce = await _sqlSugar.Queryable<Sys_SetData>().Where(a => a.IsDel == 0).ToListAsync();
|
|
|
|
|
@@ -116,7 +101,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
|
|
|
var _teamRateView = await _teamRateRep.PostGroupTeamRateItemByDiIdAndCTableId(portType, diId, 76);
|
|
|
|
|
|
string _CheckVolumeNo = string.Empty;
|
|
|
- var checkVoumeNoData = _CreateCheckVolumeNo(diId);
|
|
|
+ var checkVoumeNoData = CreateCheckVolumeNo(diId);
|
|
|
if (checkVoumeNoData.Result.Code == 0)
|
|
|
{
|
|
|
_CheckVolumeNo = checkVoumeNoData.Result.Data;
|
|
@@ -127,8 +112,9 @@ namespace OASystem.Infrastructure.Repositories.Groups
|
|
|
|
|
|
//三公国家费用标准
|
|
|
var countrys = await _sqlSugar.Queryable<Grp_NationalTravelFee>()
|
|
|
- .Where(x => x.IsDel == 0 )
|
|
|
- .Select(x => new {
|
|
|
+ .Where(x => x.IsDel == 0)
|
|
|
+ .Select(x => new
|
|
|
+ {
|
|
|
x.Id,
|
|
|
x.Country,
|
|
|
x.City
|
|
@@ -164,7 +150,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
|
|
|
/// </summary>
|
|
|
/// <param name="DiId"></param>
|
|
|
/// <returns></returns>
|
|
|
- public async Task<Result> _CreateCheckVolumeNo(int DiId)
|
|
|
+ public async Task<Result> CreateCheckVolumeNo(int DiId)
|
|
|
{
|
|
|
var groupInfo = await _sqlSugar.Queryable<Grp_DelegationInfo>().Where(it => it.Id == DiId && it.IsDel == 0).FirstAsync();
|
|
|
if (groupInfo != null)
|
|
@@ -200,9 +186,9 @@ namespace OASystem.Infrastructure.Repositories.Groups
|
|
|
/// </summary>
|
|
|
/// <param name="dto"></param>
|
|
|
/// <returns></returns>
|
|
|
- public async Task<JsonView> _Details(int portType, int id)
|
|
|
+ public async Task<JsonView> Details(int portType, int id)
|
|
|
{
|
|
|
- if (id < 0 )
|
|
|
+ if (id < 0)
|
|
|
{
|
|
|
_view.Msg = string.Format(@"请输入正确的Id!");
|
|
|
return _view;
|
|
@@ -263,16 +249,16 @@ namespace OASystem.Infrastructure.Repositories.Groups
|
|
|
/// Add Or Edit
|
|
|
/// </summary>
|
|
|
/// <returns></returns>
|
|
|
- public async Task<JsonView> _AddOrEdit(HotelReservationsAddOrEditDto _dto)
|
|
|
+ public async Task<JsonView> AddOrEdit(HotelReservationsAddOrEditDto _dto)
|
|
|
{
|
|
|
var _view = new JsonView() { Code = 400, Msg = MsgTips.Fail };
|
|
|
int portType = _dto.PortType;
|
|
|
if (portType == 1 || portType == 2 || portType == 3)
|
|
|
{
|
|
|
- Grp_HotelReservations _HotelReservations = new Grp_HotelReservations();
|
|
|
- List<Grp_HotelReservationsContent> _HotelReservationsContents = new List<Grp_HotelReservationsContent>();
|
|
|
+ var _HotelReservations = new Grp_HotelReservations();
|
|
|
+ var _HotelReservationsContents = new List<Grp_HotelReservationsContent>();
|
|
|
|
|
|
- Grp_CreditCardPayment _CreditCardPayment = new Grp_CreditCardPayment();
|
|
|
+ var _CreditCardPayment = new Grp_CreditCardPayment();
|
|
|
|
|
|
#region 参数处理
|
|
|
_HotelReservations = _mapper.Map<Grp_HotelReservations>(_dto);
|
|
@@ -311,10 +297,11 @@ namespace OASystem.Infrastructure.Repositories.Groups
|
|
|
|
|
|
#endregion
|
|
|
|
|
|
- _HotelReservationsContents.ForEach(it => {
|
|
|
+ _HotelReservationsContents.ForEach(it =>
|
|
|
+ {
|
|
|
it.CreateUserId = _dto.UserId;
|
|
|
it.DiId = _dto.DiId;
|
|
|
-
|
|
|
+
|
|
|
it.HrId = _HotelReservations.Id;
|
|
|
|
|
|
//2025-04-07 第四次更改 PayDId == 72(刷卡) IsPay == 1
|
|
@@ -323,7 +310,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
|
|
|
if (!string.IsNullOrEmpty(it.ConsumptionDate))
|
|
|
{
|
|
|
if (DateTime.TryParse(it.ConsumptionDate, out DateTime dt))
|
|
|
- {
|
|
|
+ {
|
|
|
it.ConsumptionDate = dt.ToString("yyyy-MM-dd");
|
|
|
}
|
|
|
}
|
|
@@ -337,7 +324,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
|
|
|
if (portType == 2 || portType == 3)
|
|
|
{
|
|
|
string checkNo = string.Empty;
|
|
|
- Result checkNoRes = await _CreateCheckVolumeNo(_dto.DiId);
|
|
|
+ Result checkNoRes = await CreateCheckVolumeNo(_dto.DiId);
|
|
|
if (checkNoRes.Code == 0)
|
|
|
{
|
|
|
checkNo = checkNoRes.Data;
|
|
@@ -392,12 +379,13 @@ namespace OASystem.Infrastructure.Repositories.Groups
|
|
|
return _view;
|
|
|
}
|
|
|
|
|
|
- _HotelReservationsContents.ForEach(it => {
|
|
|
+ _HotelReservationsContents.ForEach(it =>
|
|
|
+ {
|
|
|
it.HrId = hotelId;
|
|
|
});
|
|
|
|
|
|
int hotelSubId = await _sqlSugar.Insertable<Grp_HotelReservationsContent>(_HotelReservationsContents).ExecuteReturnIdentityAsync();
|
|
|
- if (hotelSubId < 0)
|
|
|
+ if (hotelSubId < 0)
|
|
|
{
|
|
|
_sqlSugar.RollbackTran(); //回滚
|
|
|
_view.Msg = "酒店预定详细信息添加失败";
|
|
@@ -443,7 +431,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
|
|
|
|
|
|
_view.Msg = "操作成功!";
|
|
|
_view.Code = 200;
|
|
|
- _view.Data = new { ccpId = ccpId, sign = 1, hotelId = hotelId };
|
|
|
+ _view.Data = new { ccpId, sign = 1, hotelId };
|
|
|
_sqlSugar.CommitTran(); // 提交
|
|
|
|
|
|
return _view;
|
|
@@ -506,7 +494,8 @@ namespace OASystem.Infrastructure.Repositories.Groups
|
|
|
{
|
|
|
int hotelSubUpdate = await _sqlSugar
|
|
|
.Updateable<Grp_HotelReservationsContent>(updateHotelSubData)
|
|
|
- .IgnoreColumns(it => new {
|
|
|
+ .IgnoreColumns(it => new
|
|
|
+ {
|
|
|
it.DiId,
|
|
|
it.HrId,
|
|
|
it.CreateUserId,
|
|
@@ -518,7 +507,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
|
|
|
.ExecuteCommandAsync();
|
|
|
if (hotelSubUpdate > 0) hotelSubStatus = true;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
if (!hotelSubStatus)
|
|
|
{
|
|
|
_view.Msg = "酒店预定子表信息修改失败!";
|
|
@@ -528,9 +517,9 @@ namespace OASystem.Infrastructure.Repositories.Groups
|
|
|
|
|
|
var hotelInfo = await _sqlSugar
|
|
|
.Queryable<Grp_CreditCardPayment>()
|
|
|
- .Where(it => it.DIId == _dto.DiId &&
|
|
|
- it.CId == _dto.Id &&
|
|
|
- it.CTable == 76 &&
|
|
|
+ .Where(it => it.DIId == _dto.DiId &&
|
|
|
+ it.CId == _dto.Id &&
|
|
|
+ it.CTable == 76 &&
|
|
|
it.IsDel == 0
|
|
|
)
|
|
|
.FirstAsync();
|
|
@@ -573,7 +562,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
|
|
|
|
|
|
_view.Msg = "操作成功!";
|
|
|
_view.Code = 200;
|
|
|
- _view.Data = new { ccpId = _CreditCardPayment.Id, sign = 2 ,hotelId = _HotelReservations.Id };
|
|
|
+ _view.Data = new { ccpId = _CreditCardPayment.Id, sign = 2, hotelId = _HotelReservations.Id };
|
|
|
_sqlSugar.CommitTran(); // 提交
|
|
|
return _view;
|
|
|
}
|
|
@@ -590,10 +579,10 @@ namespace OASystem.Infrastructure.Repositories.Groups
|
|
|
/// Del
|
|
|
/// </summary>
|
|
|
/// <returns></returns>
|
|
|
- public async Task<JsonView> _Del(int id,int userId)
|
|
|
+ public async Task<JsonView> Del(int id, int userId)
|
|
|
{
|
|
|
_sqlSugar.BeginTran();
|
|
|
- Grp_HotelReservations _HotelReservations = new Grp_HotelReservations()
|
|
|
+ var _HotelReservations = new Grp_HotelReservations()
|
|
|
{
|
|
|
Id = id,
|
|
|
IsDel = 1,
|
|
@@ -612,7 +601,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
|
|
|
if (hrStatus < 0)
|
|
|
{
|
|
|
_sqlSugar.RollbackTran();
|
|
|
- return new JsonView() { Code = 400,Msg = MsgTips.Fail };
|
|
|
+ return new JsonView() { Code = 400, Msg = MsgTips.Fail };
|
|
|
}
|
|
|
|
|
|
int hrSubStatus = await _sqlSugar.Updateable<Grp_HotelReservationsContent>()
|
|
@@ -621,7 +610,8 @@ namespace OASystem.Infrastructure.Repositories.Groups
|
|
|
.SetColumns(it => it.DeleteTime == DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"))
|
|
|
.Where(it => it.HrId == id).ExecuteCommandAsync();
|
|
|
|
|
|
- var ccpInfp = new Grp_CreditCardPayment() {
|
|
|
+ var ccpInfp = new Grp_CreditCardPayment()
|
|
|
+ {
|
|
|
CId = id,
|
|
|
CTable = 76,
|
|
|
IsDel = 1,
|