11

REBORN.Common/Plugin/ZipHelper.cs

-using ICSharpCode.SharpZipLib.Checksums;
-using ICSharpCode.SharpZipLib.Zip;
+using ICSharpCode.SharpZipLib.Zip;
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace REBORN.Common.Plugin
 {
@@ -144,7 +138,7 @@ namespace REBORN.Common.Plugin
         {
             bool result = true;
             if (strFile[strFile.Length - 1] != Path.DirectorySeparatorChar) strFile += Path.DirectorySeparatorChar;
-            Crc32 crc = new Crc32();
+            ICSharpCode.SharpZipLib.Checksum.Crc32 crc = new ICSharpCode.SharpZipLib.Checksum.Crc32();
             try
             {
                 string[] filenames = Directory.GetFileSystemEntries(strFile);

REBORN.Common/packages.config

@@ -6,11 +6,13 @@
   <package id="Autofac" version="4.6.2" targetFramework="net461" />
   <package id="AutoMapper" version="6.2.2" targetFramework="net461" />
   <package id="BarcodeImaging" version="1.0.0" targetFramework="net461" />
-  <package id="BouncyCastle.Cryptography" version="2.3.1" targetFramework="net461" />
+  <package id="BouncyCastle.Cryptography" version="2.4.0" targetFramework="net461" />
   <package id="BouncyCastle.NetFramework" version="1.8.5.2" targetFramework="net461" />
   <package id="DnsClient" version="1.0.7" targetFramework="net461" />
   <package id="DocX" version="1.2.1" targetFramework="net461" />
+  <package id="Enums.NET" version="5.0.0" targetFramework="net461" />
   <package id="EnyimMemcached" version="2.16.0" targetFramework="net461" />
+  <package id="ExtendedNumerics.BigDecimal" version="2025.1001.2.129" targetFramework="net461" />
   <package id="Flurl" version="4.0.0" targetFramework="net461" />
   <package id="Flurl.Http" version="4.0.2" targetFramework="net461" />
   <package id="iTextSharp" version="5.5.13" targetFramework="net461" />
@@ -19,6 +21,7 @@
   <package id="log4net" version="2.0.8" targetFramework="net461" />
   <package id="LumenWorks.Framework.IO" version="3.8.0" targetFramework="net461" />
   <package id="MailKit" version="3.4.2" targetFramework="net461" />
+  <package id="MathNet.Numerics.Signed" version="5.0.0" targetFramework="net461" />
   <package id="Memcached.ClientLibrary" version="1.0" targetFramework="net461" />
   <package id="Microsoft.AspNetCore.WebUtilities" version="2.2.0" targetFramework="net461" />
   <package id="Microsoft.Bcl.AsyncInterfaces" version="8.0.0" targetFramework="net461" />
@@ -29,6 +32,7 @@
   <package id="Microsoft.Extensions.Logging.Abstractions" version="2.0.2" targetFramework="net461" />
   <package id="Microsoft.Extensions.Options" version="2.0.2" targetFramework="net461" />
   <package id="Microsoft.Extensions.Primitives" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.IO.RecyclableMemoryStream" version="3.0.1" targetFramework="net461" />
   <package id="Microsoft.Net.Http.Headers" version="2.2.0" targetFramework="net461" />
   <package id="Microsoft.Office.Interop.Word" version="15.0.4797.1003" targetFramework="net461" />
   <package id="MimeKit" version="3.4.2" targetFramework="net461" />
@@ -39,7 +43,7 @@
   <package id="MySql.Data" version="6.9.12" targetFramework="net461" />
   <package id="NetSword.Common.ICSharpCode.SharpZipLib" version="0.84.0" targetFramework="net461" developmentDependency="true" />
   <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net461" />
-  <package id="NPOI" version="2.4.0" targetFramework="net461" />
+  <package id="NPOI" version="2.7.4" targetFramework="net461" />
   <package id="OpenHtmlToPdf" version="1.12.0.0" targetFramework="net461" />
   <package id="Portable.BouncyCastle" version="1.9.0" targetFramework="net461" />
   <package id="PuppeteerSharp" version="11.0.4" targetFramework="net461" />
@@ -47,18 +51,27 @@
   <package id="RabbitMQ.Client" version="5.1.0" targetFramework="net461" />
   <package id="REBORN.Cache" version="1.1.2" targetFramework="net461" />
   <package id="REBORN.DataHelper" version="1.0.0" targetFramework="net461" />
-  <package id="SharpZipLib" version="0.86.0" targetFramework="net461" />
+  <package id="SharpZipLib" version="1.4.2" targetFramework="net461" />
+  <package id="SixLabors.Fonts" version="1.0.1" targetFramework="net461" />
+  <package id="SixLabors.ImageSharp" version="2.1.10" targetFramework="net461" />
   <package id="SKIT.FlurlHttpClient.Common" version="3.0.0" targetFramework="net461" />
   <package id="SKIT.FlurlHttpClient.Wechat.TenpayV3" version="3.4.0" targetFramework="net461" />
   <package id="Spire.Barcode" version="2.3" targetFramework="net461" />
   <package id="StackExchange.Redis" version="1.2.6" targetFramework="net461" />
   <package id="System.Buffers" version="4.5.1" targetFramework="net461" />
   <package id="System.Data.DataSetExtensions" version="4.5.0" targetFramework="net461" />
+  <package id="System.Formats.Asn1" version="8.0.1" targetFramework="net461" />
   <package id="System.Memory" version="4.5.5" targetFramework="net461" />
   <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net461" />
   <package id="System.Reflection.Emit" version="4.3.0" targetFramework="net461" />
   <package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net461" />
-  <package id="System.Security.Cryptography.Pkcs" version="6.0.0" targetFramework="net461" />
+  <package id="System.Security.AccessControl" version="6.0.0" targetFramework="net461" />
+  <package id="System.Security.Cryptography.Algorithms" version="4.3.1" targetFramework="net461" />
+  <package id="System.Security.Cryptography.Cng" version="5.0.0" targetFramework="net461" />
+  <package id="System.Security.Cryptography.Pkcs" version="8.0.1" targetFramework="net461" />
+  <package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net461" />
+  <package id="System.Security.Cryptography.Xml" version="8.0.2" targetFramework="net461" />
+  <package id="System.Security.Principal.Windows" version="5.0.0" targetFramework="net461" />
   <package id="System.Text.Encoding.CodePages" version="6.0.0" targetFramework="net461" />
   <package id="System.Text.Encodings.Web" version="8.0.0" targetFramework="net461" />
   <package id="System.Text.Json" version="8.0.1" targetFramework="net461" />
@@ -67,4 +80,5 @@
   <package id="TencentCloudSDK.Common" version="3.0.432" targetFramework="net461" />
   <package id="TencentCloudSDK.Ocr" version="3.0.432" targetFramework="net461" />
   <package id="ThoughtWorks.QRCode" version="1.1.0" targetFramework="net461" />
+  <package id="ZString" version="2.6.0" targetFramework="net461" />
 </packages>
\ No newline at end of file

REBORN.Model/Entity/Dmc/RB_Travel_Order.cs

@@ -217,6 +217,7 @@ namespace REBORN.Model.Entity.Dmc
             get;
             set;
         }
+
         /// <summary>
         /// 客人来源
         /// </summary>      
@@ -226,6 +227,7 @@ namespace REBORN.Model.Entity.Dmc
             get;
             set;
         }
+
         /// <summary>
         /// 所属平台(品牌)
         /// </summary>        

REBORN.Module.DMCModule/TravelModuleEdit_V2.cs

@@ -5,14 +5,12 @@ using REBORN.CacheManager.Dmc;
 using REBORN.Common;
 using REBORN.Common.Enum;
 using REBORN.Common.Enum.Log;
-using REBORN.Common.Pay.Alipay;
 using REBORN.Common.Plugin;
 using REBORN.Model.CacheEntity;
 using REBORN.Model.Entity;
 using REBORN.Model.Entity.Dmc;
 using REBORN.Model.Entity.Finance;
 using REBORN.Model.Entity.Sell;
-using REBORN.Model.Entity.Trip;
 using REBORN.Model.Extend.Dmc;
 using REBORN.Model.Extend.Finance;
 using REBORN.Model.Extend.Trip;
@@ -21,19 +19,10 @@ using REBORN.Repository;
 using REBORN.Repository.Dmc;
 using REBORN.Repository.Finance;
 using REBORN.Repository.Sell;
-using REBORN.Repository.Trip;
-using StackExchange.Redis;
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
 using System.Linq;
-using System.Reflection.Emit;
-using System.Runtime.InteropServices.ComTypes;
-using System.Runtime.Serialization.Formatters.Binary;
 using System.Threading.Tasks;
-using System.Web;
-using static log4net.Appender.RollingFileAppender;
 
 namespace REBORN.Module.DMCModule
 {
@@ -96,6 +85,16 @@ namespace REBORN.Module.DMCModule
         /// </summary>
         private readonly RB_Travel_Day_PriceRepository travelDay_PriceRepository = new RB_Travel_Day_PriceRepository();
 
+        /// <summary>
+        /// 獲取團隊航班
+        /// </summary>
+        /// <param name="tcids"></param>
+        /// <returns></returns>
+        public List<RB_Travel_Price_Flight_Extend> GetPriceFlightModule(string tcids)
+        {
+            return priceFlightRepository.GetDisDirectPriceFlightRepository(tcids);
+        }
+
         /// <summary>
         /// 获取餐厅列表
         /// </summary>

REBORN.Services.DMCService/DMCStatisticsService_V2.cs

@@ -899,7 +899,7 @@ namespace REBORN.Services.DMCService
                     new ExcelColumn(value:"お取引先担当者"){Colspan=5,Rowspan=2,VAlignmentEnum=VAlignmentEnum.CENTER},
                     new ExcelColumn(value:"各位"){ Colspan = 2,Rowspan=2,VAlignmentEnum=VAlignmentEnum.CENTER },
                     new ExcelColumn(value:""){ Colspan = 2,Rowspan=2,VAlignmentEnum=VAlignmentEnum.CENTER  },
-                    new ExcelColumn(value:"ツアー番号"){Colspan=4,VAlignmentEnum=VAlignmentEnum.CENTER ,SelfBgColorIndex=1,FontColorEnum= ColorEnum.White },
+                    new ExcelColumn(value:"ツアー番号"){Colspan=4,VAlignmentEnum=VAlignmentEnum.CENTER ,FontColorEnum= ColorEnum.White },
                 }
             };
             slist.Add(header2);
