Merge branch 'master' of http://10.2.1.24:10244/zhaoy/BPA.SAAS.KitChenManage

BPA.SAAS.KitChenManage.Application/AExternalPlatform/Service/Authorization/Services/AuthService.cs

@@ -29,11 +29,10 @@ namespace BPA.SAAS.KitChenManage.Application.AExternalPlatform.Service.Authoriza
         /// <returns></returns>
         public async Task<List<StoreAuthKeyDto>> GetListStoreAuthKey(BaseEPDto input)
         {
-            DtoValidator.CheckTenant(input.TenantId);
-
+           
             var res = await _db.Queryable<BPA_StoreAuthorization, BPA_Store>((a, b) => new JoinQueryInfos(
                     JoinType.Left, a.StoreId == b.Id))
-                .Where((a, b) => a.GroupId == input.TenantId)
+                //.Where((a, b) => a.GroupId == input.TenantId)
                 .OrderBy((a, b) => a.CreateAt, OrderByType.Desc)
                 .Select((a, b) => new StoreAuthKeyDto
                 {
@@ -54,7 +53,7 @@ namespace BPA.SAAS.KitChenManage.Application.AExternalPlatform.Service.Authoriza
         {
             var res = await _db.Queryable<BPA_StoreAuthorization, BPA_Store>((a, b) => new JoinQueryInfos(
                     JoinType.Left, a.StoreId == b.Id))
-                .Where((a, b) => a.GroupId == input.TenantId && a.StoreId == input.StoreId)
+               // .Where((a, b) => a.GroupId == input.TenantId && a.StoreId == input.StoreId)
                 .OrderBy((a, b) => a.CreateAt, OrderByType.Desc)
                 .Select((a, b) => new StoreAuthKeyDto
                 {

BPA.SAAS.KitChenManage.Application/AExternalPlatform/Service/CheckService/CheckServices.cs

@@ -1,17 +1,10 @@
-using BPA.SAAS.Manage.Application.AExternalPlatform.Enum;
-using BPA.SAAS.Manage.Application.AExternalPlatform.Service.Material.Dtos;
-using BPA.SAAS.Manage.Comm.Enum;
-using BPA.SAAS.Manage.Core.Base;
-using BPA.SAAS.Manage.Core.DataBase;
-using BPA.SAAS.Manage.Core;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using BPA.SAAS.KitChenManage.Application.AExternalPlatform.Service.CheckService.Services;
 using Microsoft.AspNetCore.Components.Forms;
-using BPA.SAAS.Manage.Application.AExternalPlatform.BaseDto;
-using BPA.SAAS.Manage.Application.AExternalPlatform.Service.CheckService.Services;
 
 namespace BPA.SAAS.Manage.Application.AExternalPlatform.Service.CheckService
 {

BPA.SAAS.KitChenManage.Application/Authorization/AuthorizationServices.cs

@@ -1,4 +1,5 @@
-using BPA.SAAS.KitChenManage.Application.Food.Services;
+using BPA.SAAS.KitChenManage.Application.Authorization.Dtos;
+using BPA.SAAS.KitChenManage.Application.Food.Services;
 using BPA.SAAS.KitChenManage.Core.Base;
 using BPA.SAAS.KitChenManage.Core.Model;
 using System;
@@ -36,9 +37,9 @@ namespace BPA.SAAS.KitChenManage.Application.Authorization
         /// </summary>
         /// <returns></returns>
         [HttpPost("/api/authorization/addstoreauthorization")]
-        public async Task<bool> AddStoreAuthorization(string storeId)
+        public async Task<bool> AddStoreAuthorization(CreateOrUpDateStoreAuthorizationDto input)
         {
-            return await _authorizationService.AddStoreAuthorization(storeId);
+            return await _authorizationService.AddStoreAuthorization(input);
         }
 
         /// <summary>
@@ -52,6 +53,28 @@ namespace BPA.SAAS.KitChenManage.Application.Authorization
             return await _authorizationService.UpdateStoreAuthorization(id);
         }
 
+        /// <summary>
+        /// 修改店铺授权时间
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost("/api/authorization/updatestoreauthtime")]
+        public async Task<bool> UpdateStoreAuthTime(CreateOrUpDateStoreAuthorizationDto input)
+        {
+            return await _authorizationService.UpdateStoreAuthTime(input);
+        }
+
+        /// <summary>
+        /// 删除店铺权限
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        [HttpPost("/api/authorization/delstoreauthorization")]
+        public async Task<bool> DelStoreAuthorization(string id)
+        {
+            return await _authorizationService.DelStoreAuthorization(id);
+        }
+
         /// <summary>
         /// CodeFirst
         /// </summary>

BPA.SAAS.KitChenManage.Application/Authorization/Dtos/StoreAuthorizationDto.cs

@@ -12,4 +12,18 @@ namespace BPA.SAAS.KitChenManage.Application.Authorization.Dtos
         public string StoreName { get; set; }
         public string StoreId { get; set; }
     }
+
+    public class CreateOrUpDateStoreAuthorizationDto
+    {
+        public string Id { get; set; }
+
+        public string Key { get; set; }
+
+        public string StoreId { get; set; }
+
+        /// <summary>
+        /// 有效期 长期有效为空
+        /// </summary>
+        public DateTime? PeriodValidity { get; set; }
+    }
 }

BPA.SAAS.KitChenManage.Application/Authorization/Services/AuthorizationService.cs

@@ -37,7 +37,10 @@ namespace BPA.SAAS.KitChenManage.Application.Authorization.Services
                     Id = a.Id,
                     Key = a.Key,
                     StoreId = a.StoreId,
-                    StoreName = b.Name
+                    StoreName = b.Name,
+                    UpdateAt = a.UpdateAt,
+                    PeriodValidity = a.PeriodValidity,
+
                 })
                 .ToPageListAsync(input.Current, input.PageSize, total);
             PageUtil util = new PageUtil()
@@ -52,9 +55,9 @@ namespace BPA.SAAS.KitChenManage.Application.Authorization.Services
         /// 添加店铺授权码
         /// </summary>
         /// <returns></returns>
-        public async Task<bool> AddStoreAuthorization(string storeId)
+        public async Task<bool> AddStoreAuthorization(CreateOrUpDateStoreAuthorizationDto input)
         {
-            var data = _db.Queryable<BPA_StoreAuthorization>().Where(x=>x.StoreId== storeId).ToList();
+            var data = _db.Queryable<BPA_StoreAuthorization>().Where(x=>x.StoreId== input.StoreId).ToList();
             if (data.Count > 0)
             {
                 throw Oops.Oh("店铺授权码已存在");
@@ -62,8 +65,10 @@ namespace BPA.SAAS.KitChenManage.Application.Authorization.Services
 
             var res = await _db.Insertable(new BPA_StoreAuthorization()
             {
-                StoreId = storeId,
+                StoreId = input.StoreId,
                 Key = Guid.NewGuid().ToString(),
+                PeriodValidity = input.PeriodValidity,
+                UpdateAt=DateTime.Now,
 
             }).CallEntityMethod(t => t.Create()).ExecuteCommandAsync();
 
@@ -83,10 +88,52 @@ namespace BPA.SAAS.KitChenManage.Application.Authorization.Services
                 throw Oops.Oh("授权信息不存在");
             }
             data.Key = Guid.NewGuid().ToString();
+            data.UpdateAt = DateTime.Now;
+
+            return await _db.Updateable(data).ExecuteCommandHasChangeAsync();
+        }
+
+
+        /// <summary>
+        /// 修改店铺授权码
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public async Task<bool> UpdateStoreAuthTime(CreateOrUpDateStoreAuthorizationDto input)
+        {
+            var data1 = await _db.Queryable<BPA_StoreAuthorization>().FirstAsync(x => x.StoreId == input.StoreId);
+            if (data1!=null&&data1.Id!=input.Id)
+            {
+                throw Oops.Oh("店铺授权信息已存在");
+            }
+            var data = await _db.Queryable<BPA_StoreAuthorization>().FirstAsync(x => x.Id == input.Id);
+            if (data == null)
+            {
+                throw Oops.Oh("授权信息不存在");
+            }
+            data.Key = Guid.NewGuid().ToString();
+            data.PeriodValidity = input.PeriodValidity;
+            data.UpdateAt = DateTime.Now;
 
             return await _db.Updateable(data).ExecuteCommandHasChangeAsync();
         }
 
+        /// <summary>
+        /// 删除店铺权限
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public async Task<bool> DelStoreAuthorization(string id)
+        {
+            var data = await _db.Queryable<BPA_StoreAuthorization>().FirstAsync(x => x.Id == id);
+            if (data == null)
+            {
+                throw Oops.Oh("授权信息不存在");
+            }
+
+            return await _db.Deleteable(data).ExecuteCommandHasChangeAsync();
+        }
+
 
         /// <summary>
         /// CodeFirst

BPA.SAAS.KitChenManage.Application/Authorization/Services/IAuthorizationService.cs

@@ -1,4 +1,5 @@
-using BPA.SAAS.KitChenManage.Core.Base;
+using BPA.SAAS.KitChenManage.Application.Authorization.Dtos;
+using BPA.SAAS.KitChenManage.Core.Base;
 using BPA.SAAS.KitChenManage.Core.Model;
 using System;
 using System.Collections.Generic;
@@ -23,7 +24,7 @@ namespace BPA.SAAS.KitChenManage.Application.Authorization.Services
         /// 添加店铺授权码
         /// </summary>
         /// <returns></returns>
-        Task<bool> AddStoreAuthorization(string storeId);
+        Task<bool> AddStoreAuthorization(CreateOrUpDateStoreAuthorizationDto input);
 
         /// <summary>
         /// 修改店铺授权码
@@ -32,8 +33,15 @@ namespace BPA.SAAS.KitChenManage.Application.Authorization.Services
         /// <returns></returns>
         Task<bool> UpdateStoreAuthorization(string id);
 
+        Task<bool> UpdateStoreAuthTime(CreateOrUpDateStoreAuthorizationDto input);
 
 
+        /// <summary>
+        /// 删除店铺权限
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        Task<bool> DelStoreAuthorization(string id);
 
 
 

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

@@ -11,7 +11,7 @@
             <param name="input"></param>
             <returns></returns>
         </member>
-        <member name="M:BPA.SAAS.KitChenManage.Application.Authorization.AuthorizationServices.AddStoreAuthorization(System.String)">
+        <member name="M:BPA.SAAS.KitChenManage.Application.Authorization.AuthorizationServices.AddStoreAuthorization(BPA.SAAS.KitChenManage.Application.Authorization.Dtos.CreateOrUpDateStoreAuthorizationDto)">
             <summary>
             添加店铺授权码
             </summary>
@@ -24,12 +24,31 @@
             <param name="id"></param>
             <returns></returns>
         </member>
+        <member name="M:BPA.SAAS.KitChenManage.Application.Authorization.AuthorizationServices.UpdateStoreAuthTime(BPA.SAAS.KitChenManage.Application.Authorization.Dtos.CreateOrUpDateStoreAuthorizationDto)">
+            <summary>
+            修改店铺授权时间
+            </summary>
+            <param name="input"></param>
+            <returns></returns>
+        </member>
+        <member name="M:BPA.SAAS.KitChenManage.Application.Authorization.AuthorizationServices.DelStoreAuthorization(System.String)">
+            <summary>
+            删除店铺权限
+            </summary>
+            <param name="id"></param>
+            <returns></returns>
+        </member>
         <member name="M:BPA.SAAS.KitChenManage.Application.Authorization.AuthorizationServices.CodeFirst">
             <summary>
             CodeFirst
             </summary>
             <param name="tableNames"></param>
         </member>
+        <member name="P:BPA.SAAS.KitChenManage.Application.Authorization.Dtos.CreateOrUpDateStoreAuthorizationDto.PeriodValidity">
+            <summary>
+            有效期 长期有效为空
+            </summary>
+        </member>
         <member name="M:BPA.SAAS.KitChenManage.Application.Authorization.Services.AuthorizationService.PageStoreAuthorization(BPA.SAAS.KitChenManage.Core.Base.PageInputBase)">
             <summary>
             分页店铺授权码
@@ -37,7 +56,7 @@
             <param name="input"></param>
             <returns></returns>
         </member>
-        <member name="M:BPA.SAAS.KitChenManage.Application.Authorization.Services.AuthorizationService.AddStoreAuthorization(System.String)">
+        <member name="M:BPA.SAAS.KitChenManage.Application.Authorization.Services.AuthorizationService.AddStoreAuthorization(BPA.SAAS.KitChenManage.Application.Authorization.Dtos.CreateOrUpDateStoreAuthorizationDto)">
             <summary>
             添加店铺授权码
             </summary>
@@ -50,6 +69,20 @@
             <param name="id"></param>
             <returns></returns>
         </member>
+        <member name="M:BPA.SAAS.KitChenManage.Application.Authorization.Services.AuthorizationService.UpdateStoreAuthTime(BPA.SAAS.KitChenManage.Application.Authorization.Dtos.CreateOrUpDateStoreAuthorizationDto)">
+            <summary>
+            修改店铺授权码
+            </summary>
+            <param name="id"></param>
+            <returns></returns>
+        </member>
+        <member name="M:BPA.SAAS.KitChenManage.Application.Authorization.Services.AuthorizationService.DelStoreAuthorization(System.String)">
+            <summary>
+            删除店铺权限
+            </summary>
+            <param name="id"></param>
+            <returns></returns>
+        </member>
         <member name="M:BPA.SAAS.KitChenManage.Application.Authorization.Services.AuthorizationService.CodeFirst">
             <summary>
             CodeFirst
@@ -63,7 +96,7 @@
             <param name="input"></param>
             <returns></returns>
         </member>
-        <member name="M:BPA.SAAS.KitChenManage.Application.Authorization.Services.IAuthorizationService.AddStoreAuthorization(System.String)">
+        <member name="M:BPA.SAAS.KitChenManage.Application.Authorization.Services.IAuthorizationService.AddStoreAuthorization(BPA.SAAS.KitChenManage.Application.Authorization.Dtos.CreateOrUpDateStoreAuthorizationDto)">
             <summary>
             添加店铺授权码
             </summary>
@@ -76,6 +109,13 @@
             <param name="id"></param>
             <returns></returns>
         </member>
+        <member name="M:BPA.SAAS.KitChenManage.Application.Authorization.Services.IAuthorizationService.DelStoreAuthorization(System.String)">
+            <summary>
+            删除店铺权限
+            </summary>
+            <param name="id"></param>
+            <returns></returns>
+        </member>
         <member name="M:BPA.SAAS.KitChenManage.Application.Authorization.Services.IAuthorizationService.CodeFirst">
             <summary>
             CodeFirst
@@ -698,6 +738,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;
@@ -41,6 +42,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.Core/BPA.SAAS.KitChenManage.Core.xml

@@ -80,6 +80,11 @@
             商品id
             </summary>
         </member>
+        <member name="P:BPA.SAAS.KitChenManage.Core.Model.BPA_StoreAuthorization.PeriodValidity">
+            <summary>
+            有效期 长期有效为空
+            </summary>
+        </member>
         <member name="M:BPA.KitChen.GroupMeal.SqlSugar.SqlSugarDb.TableFilterItem(SqlSugar.SqlSugarClient)">
             <summary>
             全局过滤

BPA.SAAS.KitChenManage.Core/Model/BPA_StoreAuthorization.cs

@@ -14,5 +14,12 @@ namespace BPA.SAAS.KitChenManage.Core.Model
         public string StoreId { get; set; }
         public string Key { get; set; }
         public string GroupId { get; set; }
+
+        /// <summary>
+        /// 有效期 长期有效为空
+        /// </summary>
+        public DateTime? PeriodValidity { get; set; }
+
+        public DateTime UpdateAt { get; set; }
     }
 }

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