z

BPA.SAAS.KitChenManage.Application/BPA.SAAS.KitChenManage.Application.csproj

@@ -9,6 +9,13 @@
 	</PropertyGroup>
 
 
+	<ItemGroup>
+	  <Compile Remove="AExternalPlatform\**" />
+	  <EmbeddedResource Remove="AExternalPlatform\**" />
+	  <None Remove="AExternalPlatform\**" />
+	</ItemGroup>
+
+
 
 	<ItemGroup>
 		<None Remove="BPA.SAAS.KitChenManage.Application.xml" />
@@ -26,9 +33,4 @@
 		<ProjectReference Include="..\BPA.SAAS.KitChenManage.Core\BPA.SAAS.KitChenManage.Core.csproj" />
 	</ItemGroup>
 
-	<ItemGroup>
-	  <Folder Include="AExternalPlatform\Service\CheckService\Dtos\" />
-	  <Folder Include="AExternalPlatform\Service\Platform\Material\Dtos\" />
-	</ItemGroup>
-
 </Project>

BPA.SAAS.KitChenManage.Application/BPA.SAAS.KitChenManage.Application.xml

@@ -4,114 +4,6 @@
         <name>BPA.SAAS.KitChenManage.Application</name>
     </assembly>
     <members>
-        <member name="P:BPA.SAAS.KitChenManage.Application.AExternalPlatform.BaseDto.BaseEPDto.TenantId">
-            <summary>
-            租户Id
-            </summary>
-        </member>
-        <member name="T:BPA.SAAS.KitChenManage.Application.AExternalPlatform.BaseDto.DtoValidator">
-            <summary>
-            Dto参数验证
-            </summary>
-        </member>
-        <member name="M:BPA.SAAS.KitChenManage.Application.AExternalPlatform.BaseDto.DtoValidator.CheckTenant(System.String)">
-            <summary>
-            检查租户
-            </summary>
-            <param name="id"></param>
-            <returns></returns>
-        </member>
-        <member name="T:BPA.SAAS.KitChenManage.Application.AExternalPlatform.Enum.ErrorCodeEnum">
-            <summary>
-            系统错误码
-            </summary>
-        </member>
-        <member name="F:BPA.SAAS.KitChenManage.Application.AExternalPlatform.Enum.ErrorCodeEnum.Code1000">
-            <summary>
-            用户没有注册
-            </summary>
-        </member>
-        <member name="M:BPA.SAAS.KitChenManage.Application.AExternalPlatform.Service.Authorization.AuthServices.GetListStoreAuthKey(BPA.SAAS.KitChenManage.Application.AExternalPlatform.BaseDto.BaseEPDto)">
-            <summary>
-            获取店铺授权码列表
-            </summary>
-            <param name="input"></param>
-            <returns></returns>
-        </member>
-        <member name="M:BPA.SAAS.KitChenManage.Application.AExternalPlatform.Service.Authorization.AuthServices.GetStoreAuthKey(BPA.SAAS.KitChenManage.Application.AExternalPlatform.Service.Authorization.Dtos.StoreAuthDto)">
-            <summary>
-            获取店铺授权码
-            </summary>
-            <param name="input"></param>
-            <returns></returns>
-        </member>
-        <member name="M:BPA.SAAS.KitChenManage.Application.AExternalPlatform.Service.Authorization.AuthServices.AddStoreAuthKey(BPA.SAAS.KitChenManage.Application.AExternalPlatform.Service.Authorization.Dtos.StoreAuthDto)">
-            <summary>
-            添加店铺授权码
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="M:BPA.SAAS.KitChenManage.Application.AExternalPlatform.Service.Authorization.AuthServices.UpdateStoreAuthKey(BPA.SAAS.KitChenManage.Application.AExternalPlatform.Service.Authorization.Dtos.StoreAuthDto)">
-            <summary>
-            修改店铺授权码
-            </summary>
-            <param name="id"></param>
-            <returns></returns>
-        </member>
-        <member name="M:BPA.SAAS.KitChenManage.Application.AExternalPlatform.Service.Authorization.Services.AuthService.GetListStoreAuthKey(BPA.SAAS.KitChenManage.Application.AExternalPlatform.BaseDto.BaseEPDto)">
-            <summary>
-            获取店铺授权码列表
-            </summary>
-            <param name="input"></param>
-            <returns></returns>
-        </member>
-        <member name="M:BPA.SAAS.KitChenManage.Application.AExternalPlatform.Service.Authorization.Services.AuthService.GetStoreAuthKey(BPA.SAAS.KitChenManage.Application.AExternalPlatform.Service.Authorization.Dtos.StoreAuthDto)">
-            <summary>
-            获取店铺授权码
-            </summary>
-            <param name="input"></param>
-            <returns></returns>
-        </member>
-        <member name="M:BPA.SAAS.KitChenManage.Application.AExternalPlatform.Service.Authorization.Services.AuthService.AddStoreAuthKey(BPA.SAAS.KitChenManage.Application.AExternalPlatform.Service.Authorization.Dtos.StoreAuthDto)">
-            <summary>
-            添加店铺授权码
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="M:BPA.SAAS.KitChenManage.Application.AExternalPlatform.Service.Authorization.Services.AuthService.UpdateStoreAuthKey(BPA.SAAS.KitChenManage.Application.AExternalPlatform.Service.Authorization.Dtos.StoreAuthDto)">
-            <summary>
-            修改店铺授权码
-            </summary>
-            <param name="id"></param>
-            <returns></returns>
-        </member>
-        <member name="M:BPA.SAAS.KitChenManage.Application.AExternalPlatform.Service.Authorization.Services.IAuthService.GetListStoreAuthKey(BPA.SAAS.KitChenManage.Application.AExternalPlatform.BaseDto.BaseEPDto)">
-            <summary>
-            获取店铺授权码列表
-            </summary>
-            <param name="input"></param>
-            <returns></returns>
-        </member>
-        <member name="M:BPA.SAAS.KitChenManage.Application.AExternalPlatform.Service.Authorization.Services.IAuthService.GetStoreAuthKey(BPA.SAAS.KitChenManage.Application.AExternalPlatform.Service.Authorization.Dtos.StoreAuthDto)">
-            <summary>
-            获取店铺授权码
-            </summary>
-            <param name="input"></param>
-            <returns></returns>
-        </member>
-        <member name="M:BPA.SAAS.KitChenManage.Application.AExternalPlatform.Service.Authorization.Services.IAuthService.AddStoreAuthKey(BPA.SAAS.KitChenManage.Application.AExternalPlatform.Service.Authorization.Dtos.StoreAuthDto)">
-            <summary>
-            添加店铺授权码
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="M:BPA.SAAS.KitChenManage.Application.AExternalPlatform.Service.Authorization.Services.IAuthService.UpdateStoreAuthKey(BPA.SAAS.KitChenManage.Application.AExternalPlatform.Service.Authorization.Dtos.StoreAuthDto)">
-            <summary>
-            修改店铺授权码
-            </summary>
-            <param name="id"></param>
-            <returns></returns>
-        </member>
         <member name="M:BPA.SAAS.KitChenManage.Application.Authorization.AuthorizationServices.PageStoreAuthorization(BPA.SAAS.KitChenManage.Core.Base.PageInputBase)">
             <summary>
             分页店铺授权码