@@ -927,14 +927,14 @@ namespace REBORN.Services.DMCService
             {
                 ExcelRows = new List<ExcelColumn>(30)
                 {
-                    new ExcelColumn(value:"代表添乗員"){Colspan=3, VAlignmentEnum=VAlignmentEnum.CENTER,SelfBgColorIndex=1,FontColorEnum= ColorEnum.White },
-                    new ExcelColumn(value:"TL"){ VAlignmentEnum=VAlignmentEnum.CENTER,SelfBgColorIndex=1,FontColorEnum= ColorEnum.White },
-                    new ExcelColumn(value:"乗務員"){VAlignmentEnum=VAlignmentEnum.CENTER,SelfBgColorIndex=1,FontColorEnum= ColorEnum.White },
+                    new ExcelColumn(value:"代表添乗員"){Colspan=3, VAlignmentEnum=VAlignmentEnum.CENTER,FontColorEnum= ColorEnum.White },
+                    new ExcelColumn(value:"TL"){ VAlignmentEnum=VAlignmentEnum.CENTER, FontColorEnum= ColorEnum.White },
+                    new ExcelColumn(value:"乗務員"){VAlignmentEnum=VAlignmentEnum.CENTER,FontColorEnum= ColorEnum.White },
                     new ExcelColumn(value:""){Colspan = 2,Rowspan=3,VAlignmentEnum=VAlignmentEnum.CENTER,IsSetBorder=false },
-                    new ExcelColumn(value:"配車車種"){Colspan = 2, VAlignmentEnum=VAlignmentEnum.CENTER,SelfBgColorIndex=1,FontColorEnum= ColorEnum.White },
-                    new ExcelColumn(value:"大人"){VAlignmentEnum=VAlignmentEnum.CENTER,SelfBgColorIndex=1,FontColorEnum= ColorEnum.White },
-                    new ExcelColumn(value:"子供"){VAlignmentEnum=VAlignmentEnum.CENTER,SelfBgColorIndex=1,FontColorEnum= ColorEnum.White },
-                    new ExcelColumn(value:"合計"){Colspan=2,VAlignmentEnum=VAlignmentEnum.CENTER ,SelfBgColorIndex=1,FontColorEnum= ColorEnum.White},
+                    new ExcelColumn(value:"配車車種"){Colspan = 2, VAlignmentEnum=VAlignmentEnum.CENTER,FontColorEnum= ColorEnum.White },
+                    new ExcelColumn(value:"大人"){VAlignmentEnum=VAlignmentEnum.CENTER,FontColorEnum= ColorEnum.White },
+                    new ExcelColumn(value:"子供"){VAlignmentEnum=VAlignmentEnum.CENTER,FontColorEnum= ColorEnum.White },
+                    new ExcelColumn(value:"合計"){Colspan=2,VAlignmentEnum=VAlignmentEnum.CENTER,FontColorEnum= ColorEnum.White},
                 }
             };
             slist.Add(header3);
