From dfa78f9d053d251666832026e327f46428eee45f Mon Sep 17 00:00:00 2001
From: shanji <18996038927@163.com>
Date: Tue, 10 Jan 2023 19:05:01 +0800
Subject: [PATCH] 10001

---
 .../EvaluationAssistantBusiness.cs               |   2 +-
 BBWY.Server.Business/PlatformSDK/JDBusiness.cs   |   3 ++-
 PJZS/MainWindow.xaml                             |   2 +-
 PJZS/PJZS.csproj                                 |   2 ++
 PJZS/pjzslogo.ico                                | Bin 0 -> 9662 bytes
 5 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 PJZS/pjzslogo.ico

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<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,
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 @@
             <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>
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 @@
     <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>
diff --git a/PJZS/pjzslogo.ico b/PJZS/pjzslogo.ico
new file mode 100644
index 0000000000000000000000000000000000000000..a9e9739826f909da002ea69b98f09ec2fae632fd
GIT binary patch
literal 9662
zcmeHKYiv_x7(Q)BN1eba6BukjmCLv}s{#%~LSrO^AA}O4k$}+14-tvZL?wWcPHx5x
zSd_RL4Qp#4WSd*J1+o~}&Sb!bLd!M7R(D`?FgilTA40P2_`Ij*8z;?_0y$er`ZiCW
z@A7`{`+S%4otEQt_*ktRzAfCrDI7PN<G5)6nm7kQ?XpddQt~^w0?8Ffu0ZSx)Eo@2
z_|Y3Ktnh~G%Sytw*!~2r+o4T(GL82ydd1O#IY@+xAHp9cux66R1McC&MvBgj6+ad4
zJ|mg=F~0Fx(;M#1p>tt^&VgPpfft`!*vzytHX4T>nxDI@F<QUTTDtGrs05pXL$5cq
zt##}=$uz6kTO5o)Z|f)Td*r#5d&9m2(qHt1X?SRFK~qqzIkud?v9eaD)8BR%2d`6K
zxwkWakmq1Q{=np?txd67|EoT4?vexih*9VJ`aPY?25Am<<Q3mo_HkXG7Uhn)Up?KN
zQ9W<YlA}?-8(ozp*JvFE(u#~jQZH@WTyy$<TKntw7Ki@P>2!g$j>6+g|Iq;w&m)hJ
zIc~}kuPYetPg}fgpKq+H!?SR8Z$a}PG^X4W-ZcPo5Rk(`@6vd6{-58{#qU;{h7Joc
zpK?#vN)6{=LF`tFU*_p_vYd=xwXLXS<p<%c%&B#=roAjEWA2u_Z_cC~8W^3O0L3jW
zZ8Nbw@O*Pw95ZUdsc{*T&OC^2=IeEZdgxhNv+9c@a+@dItbukGvK|Gxcerv-XU^8m
zRShXA#tz&3<<(5j!|+#MHl0OCapz};FVT44{;qwLLj$uSrU+PoJp2odxW29kgf8?*
zkBV(uT+ODTX_rr*?21sV-!Jqaz9!~C)CfR(!6TPjt-Wl2W6SiZImgs(@s?kjv!G#G
zc1|Pn|Lvkg>!pPiA*h=IxB4X>Yvre$E0?bmaIZhoo|sH&EqUwnl{xhKD2GPoM_dQR
zE-E;XGwGS^Iy3*2|MZEjzu5Xc3?Dswx!qt$X{U1(ywDS%_!^l7aYeuZ1jddXzvp4}
z_BSRob3(KHTwUy;eb&<K2rdB*N)kdoria##&hoRfW}jkh@iOVBXPL#N*cuwGk(<S*
zJ*Q`w@-JTWdVRc_ncv&1KBW8q7O)ziGnxlzZFCpOc}AyatfTWw_aW0153~J39Qj^T
z1oL1~DQiiTht|vo_zSj|ycw&R_Jk1IPIb0l7`p{fn*|k7-JoIFhS)R*nhO^^-{WLj
zNgwUWcf~a!*2egQ_wtYF_4=zAVxw^?vm1>m9jHsHHm!?JB%nQzEp)M4U^?q-gST0k
z_{_<hQqIiTbk^yNTjT-vzKYD|;bLudVVBW3<OG_n_qsGMRU$(kU;zSqcbE3PPnmw)
z@omcevIjnDqrD5{&Yf|-<=lR$L-a{$X{J+Xv#FglE|Z2<Km_dc8vwd*G40!(t|sNY
z*wL>xo57%O`*hRlv!t8BY#tVXlU40F0A<P-0eH%#%%LQAj!i(7&P%Kwr^%Fh{cv^R
zb*5Y4+wdL8^N)0W=0GU`*cDK@1mFQ?R2F8;uv}v2MXi6w)^~nJzmGW&0^5<3o`+k2
z15le4mB{*auboqCR+pzv&N>GliZPf*`Q0%B@={U^?T4xg+SPhv%jxMONI%VUFwKJG
zB0$UozKo3Ye$Pv+{uiFl{uTaCV6e>r0U`l+%-@?fyj2RVt+9Gz>&F{h^c#-GC4$k~
zTL2qC&qRdoMm5Ha9@*$C+wn`^Jg)e5!cPEfKq4BQ?F9;GeoF!I`)@b6{uC?MpiCwL
z7T|F)niIYM1V99efXC5jUuZ5#ORhk21(GZ9*sOpg8-94-m#@Hs{G3tl<+jN6Zf=3h
zcNC6r6Xm+VjgZ;NrOM1jxtrq*R0r#b?_#CY-0j34`)EG`a$GO^CxRu5!gxc-b@<8L
zsBi~|gz&?^h^534PUk1S<239c?iNy0iF>&$g>z+=_&j-><P@TO%o*it(Rh-ma75ud
ZTy&fyWK%pz>W%tKQc1LqCb>N>{ufDpA`Som

literal 0
HcmV?d00001