From 662c49d9b0676f77f88fe426ae1d0c81d61fe977 Mon Sep 17 00:00:00 2001 From: sanji Date: Sun, 3 Mar 2024 17:29:50 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E4=B8=8A=E6=9E=B6=E6=88=90=E5=8A=9F?= =?UTF-8?q?=E4=B9=8B=E5=90=8E=E7=AB=8B=E5=8D=B3=E5=90=8C=E6=AD=A5=E8=B5=A0?= =?UTF-8?q?=E5=93=81=E5=88=B0=E4=BA=A7=E5=93=81=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EvaluationAssistantBusiness.cs | 53 +++++++++++++++---- .../PlatformSDK/JDBusiness.cs | 3 +- .../Sync/ProductSyncBusiness.cs | 2 +- BBWY.Server.Model/Db/Product/ProductSku.cs | 5 ++ .../StartPromotionTaskResponse.cs | 5 +- 5 files changed, 55 insertions(+), 13 deletions(-) diff --git a/BBWY.Server.Business/EvaluationAssistant/EvaluationAssistantBusiness.cs b/BBWY.Server.Business/EvaluationAssistant/EvaluationAssistantBusiness.cs index a87021ca..261e6d58 100644 --- a/BBWY.Server.Business/EvaluationAssistant/EvaluationAssistantBusiness.cs +++ b/BBWY.Server.Business/EvaluationAssistant/EvaluationAssistantBusiness.cs @@ -1,6 +1,7 @@ using BBWY.Common.Extensions; using BBWY.Common.Http; using BBWY.Common.Models; +using BBWY.Server.Business.Sync; using BBWY.Server.Model; using BBWY.Server.Model.Db; using BBWY.Server.Model.Dto; @@ -32,10 +33,22 @@ namespace BBWY.Server.Business private List preTaskStateList; private ProductBusiness productBusiness; private FreeSqlMultiDBManager freeSqlMultiDBManager; + private ProductSyncBusiness productSyncBusiness; private char[] spliter; - public EvaluationAssistantBusiness(RestApiService restApiService, IOptions options, YunDingBusiness yunDingBusiness, IFreeSql fsql, IIdGenerator idGenerator, TaskSchedulerManager taskSchedulerManager, VenderBusiness venderBusiness, QYMessageCenterBusiness qyMessageCenterBusiness, NLogManager nLogManager, ProductBusiness productBusiness, FreeSqlMultiDBManager freeSqlMultiDBManager) : base(restApiService, options, yunDingBusiness) + public EvaluationAssistantBusiness(RestApiService restApiService, + IOptions options, + YunDingBusiness yunDingBusiness, + IFreeSql fsql, + IIdGenerator idGenerator, + TaskSchedulerManager taskSchedulerManager, + VenderBusiness venderBusiness, + QYMessageCenterBusiness qyMessageCenterBusiness, + NLogManager nLogManager, + ProductBusiness productBusiness, + FreeSqlMultiDBManager freeSqlMultiDBManager, + ProductSyncBusiness productSyncBusiness) : base(restApiService, options, yunDingBusiness) { this.fsql = fsql; @@ -47,6 +60,7 @@ namespace BBWY.Server.Business this.nLogManager = nLogManager; this.productBusiness = productBusiness; this.freeSqlMultiDBManager = freeSqlMultiDBManager; + this.productSyncBusiness = productSyncBusiness; validOrderStateList = new List() { Enums.OrderState.待出库, @@ -723,15 +737,6 @@ namespace BBWY.Server.Business pt.PreTaskId == -1)).Any(); if (!haveNextTask) { - //if (!string.IsNullOrEmpty(shop.PJZSDingDingKey) && !string.IsNullOrEmpty(shop.PJZSDingDingWebHook)) - //{ - // try - // { - // dingDingBusiness.SendDingDingBotMessage(shop.PJZSDingDingKey, shop.PJZSDingDingWebHook, $"评价助手\n店铺:{shop.ShopName}\n任务列表无后续任务,为避免空档请及时设置后续任务"); - // } - // catch { } - //} - try { qyMessageCenterBusiness.SendMessage(shop.TeamId, shop.TeamId, shop.ShopId, "PJZS", shop.ShopName, "任务列表无后续任务,为避免空档请及时设置后续任务", "NOTASK", "PJZS API", string.Empty); @@ -739,6 +744,34 @@ namespace BBWY.Server.Business catch { } } #endregion + + #region 立即同步赠品到产品库 + { + if (startResponse.GiftSkuList != null && startResponse.GiftSkuList.Count() > 0) + { + var insertGiftSkuList = startResponse.GiftSkuList.Select(x => new ProductSku() + { + Id = x.Id, + IsGift = true, + Logo = x.Logo, + Platform = Enums.Platform.京东, + Price = x.Price, + ProductId = x.ProductId, + ShopId = shopId, + State = x.State, + Title = x.Title, + CategoryId = x.Source.Value("categoryId"), + CategoryName = productSyncBusiness.GetCategoryName(shop, x.Source.Value("categoryId")), + CreateTime = x.CreateTime + }); + try + { + fsql.Insert(insertGiftSkuList).ExecuteAffrows(); + } + catch { } + } + } + #endregion } /// diff --git a/BBWY.Server.Business/PlatformSDK/JDBusiness.cs b/BBWY.Server.Business/PlatformSDK/JDBusiness.cs index c9b7a93d..fc7428e9 100644 --- a/BBWY.Server.Business/PlatformSDK/JDBusiness.cs +++ b/BBWY.Server.Business/PlatformSDK/JDBusiness.cs @@ -1620,7 +1620,8 @@ namespace BBWY.Server.Business { BrandName = brandName, JDPromotionId = promotionId, - DeleteGiftSkuList = giftSkuIdList + DeleteGiftSkuList = giftSkuIdList, + GiftSkuList = giftSkuList }; } catch (Exception ex) diff --git a/BBWY.Server.Business/Sync/ProductSyncBusiness.cs b/BBWY.Server.Business/Sync/ProductSyncBusiness.cs index 9ac8291f..9b603083 100644 --- a/BBWY.Server.Business/Sync/ProductSyncBusiness.cs +++ b/BBWY.Server.Business/Sync/ProductSyncBusiness.cs @@ -276,7 +276,7 @@ namespace BBWY.Server.Business.Sync } } - private string GetCategoryName(ShopResponse shop, string categoryId) + public string GetCategoryName(ShopResponse shop, string categoryId) { if (categoryCache.TryGetValue(categoryId, out string name)) return name; diff --git a/BBWY.Server.Model/Db/Product/ProductSku.cs b/BBWY.Server.Model/Db/Product/ProductSku.cs index 34580af0..e5969bb7 100644 --- a/BBWY.Server.Model/Db/Product/ProductSku.cs +++ b/BBWY.Server.Model/Db/Product/ProductSku.cs @@ -57,6 +57,11 @@ namespace BBWY.Server.Model.Db /// 1:业务团队 2:供应链 /// public int? Purchaser { get; set; } + + /// + /// 是否为赠品 + /// + public bool IsGift { get; set; } = false; } } diff --git a/BBWY.Server.Model/Dto/Response/PromotionTask/StartPromotionTaskResponse.cs b/BBWY.Server.Model/Dto/Response/PromotionTask/StartPromotionTaskResponse.cs index c3457e17..2000972a 100644 --- a/BBWY.Server.Model/Dto/Response/PromotionTask/StartPromotionTaskResponse.cs +++ b/BBWY.Server.Model/Dto/Response/PromotionTask/StartPromotionTaskResponse.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using BBWY.Server.Model.Db; +using System.Collections.Generic; namespace BBWY.Server.Model.Dto { @@ -9,6 +10,8 @@ namespace BBWY.Server.Model.Dto public long JDPromotionId { get; set; } public IList DeleteGiftSkuList { get; set; } + + public IList GiftSkuList { get; set; } } public class StartPromotionDelayTaskResponse From 05e850bfc54d502b553b7147da302341550a2f6b Mon Sep 17 00:00:00 2001 From: sanji Date: Mon, 4 Mar 2024 16:17:37 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=A3=80=E6=B5=8B?= =?UTF-8?q?=E7=8E=B0=E6=9C=89sku=E6=98=AF=E5=90=A6=E4=B8=BA=E8=B5=A0?= =?UTF-8?q?=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BBWY.Server.API/Controllers/TestController.cs | 6 +++ BBWY.Server.Business/TestBusiness.cs | 39 +++++++++++++++++++ 2 files changed, 45 insertions(+) diff --git a/BBWY.Server.API/Controllers/TestController.cs b/BBWY.Server.API/Controllers/TestController.cs index c05c2808..5099a92f 100644 --- a/BBWY.Server.API/Controllers/TestController.cs +++ b/BBWY.Server.API/Controllers/TestController.cs @@ -54,5 +54,11 @@ namespace BBWY.Server.API.Controllers { testBusiness.Test_20231221(); } + + [HttpPost] + public void UpdateSkuGift() + { + testBusiness.UpdateSkuGift(); + } } } diff --git a/BBWY.Server.Business/TestBusiness.cs b/BBWY.Server.Business/TestBusiness.cs index c8ed0a23..f8551db3 100644 --- a/BBWY.Server.Business/TestBusiness.cs +++ b/BBWY.Server.Business/TestBusiness.cs @@ -6,6 +6,7 @@ using BBWY.Server.Model.Db; using BBWY.Server.Model.Db.Mds; using BBWY.Server.Model.Dto; using FreeSql; +using Jd.Api.Request; using Microsoft.Extensions.Caching.Memory; using Microsoft.Extensions.Options; using Newtonsoft.Json; @@ -425,6 +426,44 @@ namespace BBWY.Server.Business Console.WriteLine(b["123"]); } + public void UpdateSkuGift() + { + var dbSkuIdList = fsql.Select().Where(ps => ps.IsGift == false).ToList(ps => ps.Id); + var ptList = fsql.Select().Where(pt => !string.IsNullOrEmpty(pt.GiftTemplatePutNewSku)).ToList(); + var giftSkuList = new List(); + var splitChar = new char[] { ',' }; + foreach (var pt in ptList) + { + giftSkuList.AddRange(pt.GiftTemplatePutNewSku.Split(splitChar, StringSplitOptions.RemoveEmptyEntries)); + } + var updateGiftSkuIdList = dbSkuIdList.Intersect(giftSkuList).ToList(); + + var updateList = new List(); + var index = 1; + foreach (var skuId in updateGiftSkuIdList) + { + updateList.Add(skuId); + if (updateList.Count() == 20) + { + fsql.Transaction(() => + { + fsql.Update(updateList).Set(ps => ps.IsGift, true).ExecuteAffrows(); + }); + updateList.Clear(); + Console.WriteLine($"update productsku gift {index}"); + index++; + } + } + if (updateList.Count() > 0) + { + fsql.Transaction(() => + { + fsql.Update(updateList).Set(ps => ps.IsGift, true).ExecuteAffrows(); + }); + updateList.Clear(); + Console.WriteLine($"last update productsku gift"); + } + } } From 8d7ab9cb2904f77d39c175dfceb67bfd2cc7fd2e Mon Sep 17 00:00:00 2001 From: sanji Date: Mon, 4 Mar 2024 18:27:43 +0800 Subject: [PATCH 3/9] 1 --- BBWY.Server.Business/TestBusiness.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/BBWY.Server.Business/TestBusiness.cs b/BBWY.Server.Business/TestBusiness.cs index f8551db3..e79231db 100644 --- a/BBWY.Server.Business/TestBusiness.cs +++ b/BBWY.Server.Business/TestBusiness.cs @@ -428,7 +428,8 @@ namespace BBWY.Server.Business public void UpdateSkuGift() { - var dbSkuIdList = fsql.Select().Where(ps => ps.IsGift == false).ToList(ps => ps.Id); + var dbSkuIdList = fsql.Select().Where(ps => ps.IsGift == false).ToList(ps => ps.Id); //非赠品sku + Console.WriteLine($"非赠品sku {dbSkuIdList.Count()}"); var ptList = fsql.Select().Where(pt => !string.IsNullOrEmpty(pt.GiftTemplatePutNewSku)).ToList(); var giftSkuList = new List(); var splitChar = new char[] { ',' }; @@ -436,7 +437,10 @@ namespace BBWY.Server.Business { giftSkuList.AddRange(pt.GiftTemplatePutNewSku.Split(splitChar, StringSplitOptions.RemoveEmptyEntries)); } + Console.WriteLine($"pjzs任务赠品sku {giftSkuList.Count()}"); + var updateGiftSkuIdList = dbSkuIdList.Intersect(giftSkuList).ToList(); + Console.WriteLine($"两者交集 Intersect {updateGiftSkuIdList.Count()}"); var updateList = new List(); var index = 1; From 467b88339b1185842cd1ac21dad02bec4c093b46 Mon Sep 17 00:00:00 2001 From: sanji Date: Tue, 19 Mar 2024 18:41:07 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E9=99=90=E5=88=B6=E5=BA=97=E9=93=BA?= =?UTF-8?q?=E8=AE=A2=E9=98=85=E5=BF=AB=E9=80=92100?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Sync/JD/JDServiceOrderSyncBusiness.cs | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/BBWY.Server.Business/Sync/JD/JDServiceOrderSyncBusiness.cs b/BBWY.Server.Business/Sync/JD/JDServiceOrderSyncBusiness.cs index 4d9096f7..7326bdf7 100644 --- a/BBWY.Server.Business/Sync/JD/JDServiceOrderSyncBusiness.cs +++ b/BBWY.Server.Business/Sync/JD/JDServiceOrderSyncBusiness.cs @@ -25,6 +25,7 @@ namespace BBWY.Server.Business.Sync private IList kuaiDi100PushStateList_qianshou; private IList kuaiDi100PushStateList_paijian; private Dictionary processResultDic; + private List subscribeKD100ShopNames; public JDServiceOrderSyncBusiness(RestApiService restApiService, IOptions options, NLogManager nLogManager, IFreeSql fsql, IIdGenerator idGenerator, TaskSchedulerManager taskSchedulerManager, VenderBusiness venderBusiness, YunDingBusiness yunDingBusiness) : base(restApiService, options, nLogManager, fsql, idGenerator, taskSchedulerManager, venderBusiness, yunDingBusiness) @@ -92,6 +93,14 @@ huitongkuaidi 百世快递 { 90,Enums.ServiceResult.线下换新}, { 110,Enums.ServiceResult.商品补发} }; + subscribeKD100ShopNames = new List() + { +"知礼家居专营店", +"墨森玩具专营店", +"可优车品专营店", +"灵动母婴玩具专营店", +"佳尤汽车用品专营店" + }; } public void SyncServiceOrder() @@ -164,7 +173,7 @@ huitongkuaidi 百世快递 var isTuiHuoCang = false; Enums.ServiceResult? serviceResult = null; #region 待收货服务单，检查是否需要订阅快递100 - if (status == Enums.ServiceOrderState.待收货) + if (status == Enums.ServiceOrderState.待收货 && subscribeKD100ShopNames.Contains(shop.ShopName)) { try { From 862024bfbe998c1d461bd399a783d0873e861251 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A3=9E=E9=B1=BC?= <506583276@qq.com> Date: Wed, 20 Mar 2024 18:35:11 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E5=B0=81=E7=AE=B1=E7=AD=96=E7=95=A5?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=89=93=E5=8D=B0=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/SealBox/SealBoxPolicyDetailsWindow.xaml | 9 ++++++--- .../Views/SealBox/SealBoxPolicyDetailsWindow.xaml.cs | 4 ++++ .../Views/SealBox/SealBoxPrintDetailsWindow.xaml.cs | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/BBWY.Client/Views/SealBox/SealBoxPolicyDetailsWindow.xaml b/BBWY.Client/Views/SealBox/SealBoxPolicyDetailsWindow.xaml index a8331b12..5eec4ee6 100644 --- a/BBWY.Client/Views/SealBox/SealBoxPolicyDetailsWindow.xaml +++ b/BBWY.Client/Views/SealBox/SealBoxPolicyDetailsWindow.xaml @@ -34,15 +34,18 @@ --> - + - + - + + + + diff --git a/BBWY.Client/Views/SealBox/SealBoxPolicyDetailsWindow.xaml.cs b/BBWY.Client/Views/SealBox/SealBoxPolicyDetailsWindow.xaml.cs index f4b0818a..e789ee35 100644 --- a/BBWY.Client/Views/SealBox/SealBoxPolicyDetailsWindow.xaml.cs +++ b/BBWY.Client/Views/SealBox/SealBoxPolicyDetailsWindow.xaml.cs @@ -33,6 +33,7 @@ namespace BBWY.Client.Views.SealBox WareName = wareName; AcceptUserName = acceptUserName; SealBoxId = sealBoxId; + NowDateTime = DateTime.Now; this.UpdateLayout(); } @@ -47,6 +48,7 @@ namespace BBWY.Client.Views.SealBox public string AcceptUserName { get; set; } + public DateTime? NowDateTime { get; set; } public long SealBoxId { get; set; } public void PrintBox(string printName) @@ -62,6 +64,8 @@ namespace BBWY.Client.Views.SealBox System.Windows.MessageBox.Show("打印机处于错误状态"); return; } + NowDateTime = DateTime.Now; + this.UpdateLayout(); MyPrintHelper.SetDefaultPrint(printName);//设置默认打印机 PrintDialog printDialog = new PrintDialog(); printDialog.PrintTicket.PageOrientation = PageOrientation.Portrait;//设置为横向打印 PageOrientation.Landscape Portrait为纵向 diff --git a/BBWY.Client/Views/SealBox/SealBoxPrintDetailsWindow.xaml.cs b/BBWY.Client/Views/SealBox/SealBoxPrintDetailsWindow.xaml.cs index 64d83d56..4bfe36b3 100644 --- a/BBWY.Client/Views/SealBox/SealBoxPrintDetailsWindow.xaml.cs +++ b/BBWY.Client/Views/SealBox/SealBoxPrintDetailsWindow.xaml.cs @@ -169,7 +169,7 @@ namespace BBWY.Client.Views.SealBox App.Current.Dispatcher.Invoke(new Action(() => { SealBoxPolicyDetailsWindow policyDetailsWindow = new SealBoxPolicyDetailsWindow(sealBoxSkus, SealBoxModel.ShopName, SealBoxModel.WareName, SealBoxModel.SealBoxId, SealBoxModel.AcceptUserName); - //policyDetailsWindow.Show(); + policyDetailsWindow.PrintBox(PrintName); })); From bcc11228c47e27e035baf51aaf9e9af1dd71af77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A3=9E=E9=B1=BC?= <506583276@qq.com> Date: Wed, 20 Mar 2024 18:35:50 +0800 Subject: [PATCH 6/9] 10233 --- BBWY.Client/GlobalContext.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BBWY.Client/GlobalContext.cs b/BBWY.Client/GlobalContext.cs index 9978f5d2..57c63914 100644 --- a/BBWY.Client/GlobalContext.cs +++ b/BBWY.Client/GlobalContext.cs @@ -13,7 +13,7 @@ namespace BBWY.Client { ShopServiceGroupList = new List(); ShopServiceGroupLowerList = new List(); - ClientVersion = "10232"; + ClientVersion = "10233"; } From 188fb863118738b75f3ff4ef5e1103a9fbb48261 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A3=9E=E9=B1=BC?= <506583276@qq.com> Date: Wed, 20 Mar 2024 19:51:11 +0800 Subject: [PATCH 7/9] 10234 --- BBWY.Client/GlobalContext.cs | 2 +- BBWY.Client/Views/SealBox/SealBoxPolicyDetailsWindow.xaml | 8 ++++---- .../Views/SealBox/SealBoxPrintDetailsWindow.xaml.cs | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/BBWY.Client/GlobalContext.cs b/BBWY.Client/GlobalContext.cs index 57c63914..ad6034e0 100644 --- a/BBWY.Client/GlobalContext.cs +++ b/BBWY.Client/GlobalContext.cs @@ -13,7 +13,7 @@ namespace BBWY.Client { ShopServiceGroupList = new List(); ShopServiceGroupLowerList = new List(); - ClientVersion = "10233"; + ClientVersion = "10234"; } diff --git a/BBWY.Client/Views/SealBox/SealBoxPolicyDetailsWindow.xaml b/BBWY.Client/Views/SealBox/SealBoxPolicyDetailsWindow.xaml index 5eec4ee6..4d3e8ec2 100644 --- a/BBWY.Client/Views/SealBox/SealBoxPolicyDetailsWindow.xaml +++ b/BBWY.Client/Views/SealBox/SealBoxPolicyDetailsWindow.xaml @@ -34,16 +34,16 @@ --> - + - + - + - + diff --git a/BBWY.Client/Views/SealBox/SealBoxPrintDetailsWindow.xaml.cs b/BBWY.Client/Views/SealBox/SealBoxPrintDetailsWindow.xaml.cs index 4bfe36b3..7eceb3e4 100644 --- a/BBWY.Client/Views/SealBox/SealBoxPrintDetailsWindow.xaml.cs +++ b/BBWY.Client/Views/SealBox/SealBoxPrintDetailsWindow.xaml.cs @@ -169,8 +169,8 @@ namespace BBWY.Client.Views.SealBox App.Current.Dispatcher.Invoke(new Action(() => { SealBoxPolicyDetailsWindow policyDetailsWindow = new SealBoxPolicyDetailsWindow(sealBoxSkus, SealBoxModel.ShopName, SealBoxModel.WareName, SealBoxModel.SealBoxId, SealBoxModel.AcceptUserName); - - policyDetailsWindow.PrintBox(PrintName); + policyDetailsWindow.Show(); + //policyDetailsWindow.PrintBox(PrintName); })); } From faa2323e253f746fa6fd2c477cf1e90ad9a70899 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A3=9E=E9=B1=BC?= <506583276@qq.com> Date: Wed, 20 Mar 2024 19:52:57 +0800 Subject: [PATCH 8/9] 1 --- BBWY.Client/Views/FallWare/PrintLSOrderWindow.xaml.cs | 3 --- BBWY.Client/Views/SealBox/SealBoxPrintDetailsWindow.xaml.cs | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/BBWY.Client/Views/FallWare/PrintLSOrderWindow.xaml.cs b/BBWY.Client/Views/FallWare/PrintLSOrderWindow.xaml.cs index 06600b46..18e6b210 100644 --- a/BBWY.Client/Views/FallWare/PrintLSOrderWindow.xaml.cs +++ b/BBWY.Client/Views/FallWare/PrintLSOrderWindow.xaml.cs @@ -156,9 +156,6 @@ namespace BBWY.Client.Views.FallWare //lSAcceptOrderWindow.Show(); lSAcceptOrderWindow.PrintLSOrder(PrintName); }); - - //SealBoxPolicyDetailsWindow policyDetailsWindow = new SealBoxPolicyDetailsWindow(sealBoxSkus, SealBoxModel.ShopName, SealBoxModel.WareName, SealBoxModel.SealBoxId); - //policyDetailsWindow.PrintBox(PrintName); } } } diff --git a/BBWY.Client/Views/SealBox/SealBoxPrintDetailsWindow.xaml.cs b/BBWY.Client/Views/SealBox/SealBoxPrintDetailsWindow.xaml.cs index 7eceb3e4..64d83d56 100644 --- a/BBWY.Client/Views/SealBox/SealBoxPrintDetailsWindow.xaml.cs +++ b/BBWY.Client/Views/SealBox/SealBoxPrintDetailsWindow.xaml.cs @@ -169,8 +169,8 @@ namespace BBWY.Client.Views.SealBox App.Current.Dispatcher.Invoke(new Action(() => { SealBoxPolicyDetailsWindow policyDetailsWindow = new SealBoxPolicyDetailsWindow(sealBoxSkus, SealBoxModel.ShopName, SealBoxModel.WareName, SealBoxModel.SealBoxId, SealBoxModel.AcceptUserName); - policyDetailsWindow.Show(); - //policyDetailsWindow.PrintBox(PrintName); + //policyDetailsWindow.Show(); + policyDetailsWindow.PrintBox(PrintName); })); } From 9b5146432dbd418cdb7ebd8ca7cf647fe8ba285e Mon Sep 17 00:00:00 2001 From: sanji Date: Wed, 20 Mar 2024 21:54:01 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E6=81=A2=E5=A4=8D=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=8D=95=E8=AE=A2=E9=98=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BBWY.Server.Business/Sync/JD/JDServiceOrderSyncBusiness.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BBWY.Server.Business/Sync/JD/JDServiceOrderSyncBusiness.cs b/BBWY.Server.Business/Sync/JD/JDServiceOrderSyncBusiness.cs index 7326bdf7..880b720f 100644 --- a/BBWY.Server.Business/Sync/JD/JDServiceOrderSyncBusiness.cs +++ b/BBWY.Server.Business/Sync/JD/JDServiceOrderSyncBusiness.cs @@ -173,7 +173,7 @@ huitongkuaidi 百世快递 var isTuiHuoCang = false; Enums.ServiceResult? serviceResult = null; #region 待收货服务单，检查是否需要订阅快递100 - if (status == Enums.ServiceOrderState.待收货 && subscribeKD100ShopNames.Contains(shop.ShopName)) + if (status == Enums.ServiceOrderState.待收货) //&& subscribeKD100ShopNames.Contains(shop.ShopName) { try {