@@ -1000,15 +1000,15 @@ namespace REBORN.Services.DMCService
             {
                 ExcelRows = new List<ExcelColumn>(30)
                 {
-                    new ExcelColumn(value:"日程"){Colspan=2, VAlignmentEnum=VAlignmentEnum.CENTER, SelfBgColorIndex=1,FontColorEnum= ColorEnum.White },
-                    new ExcelColumn(value:"予約時刻"){VAlignmentEnum=VAlignmentEnum.CENTER ,SelfBgColorIndex=1,FontColorEnum= ColorEnum.White },
-                    new ExcelColumn(value:"レストラン名"){ VAlignmentEnum=VAlignmentEnum.CENTER ,SelfBgColorIndex = 1,FontColorEnum= ColorEnum.White },
-                    new ExcelColumn(value:"人数"){ VAlignmentEnum=VAlignmentEnum.CENTER ,SelfBgColorIndex = 1,FontColorEnum= ColorEnum.White },
-                    new ExcelColumn(value:"餐标"){ VAlignmentEnum=VAlignmentEnum.CENTER ,SelfBgColorIndex = 1,FontColorEnum= ColorEnum.White },
-                    new ExcelColumn(value:"返佣"){ VAlignmentEnum=VAlignmentEnum.CENTER ,SelfBgColorIndex = 1,FontColorEnum= ColorEnum.White },
-                    new ExcelColumn(value:"食事場所"){Colspan=2, VAlignmentEnum=VAlignmentEnum.CENTER,SelfBgColorIndex = 1,FontColorEnum= ColorEnum.White  },
-                    new ExcelColumn(value:"TEL"){VAlignmentEnum=VAlignmentEnum.CENTER ,SelfBgColorIndex = 1 ,FontColorEnum= ColorEnum.White},
-                    new ExcelColumn(value:"連絡欄"){Colspan=3,VAlignmentEnum=VAlignmentEnum.CENTER ,   SelfBgColorIndex = 1 ,FontColorEnum= ColorEnum.White},
+                    new ExcelColumn(value:"日程"){Colspan=2, VAlignmentEnum=VAlignmentEnum.CENTER,FontColorEnum= ColorEnum.White },
+                    new ExcelColumn(value:"予約時刻"){VAlignmentEnum=VAlignmentEnum.CENTER,FontColorEnum= ColorEnum.White },
+                    new ExcelColumn(value:"レストラン名"){ VAlignmentEnum=VAlignmentEnum.CENTER,FontColorEnum= ColorEnum.White },
+                    new ExcelColumn(value:"人数"){ VAlignmentEnum=VAlignmentEnum.CENTER,FontColorEnum= ColorEnum.White },
+                    new ExcelColumn(value:"餐标"){ VAlignmentEnum=VAlignmentEnum.CENTER,FontColorEnum= ColorEnum.White },
+                    new ExcelColumn(value:"返佣"){ VAlignmentEnum=VAlignmentEnum.CENTER,FontColorEnum= ColorEnum.White },
+                    new ExcelColumn(value:"食事場所"){Colspan=2, VAlignmentEnum=VAlignmentEnum.CENTER,FontColorEnum= ColorEnum.White  },
+                    new ExcelColumn(value:"TEL"){VAlignmentEnum=VAlignmentEnum.CENTER ,FontColorEnum= ColorEnum.White},
+                    new ExcelColumn(value:"連絡欄"){Colspan=3,VAlignmentEnum=VAlignmentEnum.CENTER ,FontColorEnum= ColorEnum.White},
                 }
             };
             slist.Add(header7);

