换电订单

Entity/Api/Req/AddSwapOrderReq.cs

@@ -113,7 +113,9 @@
         /// </summary>
         public DateTime? UpdatedTime {get;set;} = DateTime.Now;
 
-
+        /// <summary>
-
+        /// 云平台订单号
+        /// </summary>
+        public string? CloudSn { get;set;}
     }
 }

Entity/Api/Req/ModifySwapOrderReq.cs

@@ -120,6 +120,10 @@ namespace Entity.Api.Req
         /// </summary>
         public DateTime? UpdatedTime { get; set; } = DateTime.Now;
 
+        /// <summary>
+        /// 云平台订单号
+        /// </summary>
+        public string? CloudSn { get; set; }
 
     }
 }

Entity/Api/Resp/SwapOrderBatteryResp.cs

@@ -1,10 +1,13 @@
-namespace Entity.Api.Resp
+using SqlSugar;
+
+namespace Entity.Api.Resp
 {
     ///<summary>
     ///换电订单电池
     ///</summary>
     public  class SwapOrderBatteryResp
     {
+
         /// <summary>
         /// Desc:id
         /// Default:
@@ -17,14 +20,14 @@
         /// Default:
         /// Nullable:True
         /// </summary>
-           public string SwapOrderSn {get;set;}
+        public string? SwapOrderSn { get; set; }
 
         /// <summary>
         /// Desc:亏电包编码
         /// Default:
         /// Nullable:True
         /// </summary>
-           public string DownBatteryNo {get;set;}
+        public string? DownBatteryNo { get; set; }
 
         /// <summary>
         /// Desc:亏电包soc
@@ -108,7 +111,7 @@
         /// Default:
         /// Nullable:True
         /// </summary>
-           public string UpBatteryNo {get;set;}
+        public string? UpBatteryNo { get; set; }
 
         /// <summary>
         /// Desc:满电包soc
@@ -178,7 +181,7 @@
         /// Default:
         /// Nullable:True
         /// </summary>
-           public string CreatedBy {get;set;}
+        public string? CreatedBy { get; set; }
 
         /// <summary>
         /// Desc:创建时间
@@ -192,7 +195,7 @@
         /// Default:
         /// Nullable:True
         /// </summary>
-           public string UpdatedBy {get;set;}
+        public string ?UpdatedBy { get; set; }
 
         /// <summary>
         /// Desc:更新时间

Entity/Api/Resp/SwapOrderResp.cs

@@ -120,11 +120,14 @@ namespace Entity.Api.Resp
            /// Nullable:True
            /// </summary>
            public DateTime? UpdatedTime {get;set;}
-
         /// <summary>
-           /// 换电电池
+        /// 云平台订单号
         /// </summary>
-           public List<SwapOrderBatteryResp> BatteryList{get;set;}
+        public string? CloudSn { get; set; }
+        ///// <summary>
+        ///// 换电电池
+        ///// </summary>
+        //public List<SwapOrderBatteryResp> BatteryList{get;set;}
            
            /// <summary>
            /// 换电小步

Entity/DbModel/Station/SwapOrderBattery.cs

@@ -11,10 +11,7 @@ namespace Entity.DbModel.Station
     [SugarTable("swap_order_battery")]
     public partial class SwapOrderBattery
     {
-           public SwapOrderBattery(){
 
-
-           }
         /// <summary>
         /// Desc:id
         /// Default:
@@ -29,7 +26,7 @@ namespace Entity.DbModel.Station
         /// Nullable:True
         /// </summary>
         [SugarColumn(ColumnName = "swap_order_sn")]
-           public string SwapOrderSn {get;set;}
+        public string? SwapOrderSn { get; set; }
 
         /// <summary>
         /// Desc:亏电包编码
@@ -37,7 +34,7 @@ namespace Entity.DbModel.Station
         /// Nullable:True
         /// </summary>
         [SugarColumn(ColumnName = "down_battery_no")]
-           public string DownBatteryNo {get;set;}
+        public string? DownBatteryNo { get; set; }
 
         /// <summary>
         /// Desc:亏电包soc
@@ -133,7 +130,7 @@ namespace Entity.DbModel.Station
         /// Nullable:True
         /// </summary>
         [SugarColumn(ColumnName = "up_battery_no")]
-           public string UpBatteryNo {get;set;}
+        public string? UpBatteryNo { get; set; }
 
         /// <summary>
         /// Desc:满电包soc
@@ -213,7 +210,7 @@ namespace Entity.DbModel.Station
         /// Nullable:True
         /// </summary>
         [SugarColumn(ColumnName = "created_by")]
-           public string CreatedBy {get;set;}
+        public string? CreatedBy { get; set; }
 
         /// <summary>
         /// Desc:创建时间
@@ -229,7 +226,7 @@ namespace Entity.DbModel.Station
         /// Nullable:True
         /// </summary>
         [SugarColumn(ColumnName = "updated_by")]
-           public string UpdatedBy {get;set;}
+        public string? UpdatedBy { get; set; }
 
         /// <summary>
         /// Desc:更新时间

Service/Station/SwapOrderService.cs

@@ -74,6 +74,15 @@ public class SwapOrderService : BaseServices<SwapOrder>
         #endregion
 
         //²éѯ
+
+        //var swapOrderResp = PageResult<SwapOrderResp>.ConvertPage(swapOrderRepository.QueryIPageByCause(swapOrder, where));
+        //for (int i = 0; i < swapOrderResp.Rows.Count; i++)
+        //{
+        //    swapOrderResp.Rows[0].BatteryList.AddRange()
+        //}
+        
+        //List<SwapOrderBatteryResp> BatteryList = new List<SwapOrderBatteryResp>();
+        //List<SwapOrderStepResp> StepList = new List<SwapOrderStepResp>();
         return PageResult<SwapOrderResp>.ConvertPage(swapOrderRepository.QueryIPageByCause(swapOrder, where));
 
 

WebStarter/Controllers/SwapOrderController.cs

@@ -4,7 +4,9 @@ using Entity.Api.Resp;
 using Entity.DbModel.Station;
 using HybirdFrameworkCore.Entity;
 using Microsoft.AspNetCore.Mvc;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.RefAndLookup;
 using Service.Station;
+using System.Collections.Generic;
 
 namespace WebStarter.Controllers;
 
@@ -16,10 +18,14 @@ namespace WebStarter.Controllers;
 public class SwapOrderController : ControllerBase
 {
     private readonly SwapOrderService swapOrderService;
+    private readonly SwapOrderBatteryService swapOrderBatteryService;
+    private readonly SwapOrderStepService swapOrderStepService;
     
-    public SwapOrderController(SwapOrderService swapOrderService)
+    public SwapOrderController(SwapOrderService swapOrderService, SwapOrderBatteryService swapOrderBatteryService, SwapOrderStepService swapOrderStepService)
     {
         this.swapOrderService = swapOrderService;
+        this.swapOrderBatteryService = swapOrderBatteryService;
+        this.swapOrderStepService = swapOrderStepService;
     }
     /// <summary>
     /// 查询分页数据
@@ -28,8 +34,46 @@ public class SwapOrderController : ControllerBase
     [HttpPost("QueryPage")]
     public async Task<Result<PageResult<SwapOrderResp>>> QueryPage([FromBody] QuerySwapOrderPageReq req)
     {
+        var swapOrderResp = swapOrderService.QuerySwapOrder(req);
 
-        return Result<PageResult<SwapOrderResp>>.Success(swapOrderService.QuerySwapOrder(req));
+        //获取所有订单号
+        var orderSns = swapOrderResp.Rows.Select(row => row.Sn).ToList();
+
+        //电池不要了
+        ////查询订单电池数据
+        //List< SwapOrderBattery> batteryList = swapOrderBatteryService.QueryListByClause(u => orderSns.Contains(u.SwapOrderSn));
+
+        ////映射
+        //var config = new MapperConfiguration(cfg => cfg.CreateMap<SwapOrderBatteryResp,SwapOrderBattery > ().ReverseMap());
+        //IMapper mapper = config.CreateMapper();
+        //List<SwapOrderBatteryResp> swapOrderBattery = mapper.Map<List<SwapOrderBatteryResp>>(batteryList);
+
+
+        ////将电池数据添加到换电订单数据中
+        //for (int i = 0; i < swapOrderResp.Rows.Count; i++)
+        //{
+        //    swapOrderResp.Rows[i].BatteryList = new List<SwapOrderBatteryResp>();
+        //    swapOrderResp.Rows[i].BatteryList.AddRange(swapOrderBattery.Where(battery => battery.SwapOrderSn == swapOrderResp.Rows[i].Sn).ToList());
+        //}
+
+        //查询订单步序数据
+        var stepList = swapOrderStepService.QueryListByClause(u => orderSns.Contains(u.SwapOrderSn));
+        stepList = stepList.OrderBy(s => s.Sort).ToList();
+
+        //映射
+        var config2 = new MapperConfiguration(cfg => cfg.CreateMap<SwapOrderStep,SwapOrderStepResp>().ReverseMap());
+        IMapper mapper2 = config2.CreateMapper();
+        List<SwapOrderStepResp> swapOrderStep = mapper2.Map<List<SwapOrderStepResp>>(stepList);
+
+
+        //将步序数据添加到换电订单数据中
+        for (int i = 0; i < swapOrderResp.Rows.Count; i++)
+        {
+            swapOrderResp.Rows[i].StepList = new List<SwapOrderStepResp>();
+            swapOrderResp.Rows[i].StepList.AddRange(swapOrderStep.Where(step => step.SwapOrderSn == swapOrderResp.Rows[i].Sn).ToList());
+        }
+
+        return Result<PageResult<SwapOrderResp>>.Success(swapOrderResp);
     }
     /// <summary>
     /// 新增
@@ -39,10 +83,17 @@ public class SwapOrderController : ControllerBase
     public async Task<Result<bool>> Add([FromBody] AddSwapOrderReq req)
     {
         //映射数据
-        var config = new MapperConfiguration(cfg => cfg.CreateMap<SwapOrder, ModifySwapOrderReq>().ReverseMap());
+        var config = new MapperConfiguration(cfg => cfg.CreateMap<SwapOrder, AddSwapOrderReq>().ReverseMap());
         IMapper mapper = config.CreateMapper();
         SwapOrder swapOrder = mapper.Map<SwapOrder>(req);
 
+        var swap = swapOrderService.QueryByClause(u => u.Sn == req.Sn);
+        if (swap != null)
+        {
+            return Result<bool>.Fail("新增失败!订单号重复");
+        }
+        else
+        {
             if (swapOrderService.Insert(swapOrder) != 0)
             {
                 return Result<bool>.Success("新增成功");
@@ -51,6 +102,10 @@ public class SwapOrderController : ControllerBase
             {
                 return Result<bool>.Fail("新增失败");
             }
+
+        }
+
+        
     }
 
     /// <summary>