各模块费用录入

增加 ispay判断
if (dto.PayDId == 72) grp_CreditCardPayment.IsPay = 1;
else grp_CreditCardPayment.IsPay = 0;

OASystem/OASystem.Infrastructure/Repositories/Groups/AirTicketResRepository.cs

@@ -674,10 +674,8 @@ namespace OASystem.Infrastructure.Repositories.Groups
                         Grp_CreditCardPayment grp_CreditCard = _mapper.Map<Grp_CreditCardPayment>(dto.CardPaymentOpData);
 
                         //PayDId == 刷卡 IsPay == 1
-                        if (grp_CreditCard.PayDId == 72)
-                        {
-                            grp_CreditCard.IsPay = 1;
-                        }
+                        if (grp_CreditCard.PayDId == 72) grp_CreditCard.IsPay = 1;
+                        else grp_CreditCard.IsPay = 0;
 
                         //获取新汇率  int diId,int CId, int currencyId
                         var rate = await fn(dto.AirTicketResOpData.DiId, 85, dto.AirTicketResOpData.Currency);

OASystem/OASystem.Infrastructure/Repositories/Groups/CarTouristGuideGroundRepository.cs

@@ -986,10 +986,8 @@ namespace OASystem.Infrastructure.Repositories.Groups
                 c.OrbitalPrivateTransfer = dto.OrbitalPrivateTransfer;
                 c.Payee = dto.Payee;
                 c.CreateUserId = dto.CreateUserId;
-                if (c.PayDId == 72)
-                {
-                    c.IsPay = 1;
-                }
+                if (c.PayDId == 72) c.IsPay = 1;
+                else c.IsPay = 0;
                 c.RMBPrice = c.PayMoney;
                 c.DayRate = 1;
 

OASystem/OASystem.Infrastructure/Repositories/Groups/CustomersRepository.cs

@@ -375,10 +375,8 @@ namespace OASystem.Infrastructure.Repositories.Groups
                 c.IsAuditGM = 0;
                 c.PayMoney = cus.InsuranceCosts;
                 c.PaymentCurrency = cus.Currency;
-                if (c.PayDId == 72)
-                {
-                    c.IsPay = 1;
-                }
+                if (c.PayDId == 72) c.IsPay = 1;
+                else c.IsPay = 0;
                 c.RMBPrice = cus.InsuranceCosts;
                 c.DayRate = 1;
                 Grp_TeamRate _TeamRate = _sqlSugar.Queryable<Grp_TeamRate>().First(a => a.DiId == dto.DiId && a.IsDel == 0 && a.CTable == 82);

OASystem/OASystem.Infrastructure/Repositories/Groups/DecreasePaymentsRepository.cs

@@ -183,7 +183,10 @@ Where gdp.DiId = {0} And ccp.CTable = 98 {2} And ccp.IsDel = 0 And gdp.IsDel = 0
                         C.IsAuditGM = 0;
                         C.AuditGMOperate = 21;
                         C.AuditGMDate = "";
-                        C.IsPay = 0;
+
+                        if (C.PayDId == 72) C.IsPay = 1;
+                        else C.IsPay = 0;
+
                         C.DIId = grp_Decrease.DiId;
                         C.CId = id;
                         C.CTable = 98;
@@ -271,11 +274,17 @@ Where gdp.DiId = {0} And ccp.CTable = 98 {2} And ccp.IsDel = 0 And gdp.IsDel = 0
                                 RollbackTran();
                                 return new Result() { Code = -1, Msg = "修改失败！" };
                             }
