Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan

Myshipping.Application/Service/BookingOrder/BookingOrderService.cs

@@ -1917,24 +1917,18 @@ namespace Myshipping.Application
             return HttpUtility.UrlEncode(fileName, Encoding.GetEncoding("UTF-8"));
         }
 
-        ///// <summary>
+        //[HttpGet("/BookingOrder/TestExcel"), AllowAnonymous]
-        ///// 下载打印文件(PDF直接预览)
+        //public async Task TestExcel()
-        ///// </summary>
-        ///// <param name="vid">查看ID</param>
-        ///// <returns></returns>
-        //[HttpGet("/BookingOrder/ViewPrintPdf/{vid}"), AllowAnonymous]
-        //public void ViewPrintPdf(string vid)
         //{
-        //    if (_cache.Exists(vid))
+        //    var excelwork = new HSSFWorkbook(new FileStream(@"E:\whm\proj_git\BookingHeChuan\Myshipping.Web.Entry\bin\Debug\net6.0\wwwroot\Upload\PrintTemplate\373472276209733.xls", FileMode.Open));
-        //    {
+        //    var sheet = excelwork.GetSheetAt(0);
-        //        var fileFullName = _cache.Get(vid);
+
-        //        var readMem = new ReadOnlyMemory<byte>(File.ReadAllBytes(fileFullName));
+        //    sheet.GetRow(0).GetCell(0).SetCellValue(Guid.NewGuid().ToString());
-        //        _httpContextAccessor.HttpContext.Response.BodyWriter.WriteAsync(readMem);
+        //    sheet.GetRow(0).GetCell(1).SetCellValue(DateTime.Now.Ticks);
-        //    }
+
-        //    else
+        //    var filestream = new FileStream(Path.Combine(@"E:\whm\proj_git\BookingHeChuan\Myshipping.Web.Entry\bin\Debug\net6.0\wwwroot\Upload\PrintTemplate", "result.xls"), FileMode.Create);
-        //    {
+        //    excelwork.Write(filestream);
-        //        throw Oops.Bah("下载链接失效，请重新打印");
+        //    filestream.Close();
-        //    }
         //}
 
         /// <summary>

Myshipping.Core/Myshipping.Core.xml

@@ -9323,6 +9323,14 @@
             <param name="id"></param>
             <returns></returns>
         </member>
+        <member name="M:Myshipping.Core.Service.DjyApiAuthService.SetDisable(System.Int64,System.Boolean)">
+            <summary>
+            启用禁用
+            </summary>
+            <param name="id"></param>
+            <param name="disable">可用：false，禁用：true</param>
+            <returns></returns>
+        </member>
         <member name="M:Myshipping.Core.Service.DjyApiAuthService.GenSecret">
             <summary>
             生成新秘钥

Myshipping.Core/Service/DjyApiAuth/DjyApiAuthService.cs

@@ -99,7 +99,7 @@ namespace Myshipping.Core.Service
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
-        [HttpPost("/DjyApiAuth/secretReset")]
+        [HttpPost("/DjyApiAuth/SecretReset")]
         public async Task<string> SecretReset(long id)
         {
             var entity = _rep.AsQueryable().Filter(null, true).First(x => x.Id == id);
@@ -108,6 +108,20 @@ namespace Myshipping.Core.Service
             return entity.ApiSecret;
         }
 
+        /// <summary>
+        /// 启用禁用
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="disable">可用：false，禁用：true</param>
+        /// <returns></returns>
+        [HttpPost("/DjyApiAuth/SetDisable")]
+        public async Task SetDisable(long id, bool disable)
+        {
+            var entity = _rep.AsQueryable().Filter(null, true).First(x => x.Id == id);
+            entity.IsDisable = disable;
+            await _rep.UpdateAsync(entity);
+        }
+
         /// <summary>
         /// 生成新秘钥
         /// </summary>