diff --git a/BBWY.Server.Business/EvaluationAssistant/EvaluationAssistantBusiness.cs b/BBWY.Server.Business/EvaluationAssistant/EvaluationAssistantBusiness.cs index 76b381d3..bf244c7a 100644 --- a/BBWY.Server.Business/EvaluationAssistant/EvaluationAssistantBusiness.cs +++ b/BBWY.Server.Business/EvaluationAssistant/EvaluationAssistantBusiness.cs @@ -299,7 +299,7 @@ namespace BBWY.Server.Business if (dbPromotionTask.GiftTemplateId != null && dbPromotionTask.GiftTemplateId != 0) { - giftTemplateSkuList = fsql.Select(dbPromotionTask.GiftTemplateId).ToList(gs => new GiftTemplateSkuRequest() + giftTemplateSkuList = fsql.Select().Where(gs=>gs.GiftTemplateId == dbPromotionTask.GiftTemplateId).ToList(gs => new GiftTemplateSkuRequest() { Logo = gs.Logo, Price = gs.Price, diff --git a/BBWY.Server.Business/PlatformSDK/JDBusiness.cs b/BBWY.Server.Business/PlatformSDK/JDBusiness.cs index c6671396..a570c6a4 100644 --- a/BBWY.Server.Business/PlatformSDK/JDBusiness.cs +++ b/BBWY.Server.Business/PlatformSDK/JDBusiness.cs @@ -794,7 +794,8 @@ namespace BBWY.Server.Business searchProductSkuRequest.Sku = request.MainProductSku; searchProductSkuRequest.CheckStep = "主商品"; mainProductSkuList = GetProductSkuList(searchProductSkuRequest); - + if (mainProductSkuList == null && mainProductSkuList.Any(s => s.ProductId != request.MainProductSpu)) + throw new BusinessException("主商品SKU归属有误"); //stepText = "添加主商品SKU"; //AddJDPromotionSku(jdClient, request.AppToken, promotionId, skuList, false); } diff --git a/PJZS/MainWindow.xaml b/PJZS/MainWindow.xaml index 7a8f5524..c4763bd4 100644 --- a/PJZS/MainWindow.xaml +++ b/PJZS/MainWindow.xaml @@ -27,7 +27,7 @@ - + diff --git a/PJZS/PJZS.csproj b/PJZS/PJZS.csproj index 6d4bc0e8..e41618b4 100644 --- a/PJZS/PJZS.csproj +++ b/PJZS/PJZS.csproj @@ -4,6 +4,7 @@ WinExe netcoreapp3.1 true + pjzslogo.ico @@ -71,6 +72,7 @@ PreserveNewest + diff --git a/PJZS/pjzslogo.ico b/PJZS/pjzslogo.ico new file mode 100644 index 00000000..a9e97398 Binary files /dev/null and b/PJZS/pjzslogo.ico differ