Browse Source

收款退还
删除更改

leiy 1 year ago
parent
commit
e720953d46

+ 4 - 4
OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -1225,7 +1225,7 @@ namespace OASystem.API.Controllers
                                 _detail.PriceNameContent = gdpRes.PriceName;
                             }
                             break;
-                        case 285://收款退还Fin_PaymentRefundAndOtherMoney
+                        case 285://收款退还 
                             Fin_PaymentRefundAndOtherMoney refundAndOtherMoney = _PaymentRefundAndOtherMoneys.Where(s => s.Id == entity.CId).FirstOrDefault();
                             if (refundAndOtherMoney != null)
                             {
@@ -1431,7 +1431,7 @@ namespace OASystem.API.Controllers
                 {
                     rst = -1;
                     _groupRepository.RollbackTran();
-                    return Ok(JsonView(false, "保存失败并回滚!"));
+                    return Ok(JsonView(false, "操作失败并回滚!"));
                 }
                 else
                 {
@@ -1440,10 +1440,10 @@ namespace OASystem.API.Controllers
             _groupRepository.CommitTran();
             if (rst == 0)
             {
-                return Ok(JsonView(true, "保存成功!"));
+                return Ok(JsonView(true, "操作成功!"));
             }
 
-            return Ok(JsonView(false, "保存失败!"));
+            return Ok(JsonView(false, "操作失败!"));
         }
 
         #endregion

+ 3 - 2
OASystem/OASystem.Infrastructure/Repositories/Financial/PaymentRefundAndOtherMoneyRepository.cs

@@ -98,7 +98,8 @@ namespace OASystem.Infrastructure.Repositories.Financial
             if (_PaymentRefundAndOtherMoneyInfo != null)
             {
                 Grp_CreditCardPayment _CreditCardPayment = new Grp_CreditCardPayment() {
-                    Id = _PaymentRefundAndOtherMoneyInfo.Id,
+                    CId = _PaymentRefundAndOtherMoneyInfo.Id,
+                    DIId = _PaymentRefundAndOtherMoneyInfo.DiId,
                     DeleteUserId = dto.UserId,
                     DeleteTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
                     IsDel = 1
@@ -107,7 +108,7 @@ namespace OASystem.Infrastructure.Repositories.Financial
 
                 var ccp_del = await _sqlSugar.Updateable(_CreditCardPayment)
                                      .UpdateColumns(it => new { it.DeleteUserId, it.DeleteTime, it.IsDel })
-                                     .WhereColumns(it => new { it.Id })
+                                     .WhereColumns(it => new { it.CId,it.DIId })
                                      .ExecuteCommandAsync();
             }