REBORN.WebApi/packages.config

@@ -3,9 +3,11 @@
   <package id="Antlr" version="3.4.1.9004" targetFramework="net461" />
   <package id="bootstrap" version="3.0.0" targetFramework="net461" />
   <package id="BouncyCastle.Crypto.dll" version="1.8.1" targetFramework="net461" />
-  <package id="BouncyCastle.Cryptography" version="2.2.1" targetFramework="net461" />
+  <package id="BouncyCastle.Cryptography" version="2.4.0" targetFramework="net461" />
   <package id="DnsClient" version="1.0.7" targetFramework="net461" />
+  <package id="Enums.NET" version="5.0.0" targetFramework="net461" />
   <package id="EnyimMemcached" version="2.16.0" targetFramework="net461" />
+  <package id="ExtendedNumerics.BigDecimal" version="2025.1001.2.129" targetFramework="net461" />
   <package id="FluentScheduler" version="5.3.0" targetFramework="net461" />
   <package id="Flurl" version="4.0.0" targetFramework="net461" />
   <package id="Flurl.Http" version="4.0.2" targetFramework="net461" />
@@ -14,6 +16,7 @@
   <package id="jQuery.Validation" version="1.11.1" targetFramework="net461" />
   <package id="JWT" version="4.0.0" targetFramework="net461" />
   <package id="log4net" version="2.0.8" targetFramework="net461" />
