diff --git a/Src/Dlhis.Basic/Places/Controllers/BusinessPlacesController.cs b/Src/Dlhis.Basic/Places/Controllers/BusinessPlacesController.cs index 46a23303..dc4acda4 100644 --- a/Src/Dlhis.Basic/Places/Controllers/BusinessPlacesController.cs +++ b/Src/Dlhis.Basic/Places/Controllers/BusinessPlacesController.cs @@ -56,7 +56,7 @@ public class BusinessPlacesController : ControllerBase [IgnoreTenant] public async Task> GetAllList(string tenant) { - return await _businessPlaceService.GetOpenedListAsync(); + return await _businessPlaceService.GetOpenedListAsync(null, tenant); } /// diff --git a/Src/Dlhis.Canteen/Order/Response/OrderAggregationResponse.cs b/Src/Dlhis.Canteen/Order/Response/OrderAggregationResponse.cs index a1cb257b..1fb6cc24 100644 --- a/Src/Dlhis.Canteen/Order/Response/OrderAggregationResponse.cs +++ b/Src/Dlhis.Canteen/Order/Response/OrderAggregationResponse.cs @@ -48,4 +48,9 @@ public class OrderAggregationResponse return 0; } } + + /// + /// 订单时间 + /// + public DateTime CreateTime { get; set; } } diff --git a/Src/Dlhis.Canteen/Order/Response/OrderBookingResponse.cs b/Src/Dlhis.Canteen/Order/Response/OrderBookingResponse.cs index 419d1fc9..b167b69f 100644 --- a/Src/Dlhis.Canteen/Order/Response/OrderBookingResponse.cs +++ b/Src/Dlhis.Canteen/Order/Response/OrderBookingResponse.cs @@ -31,4 +31,9 @@ public class OrderBookingResponse /// /// public string UserNo { get; set; } + + /// + /// 订单时间 + /// + public DateTime CreateTime { get; set; } } diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs index 821b6610..b3f38f6f 100644 --- a/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs +++ b/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs @@ -301,6 +301,7 @@ public class OrderService : BaseOrderService, IOrderService { No = x.No, BusinessPlaceName = bplace.Name, + CreateTime = x.CreateTime }) .ToPageListAsync(page); @@ -317,7 +318,7 @@ public class OrderService : BaseOrderService, IOrderService Name = d.Name, ImageUrl = d.ImageUrl, Number = x.Number, - Price = x.Price + Price = x.Price, }) .ToListAsync(); diff --git a/Src/Dlhis.Canteen/Program.cs b/Src/Dlhis.Canteen/Program.cs index b9710d07..198c78c7 100644 --- a/Src/Dlhis.Canteen/Program.cs +++ b/Src/Dlhis.Canteen/Program.cs @@ -22,18 +22,7 @@ public class Startup : DefaultStartup public override void ConfigureServices(IServiceCollection services) { - base.ConfigureServices(services); - //protected static string Obfuscate(string value) - //{ - // var last4Chars = "****"; - // if (value.IsPresent() && value.Length > 4) - // { - // last4Chars = value.Substring(value.Length - 4); - // } - - // return "****" + last4Chars; - //} - + base.ConfigureServices(services); services.AddRedis(); }