+
+                            int ispay = 0;
+                            if (dto.PayDId == 72) ispay = 1;
+
+
                             int CTable = await _sqlSugar.Updateable<Grp_CreditCardPayment>()
                                                         .Where(a => a.Id == grp_CreditCardPayment.Id)
                                                         .SetColumns(a => new Grp_CreditCardPayment
                                                         {
                                                             PayDId = dto.PayDId,
+                                                            IsPay = ispay,
                                                             PayMoney = grp_Decrease.Price,
                                                             PaymentCurrency = grp_Decrease.Currency,
                                                             Payee = dto.Payee,

OASystem/OASystem.Infrastructure/Repositories/Groups/EnterExitCostRepository.cs

@@ -412,21 +412,26 @@ namespace OASystem.Infrastructure.Repositories.Groups
 
         /// <summary>
         /// 一键清空
-        /// 删除主表数据 isdel = 0
+        /// 删除主表数据 Update
         /// 删除子表数据 delete
         /// </summary>
         /// <param name="id"></param>
         /// <param name="diid"></param>
         /// <returns></returns>
-        public async Task<Result> _OneClickClear(int id, int diid)
+        public async Task<Result> _OneClickClear(int id, int diid,int userId)
         {
             Result result = new Result() { Code = -1, Msg = "操作成功!" };
 
             if (id < 1) return result = new Result() { Code = -1, Msg = "请传入有效的Id参数!" };
-
             if (diid < 1) return result = new Result() { Code = -1, Msg = "请传入有效的Id参数!" };
+            if (userId < 1) return result = new Result() { Code = -1, Msg = "请传入有效的UserId参数!" };
 
             BeginTran();
+            Grp_EnterExitCost _EnterExitCost = new Grp_EnterExitCost() { 
+                Id = id
+            
+            };
+
 
 
             CommitTran();

OASystem/OASystem.Infrastructure/Repositories/Groups/HotelPriceRepository.cs

@@ -446,10 +446,8 @@ namespace OASystem.Infrastructure.Repositories.Groups
                 c.CTable = 76;
                 c.CId = id;
                 c.IsAuditGM = 0;
-                if (c.PayDId == 72)
-                {
-                    c.IsPay = 1;
-                }
+                if (c.PayDId == 72) c.IsPay = 1;
+                else c.IsPay = 0;
                 c.RMBPrice = c.PayMoney;
                 c.DayRate = 1;
                 Grp_TeamRate _TeamRate = _sqlSugar.Queryable<Grp_TeamRate>().First(a => a.DiId == dto.DiId && a.IsDel == 0 && a.CTable == 76);
@@ -551,9 +549,13 @@ namespace OASystem.Infrastructure.Repositories.Groups
                     });
                     if (res)
                     {
+                        int ispay = 0;
+                        if (dto.PayDId == 72) ispay = 1;
+
                         int CTable = await _sqlSugar.Updateable<Grp_CreditCardPayment>().Where(a => a.CId == hotelPrice.Id && a.CTable == 76).SetColumns(a => new Grp_CreditCardPayment
                         {
                             PayDId = dto.PayDId,
+                            IsPay=ispay,
                             PayMoney = c.PayMoney,
                             PaymentCurrency = c.PaymentCurrency,
                             Payee = c.Payee,
@@ -827,7 +829,8 @@ namespace OASystem.Infrastructure.Repositories.Groups
                 if (_dto.PayDId == 72) //刷卡 默认已支付
                 {
                     _CreditCardPayment.IsPay = 1;
-                }
+                }else _CreditCardPayment.IsPay = 0;
+
                 _CreditCardPayment.CreateUserId = _dto.UserId;
                 _CreditCardPayment.DIId = _dto.DiId;
                 _CreditCardPayment.CTable = 76;

OASystem/OASystem.Infrastructure/Repositories/Groups/InvitationOfficialActivitiesRepository.cs

@@ -99,9 +99,6 @@ namespace OASystem.Infrastructure.Repositories.Groups
                         result = new Result() { Code = 0, Msg = "暂无数据！", Data = invitation };
                     }
                 }
-                
-                
-                
             }
             catch (Exception)
             {
@@ -338,10 +335,8 @@ Order By i.id  Desc ", sqlWhere);
 
                             Grp_CreditCardPayment C = new Grp_CreditCardPayment();
                             C.PayDId = dto.PayDId;
-                            if (C.PayDId == 72)
-                            {
-                                C.IsPay = 1;
-                            }
+                            if (C.PayDId == 72) C.IsPay = 1;
+                            else C.IsPay = 0;
 
                             C.ConsumptionPatterns = dto.ConsumptionPatterns;
                             C.ConsumptionDate = dto.ConsumptionDate;
@@ -367,7 +362,7 @@ Order By i.id  Desc ", sqlWhere);
                             C.IsAuditGM = 0;
                             C.AuditGMOperate = 0;
                             C.AuditGMDate = "";
-                            C.IsPay = 0;
+                            //C.IsPay = 0;
                             C.DIId = dto.DiId;
                             C.CId = id;
                             C.CTable = 81;
@@ -475,10 +470,8 @@ Order By i.id  Desc ", sqlWhere);
                         Grp_CreditCardPayment grp_CreditCardPayment = _sqlSugar.Queryable<Grp_CreditCardPayment>().First(a => a.CId == grp_Invitation.Id && a.CTable == 81 && a.IsDel == 0);
                         if (grp_CreditCardPayment != null)
                         {
-                            if (dto.PayDId == 72)
-                            {
-                                grp_CreditCardPayment.IsPay = 1;
-                            }
+                            if (dto.PayDId == 72) grp_CreditCardPayment.IsPay = 1;
+                            else grp_CreditCardPayment.IsPay = 0;
 
                             grp_CreditCardPayment.PayMoney = dto.PayMoney;
                             grp_CreditCardPayment.PaymentCurrency = dto.PaymentCurrency;

OASystem/OASystem.Infrastructure/Repositories/Groups/VisaPriceRepository.cs

@@ -336,7 +336,7 @@ From Grp_VisaInfo as v With(Nolock) left Join Grp_CreditCardPayment as c With(No
                 if (c.PayDId == 72)
                 {
                     c.IsPay = 1;
-                }
+                }else c.IsPay = 0;
                 c.RMBPrice = c.PayMoney;
                 c.DayRate = 1;
                 Grp_TeamRate _TeamRate = _sqlSugar.Queryable<Grp_TeamRate>().First(a => a.DiId == dto.DiId && a.IsDel == 0 && a.CTable == 80);
@@ -409,6 +409,7 @@ From Grp_VisaInfo as v With(Nolock) left Join Grp_CreditCardPayment as c With(No
                         int CTable = await _sqlSugar.Updateable<Grp_CreditCardPayment>().Where(a => a.CId == grp_Visa1.Id && a.CTable == 80).SetColumns(a => new Grp_CreditCardPayment
                         {
                             PayDId = dto.PayDId,
+                            IsPay = c.IsPay,
                             PayMoney = c.PayMoney,
                             PaymentCurrency = c.PaymentCurrency,
                             Payee = c.Payee,