+  <package id="MathNet.Numerics.Signed" version="5.0.0" targetFramework="net461" />
   <package id="Memcached.ClientLibrary" version="1.0" targetFramework="net461" />
   <package id="Microsoft.AspNet.Cors" version="5.2.4" targetFramework="net461" />
   <package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net461" />
@@ -42,6 +45,7 @@
   <package id="Microsoft.Extensions.Logging.Abstractions" version="2.0.2" targetFramework="net461" />
   <package id="Microsoft.Extensions.Options" version="2.0.2" targetFramework="net461" />
   <package id="Microsoft.Extensions.Primitives" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.IO.RecyclableMemoryStream" version="3.0.1" targetFramework="net461" />
   <package id="Microsoft.jQuery.Unobtrusive.Validation" version="3.2.3" targetFramework="net461" />
   <package id="Microsoft.Net.Compilers" version="1.0.0" targetFramework="net461" developmentDependency="true" />
   <package id="Microsoft.Net.Http.Headers" version="2.2.0" targetFramework="net461" />
@@ -56,23 +60,35 @@
   <package id="MongoDB.Driver.GridFS" version="2.6.0" targetFramework="net461" />
   <package id="MySql.Data" version="6.9.12" targetFramework="net461" />
   <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net461" />
-  <package id="NPOI" version="2.4.0" targetFramework="net461" />
+  <package id="NPOI" version="2.7.4" targetFramework="net461" />
   <package id="Owin" version="1.0" targetFramework="net461" />
   <package id="Portable.BouncyCastle" version="1.9.0" targetFramework="net461" />
   <package id="REBORN.Cache" version="1.1.2" targetFramework="net461" />
-  <package id="SharpZipLib" version="0.86.0" targetFramework="net461" />
+  <package id="SharpZipLib" version="1.4.2" targetFramework="net461" />
+  <package id="SixLabors.Fonts" version="1.0.1" targetFramework="net461" />
+  <package id="SixLabors.ImageSharp" version="2.1.10" targetFramework="net461" />
   <package id="SKIT.FlurlHttpClient.Common" version="2.5.0" targetFramework="net461" />
   <package id="StackExchange.Redis" version="1.2.6" targetFramework="net461" />
   <package id="swiftpass.utils" version="1.0.2" targetFramework="net461" />
   <package id="System.Buffers" version="4.5.1" targetFramework="net461" />
+  <package id="System.Formats.Asn1" version="8.0.1" targetFramework="net461" />
   <package id="System.Memory" version="4.5.5" targetFramework="net461" />
   <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net461" />
   <package id="System.Reflection.Emit" version="4.3.0" targetFramework="net461" />
   <package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net461" />
+  <package id="System.Security.AccessControl" version="6.0.0" targetFramework="net461" />
+  <package id="System.Security.Cryptography.Algorithms" version="4.3.1" targetFramework="net461" />
+  <package id="System.Security.Cryptography.Cng" version="5.0.0" targetFramework="net461" />
+  <package id="System.Security.Cryptography.Pkcs" version="8.0.1" targetFramework="net461" />
+  <package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net461" />
+  <package id="System.Security.Cryptography.Xml" version="8.0.2" targetFramework="net461" />
+  <package id="System.Security.Principal.Windows" version="5.0.0" targetFramework="net461" />
+  <package id="System.Text.Encoding.CodePages" version="5.0.0" targetFramework="net461" />
   <package id="System.Text.Encodings.Web" version="8.0.0" targetFramework="net461" />
   <package id="System.Text.Json" version="8.0.1" targetFramework="net461" />
   <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net461" />
   <package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
   <package id="WebGrease" version="1.5.2" targetFramework="net461" />
   <package id="WordSpinners" version="1.0.1" targetFramework="net461" />
+  <package id="ZString" version="2.6.0" targetFramework="net461" />
 </packages>
\ No newline at end of file