feat(web):查询油罐详情接口更换为当查询的油罐id为-1时，只返回可关联油品，其余数值为null

HengshanPaymentTerminal/HengshanPayTermHandler.cs

@@ -398,7 +398,7 @@ namespace HengshanPaymentTerminal
 
         public async Task Process(IContext<byte[], CardMessageBase> context)
         {
-
+            
         }
 
         private void CheckStatus(CheckCmdRequest request)

src/FccLife.Web/Controller/TankController.cs

@@ -30,8 +30,7 @@ namespace FccLite.Web.Controller
         [HttpGet("getDetailsTankInfo")]
         public async Task<IActionResult> GetDetailsTankInfo(long id)
         {
-            Domain.FccTankInfo.Output.DetailsTankInfoOutput? detailsTankInfoOutput = await _tankInfoService.GetDetailsTankByTankIdAsync(id);
-            if(detailsTankInfoOutput == null) return Ok("查找不到该油罐详情");
+            Domain.FccTankInfo.Output.DetailsTankInfoOutput detailsTankInfoOutput = await _tankInfoService.GetDetailsTankByTankIdAsync(id);
             return Ok(detailsTankInfoOutput);
         }
 

src/FccLife.Web/Domain/FccTankInfo/Output/DetailsTankInfoOutput.cs

@@ -5,12 +5,12 @@
         /// <summary>
         /// 油罐id
         /// </summary>
-        public long Id { get; set; }
+        public long? Id { get; set; }
 
         /// <summary>
         /// 油罐号
         /// </summary>
-        public int Number { get; set; }
+        public int? Number { get; set; }
 
         /// <summary>
         /// 当前关联的油品id
@@ -25,7 +25,7 @@
         /// <summary>
         /// 油罐容量
         /// </summary>
-        public decimal Capacity { get; set; }
+        public decimal? Capacity { get; set; }
 
         /// <summary>
         /// 可关联的油品

src/FccLife.Web/Services/FccTankInfo/ITankInfoService.cs

@@ -13,11 +13,11 @@ namespace FccLite.Web.Services.FccTankInfo
         Task<List<BaseTankInfoOutput>> GetBaseTankByStationIdAsync(long stationId);
 
         /// <summary>
-        /// 通过油罐id获取油罐详情信息
+        /// 通过油罐id获取油罐详情信息,油罐id为 -1 只返回当前可关联的油品
         /// </summary>
         /// <param name="tankId">油罐id</param>
         /// <returns></returns>
-        Task<DetailsTankInfoOutput?> GetDetailsTankByTankIdAsync(long tankId);
+        Task<DetailsTankInfoOutput> GetDetailsTankByTankIdAsync(long tankId);
 
         /// <summary>
         /// 增加油罐

src/FccLife.Web/Services/FccTankInfo/TankInfoServiceImpl.cs

@@ -29,18 +29,15 @@ namespace FccLite.Web.Services.FccTankInfo
         }
 
         /// <summary>
-        /// 通过油罐id获取油罐详情信息
+        /// 通过油罐id获取油罐详情信息,油罐id为 -1 只返回当前可关联的油品
         /// </summary>
         /// <param name="tankId">油罐id</param>
         /// <returns></returns>
-        public async Task<DetailsTankInfoOutput?> GetDetailsTankByTankIdAsync(long tankId)
+        public async Task<DetailsTankInfoOutput> GetDetailsTankByTankIdAsync(long tankId)
         {
-            Domain.FccTankInfo.FccTankInfo? fccTankInfo = await _tankReposity.GetDetailsTankByTankIdAsync(tankId);
-            if (fccTankInfo == null)
-            {
-                Logger.Info($"find tank info with id : {tankId} for details,result is null");
-                return null;
-            }
+            Domain.FccTankInfo.FccTankInfo? fccTankInfo = null;
+            if (tankId > 0) fccTankInfo = await _tankReposity.GetDetailsTankByTankIdAsync(tankId);
+            Logger.Info($"find tank info with id : {tankId} for details,can got result? {fccTankInfo != null} ");
 
             List<Domain.FccOilInfo.FccOilInfo> oilInfos = await _oiilInfoReposity.GetOilInfo();
             List<DetailsTankInfoOutput.RelatableOil> relatableOils = oilInfos.Select(info => new DetailsTankInfoOutput.RelatableOil()
@@ -52,11 +49,11 @@ namespace FccLite.Web.Services.FccTankInfo
 
             return new DetailsTankInfoOutput()
             {
-                Id = fccTankInfo.Id,
-                Number = fccTankInfo.Number,
-                AssociatedOilId = fccTankInfo.OilId,
-                AssociatedOilName = fccTankInfo.OilName,
-                Capacity = fccTankInfo.Capacity,
+                Id = fccTankInfo?.Id,
+                Number = fccTankInfo?.Number,
+                AssociatedOilId = fccTankInfo?.OilId,
+                AssociatedOilName = fccTankInfo?.OilName,
+                Capacity = fccTankInfo?.Capacity,
                 RelatableOils = relatableOils
             };
         }