From 20955819699c1d3008c69aa772453741eb7cc619 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=95=BF=E6=B2=99=E7=82=8E=E8=B1=B9?= <yanbao@mini.local>
Date: Fri, 8 May 2026 19:48:10 +0800
Subject: [PATCH] lishi

---
 .DS_Store                                        | Bin 0 -> 8196 bytes
 .../InAppPurchseView/APInAppPurchseVC.swift      |  12 +++++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)
 create mode 100644 .DS_Store

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..2cfef30a5bb9642aa423698ecd91e09f78b3bebc
GIT binary patch
literal 8196
zcmeHLy>A>v6o1cg;yv3T>%<O@0kO(8NO6)2SXQhE<+#`)Cj>rxma%b?WA|=+S-hS(
z?XJIKS-KJ=no!X|PfI~VLrH@W4WdE(2}w%@Z$2*B*tZ1*5>aNXncv%)_j@z*8}G+E
z0Km$2>l(l$060`7x+B!|DRNxaV`aefj1nU80T|T4hZs`WKjv*atO8a6tAJI&Dqt1(
zKPW)&Y+0O~_r4yrtyRD(@IopepAQ~YiDiRbjq1@sjY<Is2dP^XvMCQx9M53cU{|A}
zQcRsaprN8kF;LTK+>`EvWrJOfnhvPxfM#Yi849Y|iRUSIz_Lc$S_P~E#}$yd`!Ku%
z9r}y1`Fk}I%^(s1jngfK7YVQYt%?fLmlNzJ9mDxP=tN<XmP)_jz=^?=r-qy%XT-T%
zzb|&{sh@5q6+d2=SIa^~LC^Msm5}W=-0@q2r+&y;tO#L?k;|QrLf#U)6|v1*iQ?Av
zfKzY^4fp)P!R*ZJv{yQu_73LWEKPeeZ_OSa7MzLV)f-EV&1j2@&(zuh%|irE>+2`&
z=VbNWS=ih$JHwxQJNwghdwVMkkBpvv>5Mye_T1R`*u=!d`IjdzOijJoaL)yPbF&@G
zHQy4Eh%3=HTW`l<tKRXOA#bmyY%i^c4_L!Jd&G5#weCIbTHf!F&-l|074F@bF|Oh*
zZfqnhUCr2Q4fjmaj71dHL=vW<;A?jhQoNe7tt#ITG~*7bz1WdM$qI`T!egA(H9wAh
z-e#5kyOAHTXpvV$nu;yyDWf$7uf<G8S`EpTdnw+0tR*d$-|HD~Xv2k~Ht4%^yk{B2
z;*U{R*~?sTRwxw9H8bSECHg0QA68%!9>7ER8oq@e;3xP49>HHYgctB4UcwoC8*k!m
ztm4Pm#QPZHr<y;|JMh;`JOh}J(f7c2>M@T5Z_~KsPC*j{guo$z2Hh$?U2noQn1d@+
zOK|y#EqnIpR!U&+*;{BJra0MK==Hua8*n`nb<WsxaCyo5@R#^@UUdBONc30!RrI_y
z%eQQH&7)AIbEwgNSIDa6tp+N@`zG_aa11YJ9{BEve*u<Yfo7VgGhd)twxIQ_n(Bd+
zone?={owbn_F0;q%3YP5CA*uEhriy#`pNY#0yke-wU;c5g4kjec>WbQp|>z8^Z$kX
z-~XTgjoKYp1*`(O3gF;;eO|t?dtXUMJ>^$`NA(k`vPi$KMn$1Uy2yT&juV=6T=jWo
htZcBWQBjGbsDwI`|IdF2$b6O9_rE*|TV6y3{sGT+b7cSk

literal 0
HcmV?d00001

diff --git a/AppleParty/AppleParty/AppListView/InAppPurchseView/APInAppPurchseVC.swift b/AppleParty/AppleParty/AppListView/InAppPurchseView/APInAppPurchseVC.swift
index b290d82..3f4ea45 100644
--- a/AppleParty/AppleParty/AppListView/InAppPurchseView/APInAppPurchseVC.swift
+++ b/AppleParty/AppleParty/AppListView/InAppPurchseView/APInAppPurchseVC.swift
@@ -194,19 +194,21 @@ extension APInAppPurchseVC {
     
     func handelExcel(_ excelFilePath: URL) {
         let iaps = IAPExcelParser.parser(excelFilePath)
-        
+        var newIAPs = iaps
+
         // 检查内购品项是否后台已经创建过
         if iapList.isNotEmpty {
             let pids = iaps.map { $0.productId }
-            let iaps = iapList.map { $0.vendorId }
-            let warns = pids.filter { iaps.contains($0) }
+            let vendorIds = Set(iapList.map { $0.vendorId })
+            let warns = pids.filter { vendorIds.contains($0) }
             if warns.isNotEmpty {
                 NSAlert.show("‼️警告：已经存在相同商品id的品项！请检查：\(warns)。\n⚠️提示：如果继续上传，将会覆盖已有品项的信息！")
             }
+            newIAPs = iaps.filter { !vendorIds.contains($0.productId) }
         }
         
         // 检查商品同名，苹果后台不允许存在同名
-        let iapNames = iaps.map { $0.name }
+        let iapNames = newIAPs.map { $0.name }
         let iapUniNames = Array(Set(iapNames))
         if iapNames.isNotEmpty, iapNames.count != iapUniNames.count {
             NSAlert.show("‼️警告：存在相同参考名字的商品！请检查~\n⚠️提示：如果继续上传，同名的商品只会有一个能创建成功！")
@@ -216,7 +218,7 @@ extension APInAppPurchseVC {
         let wc = sb.instantiateController(withIdentifier: "InputExcelList") as? NSWindowController
         let vc = wc?.contentViewController as? APUploadIAPListVC
         vc?.currentApp = currentApp
-        vc?.iaps = iaps
+        vc?.iaps = newIAPs
         wc?.showWindow(self)
     }