From fdefadb9db4548e3bdb86c7145ea26b8125ef80f Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Wed, 10 Apr 2024 18:24:51 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E9=87=91=E9=A2=9D=E5=B0=8F=E4=BA=8E?=
 =?UTF-8?q?=E7=AD=89=E4=BA=8E=E9=9B=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Order/Controllers/BalancesController.cs   | 13 --------
 .../Order/Request/BalanceSupplementRequest.cs |  5 +--
 .../Order/Services/IBalanceService.cs         |  2 --
 .../Services/Implements/BalanceService.cs     | 32 +------------------
 4 files changed, 4 insertions(+), 48 deletions(-)

diff --git a/Src/Dlhis.Canteen/Order/Controllers/BalancesController.cs b/Src/Dlhis.Canteen/Order/Controllers/BalancesController.cs
index df02e776..84e5bd40 100644
--- a/Src/Dlhis.Canteen/Order/Controllers/BalancesController.cs
+++ b/Src/Dlhis.Canteen/Order/Controllers/BalancesController.cs
@@ -97,19 +97,6 @@ public class BalancesController : ControllerBase
         return await _balanceService.GetPageByUserAsync(request);
     }
 
-    /// <summary>
-    /// 作废消费明细
-    /// </summary>
-    /// <param name="request"></param>
-    /// <returns></returns>
-    [Authorize(Roles = "admin,tenant-admin")]
-    [HttpPost("obsoluteOutRecord")]
-    [Transactional]
-    public async Task ObsoluteAsync(BalanceRecordObsoluteRequest request)
-    {
-        await _balanceService.ObsoluteAsync(request);
-    }
-
     /// <summary>
     /// 根据成本中心
     /// </summary>
diff --git a/Src/Dlhis.Canteen/Order/Request/BalanceSupplementRequest.cs b/Src/Dlhis.Canteen/Order/Request/BalanceSupplementRequest.cs
index 1a2351b9..1309dbe2 100644
--- a/Src/Dlhis.Canteen/Order/Request/BalanceSupplementRequest.cs
+++ b/Src/Dlhis.Canteen/Order/Request/BalanceSupplementRequest.cs
@@ -19,13 +19,14 @@ public class BalanceSupplementRequest : IValidatableObject
     /// <summary>
     /// 补金额数
     /// </summary>
+
     public decimal Amount { get; set; }
 
     public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
     {
-        if (Amount == 0)
+        if (Amount > 0)
         {
-            yield return new ValidationResult("金额不可为0元", new[] { nameof(Amount) });
+            yield return new ValidationResult("金额有误", new[] { nameof(Amount) });
         }
     }
 }
diff --git a/Src/Dlhis.Canteen/Order/Services/IBalanceService.cs b/Src/Dlhis.Canteen/Order/Services/IBalanceService.cs
index e15573a5..25b5e6a8 100644
--- a/Src/Dlhis.Canteen/Order/Services/IBalanceService.cs
+++ b/Src/Dlhis.Canteen/Order/Services/IBalanceService.cs
@@ -15,8 +15,6 @@ public interface IBalanceService : IScopeDependency
 
     Task SupplementBalanceAsync(BalanceSupplementRequest request);
 
-    Task ObsoluteAsync(BalanceRecordObsoluteRequest request);
-
     Task<Pagination<BalanceRecordCostIdResponse>> RecordByCostIdAsync(BalanceRecordPageByCostIdRequest request);
 
     Task<Pagination<BalanceRecordDetailPageResponse>> RecordPageDetailsAsync(BalanceRecordPageDetailRequest request);
diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs
index 24578a4c..83cdc73c 100644
--- a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs
+++ b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs
@@ -177,7 +177,6 @@ public class BalanceService : IBalanceService
         newBalanceRecord.Remark = balanceInfo.No + ":" + request.Reason;
         newBalanceRecord.Status = BalanceRecordStatusEnumType.Valid;
 
-
         await _dbContext.Client.Ado.BeginTranAsync();
         try
         {
@@ -203,7 +202,7 @@ public class BalanceService : IBalanceService
                        .SetColumns(x => x.ModifiedTime == DateTime.Now)
                        .Where(x => x.UserCode == balanceInfo.UserCode && x.Version == gainfoMeal.Version)
                        .ExecuteCommandThrowVersionAsync();
-        });
+        }, 10);
     }
 
 
@@ -586,35 +585,6 @@ public class BalanceService : IBalanceService
         };
     }
 
-    public async Task ObsoluteAsync(BalanceRecordObsoluteRequest request)
-    {
-        var balanceRecord = await _dbContext.Queryable<BalanceRecordEntity>().Where(x => x.Id == request.Id).SingleAsync();
-        balanceRecord.ThrowIfNull("记录不存在");
-
-        (balanceRecord.Type != BalanceRecordTypeEnumType.Out).ThrowIfTrue("非消费记录,无法操作");
-
-        balanceRecord.Status = BalanceRecordStatusEnumType.Obsolute;
-        balanceRecord.Remark = request.Reason;
-
-        await CommonHelper.RetryAsync(async () =>
-        {
-            //重算金额
-            var canteenUser = await _dbContext.Queryable<GainfoMealEntity>().Where(x => x.UserNo == balanceRecord.UserNo).SingleAsync();
-
-            //金额 +
-            canteenUser.Balance += Math.Abs(balanceRecord.Amount);
-
-            await _dbContext.Updateable<GainfoMealEntity>()
-                        .SetColumns(x => x.Balance == canteenUser.Balance)
-                        .SetColumns(x => x.Version == x.Version + 1)
-                        .SetColumns(x => x.ModifiedTime == DateTime.Now)
-                        .Where(x => x.UserNo == balanceRecord.UserNo && x.Version == canteenUser.Version)
-                        .ExecuteCommandThrowVersionAsync();
-
-            await _dbContext.UpdateAsync(balanceRecord);
-
-        }, 5);
-    }
 
     public async Task<ConsumeNumberResponse> GetConsumeNumberAsync()
     {