1

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -3024,17 +3024,35 @@ namespace OASystem.API.Controllers
             try
             {
                 _sqlSugar.BeginTran();
-                var res = await _InvitationOfficialActivitiesRep.SoftDeleteByIdAsync<Grp_InvitationOfficialActivities>(dto.Id.ToString(), dto.DeleteUserId);
-                if (res)
-                {
-                    var result = _sqlSugar.Updateable<Grp_CreditCardPayment>().Where(a => a.CId == dto.Id && a.CTable == 81).SetColumns(a => new Grp_CreditCardPayment()
+                var res1 = _sqlSugar.Updateable<Grp_InvitationOfficialActivities>()
+                                    .SetColumns(it => new Grp_InvitationOfficialActivities()
+                                    {
+                                        IsDel = 1,
+                                        DeleteUserId = dto.DeleteUserId,
+                                        DeleteTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")
+                                    })
+                                    .Where(it => it.Id == dto.Id)
+                                    .ExecuteCommand();
+                if (res1 > 0)
+                {
+                    int _diId = 0;
+                    var _ioaInfo = _sqlSugar.Queryable<Grp_InvitationOfficialActivities>().Where(it => it.Id == dto.Id).First();
+                    if (_ioaInfo!=null)
                     {
-                        IsDel = 1,
-                        DeleteUserId = dto.DeleteUserId,
-                        DeleteTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")
-                    }).ExecuteCommand();
+                        _diId = _ioaInfo.DiId;
+                    }
 
-                    if (result > 0)
+                    var res2 = _sqlSugar.Updateable<Grp_CreditCardPayment>()
+                                          .SetColumns(a => new Grp_CreditCardPayment()
+                                          {
+                                              IsDel = 1,
+                                              DeleteUserId = dto.DeleteUserId,
+                                              DeleteTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")
+                                          })
+                                          .Where(a => a.CId == dto.Id && a.DIId == _diId && a.CTable == 81 )
+                                          .ExecuteCommand();
+
+                    if (res2 > 0)
                     {
                         _sqlSugar.CommitTran();
                         return Ok(JsonView(true, "删除成功！"));
@@ -3045,7 +3063,6 @@ namespace OASystem.API.Controllers
             }
             catch (Exception ex)
             {
-
                 _sqlSugar.RollbackTran();
                 return Ok(JsonView(false, ex.Message));
             }

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

@@ -319,6 +319,11 @@ namespace OASystem.Infrastructure.Repositories.Groups
 
                             Grp_CreditCardPayment C = new Grp_CreditCardPayment();
                             C.PayDId = dto.PayDId;
+                            if (C.PayDId == 72)
+                            {
+                                C.IsPay = 1;
+                            }
+
                             C.ConsumptionPatterns = dto.ConsumptionPatterns;
                             C.ConsumptionDate = dto.ConsumptionDate;
                             C.CTDId = dto.CTDId;
@@ -451,6 +456,11 @@ namespace OASystem.Infrastructure.Repositories.Groups
                         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;
+                            }
+
                             grp_CreditCardPayment.PayMoney = dto.PayMoney;
                             grp_CreditCardPayment.PaymentCurrency = dto.PaymentCurrency;
                             grp_CreditCardPayment.Payee = dto.Payee;
@@ -480,6 +490,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                                                             ConsumptionPatterns = dto.ConsumptionPatterns,
                                                             ConsumptionDate = dto.ConsumptionDate,
                                                             PayDId = dto.PayDId,
+                                                            IsPay = grp_CreditCardPayment.IsPay,
                                                             CTDId = dto.CTDId,
                                                             BankNo = dto.BankNo,
                                                             CardholderName = dto.CardholderName,