diff --git a/BPA.SAAS.KitChenManage.Application/BPA.SAAS.KitChenManage.Application.csproj b/BPA.SAAS.KitChenManage.Application/BPA.SAAS.KitChenManage.Application.csproj index 6722166..b8d288e 100644 --- a/BPA.SAAS.KitChenManage.Application/BPA.SAAS.KitChenManage.Application.csproj +++ b/BPA.SAAS.KitChenManage.Application/BPA.SAAS.KitChenManage.Application.csproj @@ -9,6 +9,13 @@ + + + + + + + @@ -26,9 +33,4 @@ - - - - - diff --git a/BPA.SAAS.KitChenManage.Application/BPA.SAAS.KitChenManage.Application.xml b/BPA.SAAS.KitChenManage.Application/BPA.SAAS.KitChenManage.Application.xml index d62a4dc..7f98d38 100644 --- a/BPA.SAAS.KitChenManage.Application/BPA.SAAS.KitChenManage.Application.xml +++ b/BPA.SAAS.KitChenManage.Application/BPA.SAAS.KitChenManage.Application.xml @@ -856,6 +856,13 @@ + + + 根据店铺id查询店铺(外部调用) + + + + 添加 diff --git a/BPA.SAAS.KitChenManage.Application/Device/DevicePushRecodeServices.cs b/BPA.SAAS.KitChenManage.Application/Device/DevicePushRecodeServices.cs index cadf73e..4ef1f48 100644 --- a/BPA.SAAS.KitChenManage.Application/Device/DevicePushRecodeServices.cs +++ b/BPA.SAAS.KitChenManage.Application/Device/DevicePushRecodeServices.cs @@ -17,6 +17,10 @@ namespace BPA.SAAS.KitChenManage.Application.Device { _devicePushRecodeService= devicePushRecodeService; } + public async Task Test() + { + return await _devicePushRecodeService.Test(); + } /// /// 分页 /// diff --git a/BPA.SAAS.KitChenManage.Application/Device/Services/DevicePushRecodeService.cs b/BPA.SAAS.KitChenManage.Application/Device/Services/DevicePushRecodeService.cs index 653b9ee..d9a772e 100644 --- a/BPA.SAAS.KitChenManage.Application/Device/Services/DevicePushRecodeService.cs +++ b/BPA.SAAS.KitChenManage.Application/Device/Services/DevicePushRecodeService.cs @@ -10,6 +10,7 @@ using BPA.SAAS.KitChenManage.Core.Model; using Furion.LinqBuilder; using Furion.RemoteRequest.Extensions; using Longbow.Tasks; +using Microsoft.AspNetCore.DataProtection.KeyManagement; using Microsoft.CodeAnalysis.Operations; using Microsoft.Extensions.Hosting; using MQTTnet; @@ -40,6 +41,19 @@ namespace BPA.SAAS.KitChenManage.Application.Device.Services _mqttClient=mqttClient; mqttServer = new(mqttClient); } + public async Task Test() + { + var getGoodsAttributeurl = "http://localhost:5009/api/ExternalPlatform/Goods/GetGoodsPageList";//获取商品属性 + var key = "47e5c071-6283-4d9d-8dcb-36ba95aa8db9"; + var str = "current=1&pageSize=10&"+ key; + var sign = MD5Encryption.Encrypt(str.ToUpper()); + var respon = await getGoodsAttributeurl.SetHeaders(new + { + sign= sign, + key = key + }).SetHttpMethod(HttpMethod.Get).SetBody("{\"current\":1,\"pageSize\":10}", "application/json").PostAsStringAsync(); + return respon; + } /// /// 分页 /// diff --git a/BPA.SAAS.KitChenManage.Application/Device/Services/IDevicePushRecodeService.cs b/BPA.SAAS.KitChenManage.Application/Device/Services/IDevicePushRecodeService.cs index 695b288..e8ecab2 100644 --- a/BPA.SAAS.KitChenManage.Application/Device/Services/IDevicePushRecodeService.cs +++ b/BPA.SAAS.KitChenManage.Application/Device/Services/IDevicePushRecodeService.cs @@ -10,6 +10,7 @@ namespace BPA.SAAS.KitChenManage.Application.Device.Services { public interface IDevicePushRecodeService { + Task Test(); /// /// 分页 /// diff --git a/BPA.SAAS.KitChenManage.Application/Store/Services/IStoreService.cs b/BPA.SAAS.KitChenManage.Application/Store/Services/IStoreService.cs index 555259e..691ab6c 100644 --- a/BPA.SAAS.KitChenManage.Application/Store/Services/IStoreService.cs +++ b/BPA.SAAS.KitChenManage.Application/Store/Services/IStoreService.cs @@ -22,6 +22,7 @@ namespace BPA.SAAS.KitChenManage.Application.Store.Services /// Task> GetStoreList(); Task> GetStoreList_alm(); + Task GetByIdStoreList_alm(string id); /// /// 添加 /// diff --git a/BPA.SAAS.KitChenManage.Application/Store/Services/StoreService.cs b/BPA.SAAS.KitChenManage.Application/Store/Services/StoreService.cs index 6e7db78..06f03b0 100644 --- a/BPA.SAAS.KitChenManage.Application/Store/Services/StoreService.cs +++ b/BPA.SAAS.KitChenManage.Application/Store/Services/StoreService.cs @@ -85,6 +85,25 @@ namespace BPA.SAAS.KitChenManage.Application.Store.Services return res; } + public async Task GetByIdStoreList_alm(string id) + { + string groupId = App.HttpContext.Request.Headers["groupId"].ToString(); + if (string.IsNullOrWhiteSpace(groupId)) throw Oops.Oh("加盟商id不能为空"); + var res = await _db.Queryable().Where(x => x.GroupId == groupId && x.Id== id) + .Select(t => new StoreDtoOutput + { + CreateAt = t.CreateAt, + Id = t.Id, + Name = t.Name, + Phone = t.Phone, + Description = t.Description, + OrgName = t.OrgName, + OrgId = t.OrgId, + Sort = t.Sort, + }).OrderBy(t => t.Sort).OrderBy(x => x.CreateAt, OrderByType.Desc).FirstAsync(); + + return res; + } /// /// 添加 /// diff --git a/BPA.SAAS.KitChenManage.Application/Store/StoreServices.cs b/BPA.SAAS.KitChenManage.Application/Store/StoreServices.cs index b3fff53..e9e8c6b 100644 --- a/BPA.SAAS.KitChenManage.Application/Store/StoreServices.cs +++ b/BPA.SAAS.KitChenManage.Application/Store/StoreServices.cs @@ -47,6 +47,16 @@ namespace BPA.SAAS.KitChenManage.Application.Store return await _storeService.GetStoreList_alm(); } /// + /// 根据店铺id查询店铺(外部调用) + /// + /// + /// + [HttpGet("/api/store/getbyIdstorelist_alm")] + public async Task GetByIdStoreList_alm(string id) + { + return await _storeService.GetByIdStoreList_alm(id); + } + /// /// 添加 /// /// diff --git a/BPA.SAAS.KitChenManage.Web.Entry/Properties/launchSettings.json b/BPA.SAAS.KitChenManage.Web.Entry/Properties/launchSettings.json index 870d479..8f67248 100644 --- a/BPA.SAAS.KitChenManage.Web.Entry/Properties/launchSettings.json +++ b/BPA.SAAS.KitChenManage.Web.Entry/Properties/launchSettings.json @@ -22,7 +22,7 @@ "dotnetRunMessages": true, "launchBrowser": true, "launchUrl": "", - "applicationUrl": "http://localhost:5008", + "applicationUrl": "http://localhost:5007", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" }