@@ -798,6 +690,13 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="M:BPA.SAAS.KitChenManage.Application.Store.StoreServices.GetByIdStoreList_alm(System.String)">
+            <summary>
+            根据店铺id查询店铺(外部调用)
+            </summary>
+            <param name="id"></param>
+            <returns></returns>
+        </member>
         <member name="M:BPA.SAAS.KitChenManage.Application.Store.StoreServices.Add(BPA.SAAS.KitChenManage.Application.Store.Dtos.StoreDtoInput)">
             <summary>
             添加

BPA.SAAS.KitChenManage.Application/Device/DevicePushRecodeServices.cs

@@ -17,6 +17,10 @@ namespace BPA.SAAS.KitChenManage.Application.Device
         {
             _devicePushRecodeService= devicePushRecodeService;
         }
+        public async  Task<string> Test()
+        {
+            return await _devicePushRecodeService.Test();
+        }
         /// <summary>
         /// 分页
         /// </summary>

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<string> 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;
+        }
         /// <summary>
         /// 分页
         /// </summary>

BPA.SAAS.KitChenManage.Application/Device/Services/IDevicePushRecodeService.cs

@@ -10,6 +10,7 @@ namespace BPA.SAAS.KitChenManage.Application.Device.Services
 {
     public interface IDevicePushRecodeService
     {
+        Task<string> Test();
         /// <summary>
         /// 分页
         /// </summary>

BPA.SAAS.KitChenManage.Application/Store/Services/IStoreService.cs

@@ -22,6 +22,7 @@ namespace BPA.SAAS.KitChenManage.Application.Store.Services
         /// <returns></returns>
         Task<List<StoreDtoOutput>> GetStoreList();
         Task<List<StoreDtoOutput>> GetStoreList_alm();
+        Task<StoreDtoOutput> GetByIdStoreList_alm(string id);
         /// <summary>
         /// 添加
         /// </summary>

BPA.SAAS.KitChenManage.Application/Store/Services/StoreService.cs

@@ -85,6 +85,25 @@ namespace BPA.SAAS.KitChenManage.Application.Store.Services
 
             return res;
         }
+        public async Task<StoreDtoOutput> 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<BPA_Store>().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;
+        }
         /// <summary>
         /// 添加
         /// </summary>

BPA.SAAS.KitChenManage.Application/Store/StoreServices.cs

@@ -47,6 +47,16 @@ namespace BPA.SAAS.KitChenManage.Application.Store
             return await _storeService.GetStoreList_alm();
         }
         /// <summary>
+        /// 根据店铺id查询店铺(外部调用)
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        [HttpGet("/api/store/getbyIdstorelist_alm")]
+        public async  Task<StoreDtoOutput> GetByIdStoreList_alm(string id)
+        {
+            return await _storeService.GetByIdStoreList_alm(id);
+        }
+        /// <summary>
         /// 添加
         /// </summary>
         /// <param name="input"></param>

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"
       }