10001

BBWY.Server.Business/EvaluationAssistant/EvaluationAssistantBusiness.cs

@@ -299,7 +299,7 @@ namespace BBWY.Server.Business
 
             if (dbPromotionTask.GiftTemplateId != null && dbPromotionTask.GiftTemplateId != 0)
             {
-                giftTemplateSkuList = fsql.Select<GiftTemplateSku>(dbPromotionTask.GiftTemplateId).ToList(gs => new GiftTemplateSkuRequest()
+                giftTemplateSkuList = fsql.Select<GiftTemplateSku>().Where(gs=>gs.GiftTemplateId == dbPromotionTask.GiftTemplateId).ToList(gs => new GiftTemplateSkuRequest()
                 {
                     Logo = gs.Logo,
                     Price = gs.Price,

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);
                 }

PJZS/MainWindow.xaml

@@ -27,7 +27,7 @@
             <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="10,0,0,0"
                          TextBlock.Foreground="White">
                 <TextBlock Text="评价助手"/>
-                <TextBlock Text="v10000" Margin="5,0,0,0"/>
+                <TextBlock Text="v10001" Margin="5,0,0,0"/>
                 <TextBlock x:Name="txtUserName" Margin="5,0,0,0"/>
             </StackPanel>
         </Border>

PJZS/PJZS.csproj

@@ -4,6 +4,7 @@
     <OutputType>WinExe</OutputType>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <UseWPF>true</UseWPF>
+    <ApplicationIcon>pjzslogo.ico</ApplicationIcon>
   </PropertyGroup>
 
   <ItemGroup>
@@ -71,6 +72,7 @@
     <Content Include="Html\dist\static\js\vendor.734e8241e9563adaaa32.js.map">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="pjzslogo.ico" />
   </ItemGroup>
 
   <ItemGroup>