From b51b93f2734c89442c8a3a0e9601a30f0ddfe693 Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Tue, 16 Apr 2024 12:36:21 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E4=BC=98=E5=8C=96=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Device/Response/DevicePageResponse.cs     |  5 +++--
 .../Services/Implements/BalanceService.cs     | 21 +++++++++++--------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/Src/Dlhis.Basic/Device/Response/DevicePageResponse.cs b/Src/Dlhis.Basic/Device/Response/DevicePageResponse.cs
index 5543715e..bf133ec7 100644
--- a/Src/Dlhis.Basic/Device/Response/DevicePageResponse.cs
+++ b/Src/Dlhis.Basic/Device/Response/DevicePageResponse.cs
@@ -35,13 +35,14 @@ public class DevicePageResponse
     /// <summary>
     /// 设备功能 DeviceFuncEnumType
     /// </summary>
-    public List<DeviceFuncEnumType> Funcs
+    public List<string> Funcs
     {
         get
         {
             if (FuncsStr.IsEmpty()) FuncsStr = "[]";
 
-            return FuncsStr.ToObject<List<DeviceFuncEnumType>>();
+            var func = FuncsStr.ToObject<List<DeviceFuncEnumType>>();
+            return func.Select(x => x.GetDescription()).ToList();
         }
     }
 
diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs
index 7c2928ae..dac5dba0 100644
--- a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs
+++ b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs
@@ -169,19 +169,22 @@ public class BalanceService : IBalanceService
         balanceInfo.Status = BalanceRecordStatusEnumType.Obsolute;
         balanceInfo.Remark += request.Reason;
 
-
-        var newBalanceRecord = balanceInfo.Adapt<BalanceRecordEntity>();
-        newBalanceRecord.Id = 0;
-        newBalanceRecord.No = SnowFlakeHelper.Instance.NextId().ToString();
-        newBalanceRecord.Amount = request.Amount;
-        newBalanceRecord.Remark = balanceInfo.No + ":" + request.Reason;
-        newBalanceRecord.Status = BalanceRecordStatusEnumType.Valid;
-
         await _dbContext.Client.Ado.BeginTranAsync();
         try
         {
             await _dbContext.UpdateAsync(balanceInfo);
-            await _dbContext.InsertAsync(newBalanceRecord);
+
+            //不为空则插入记录
+            if (request.Amount != 0)
+            {
+                var newBalanceRecord = balanceInfo.Adapt<BalanceRecordEntity>();
+                newBalanceRecord.Id = 0;
+                newBalanceRecord.No = SnowFlakeHelper.Instance.NextId().ToString();
+                newBalanceRecord.Amount = request.Amount;
+                newBalanceRecord.Remark = balanceInfo.No + ":" + request.Reason;
+                newBalanceRecord.Status = BalanceRecordStatusEnumType.Valid;
+                await _dbContext.InsertAsync(newBalanceRecord);
+            }
 
             await _dbContext.Client.Ado.CommitTranAsync();
         }