From 3149d804564169a15eb5495ee64a5b61251d9a1e Mon Sep 17 00:00:00 2001 From: super <2903208875@qq.com> Date: Tue, 7 Apr 2026 17:57:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=90=8E=E5=8F=B0=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../__pycache__/approve.cpython-312.pyc | Bin 0 -> 37263 bytes .../__pycache__/del_brand.cpython-312.pyc | Bin 23701 -> 24159 bytes app/amazon/__pycache__/main.cpython-312.pyc | Bin 26386 -> 28113 bytes .../service/ProductRiskTaskService.java | 104 +++++++++++++++++- .../model/dto/ShopManageCreateRequest.java | 3 + .../model/dto/ShopManageUpdateRequest.java | 3 + .../model/entity/ShopManageEntity.java | 3 + .../model/vo/ShopManageCredentialVo.java | 1 + .../shopkey/model/vo/ShopManageItemVo.java | 1 + .../shopkey/service/ShopManageService.java | 6 + .../db/V16__add_mall_name_to_shop_manage.sql | 17 +++ backend/__pycache__/config.cpython-312.pyc | Bin 1510 -> 1510 bytes .../__pycache__/admin_api.cpython-312.pyc | Bin 55936 -> 56359 bytes backend/blueprints/admin_api.py | 5 + backend/config.py | 4 +- backend/web_source/admin.html | 33 ++++-- .../brand/components/BrandProductRiskTab.vue | 10 ++ 17 files changed, 173 insertions(+), 17 deletions(-) create mode 100644 app/amazon/__pycache__/approve.cpython-312.pyc create mode 100644 backend-java/src/main/resources/db/V16__add_mall_name_to_shop_manage.sql diff --git a/app/amazon/__pycache__/approve.cpython-312.pyc b/app/amazon/__pycache__/approve.cpython-312.pyc new file mode 100644 index 0000000000000000000000000000000000000000..48da58cb7a916f790645718fecaef95a04e6594e GIT binary patch literal 37263 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 literal 0 HcmV?d00001 diff --git a/app/amazon/__pycache__/del_brand.cpython-312.pyc b/app/amazon/__pycache__/del_brand.cpython-312.pyc index 96fe63e014468a1f39f24325630b6e875c97f114..093aca317de18d883c8e2dc2f7e3a755bc2f0acb 100644 GIT binary patch delta 3165 zcma);eQ*=U6~K3OcakOB@`sEiSw@mS5D_uv(-@2c*fR15!Nr&iu}CmNcbEeqyL%GG zeAK2f)07w@vH{wJCZR&*M86vGJ4ibOU0)f|H-hO)Cx=E%@t0)8FgXpjsrR^&&A{ z$~?t^0YbhkDO)sdeFh=&hL|B{idkazG0tZaO}-orl8j=`DV(&#h>f!()A-moMVhi@ zX7b%+N)t1DW^szoBIf$6%(4s>Otw;G$ui;0#!ME`{v~gzTSwWm6? zY5M#zO)B-IE}xd?ih6E3T>U>BnEpY@$&$0mjTwtCdWN_Qb@3TBLrw7+-s_H9dN{Sn zV`j4+DdlYOA6FZzE$DKV7HH8g=ef&;)yA56nk%z08(f*EUyg(;m8!fHGx;jwnLdE& zSVc}OBW)FrU35d{Aa01+vKHd(W6bAKv>S_9Jxvx-Ll0`5boL7dEk+@Y$iq-03iLqs zEc*Kw^i12ObEnWxvUe5R!+vG!Ryi1S&f4Uh6?V>&w>g!tpM)i%X4uYr( z9o=hcaJ4Z}S<1k2XGCeHsJMUWP20>@pTCu6e7*js_1AM3|0S(5Hf&nO<;{m_uxYXo zun15Ac#bxjz0bKoTmk@pWElXul9&KhfNFpTPy>K7Md|@w8aGc(Z2)lv;CcElb1mK; ztFru4&=Ut!xl>6Qt+p5A1+>lH*Img}i8ML1MGAx)l={%7_NPY%&ej5206xGvz{`O3 z42|wg@_msfbh0AKZE~2fn{9I7CP?L^Elt`8ylACShq-(+6BBw_=^*lUf1ry%s>v2m zYPTdK-T<0On}(sE-gYd(hhkHmJ2d!e>`37+afVTebVy_)Y421dvV8$vUR+iTv5yK2 z?6{CQ?3oahFp)dR6!78&xad2@h2zD(R$Mdf&rGZAW#~a)*&LtSO5?WD>$8^Lur2%C z=8fCDL&^=?idgBiTp_Q6Sw-L$8yP%0N(YC}9T++Dvyo#1q@Avx@#W%I*c;La*a)xy z)HT&=ZiitPAeSML8VI&4QmYbfClbp|_}Nn2OHVv2<6E)x5<%!L1Iq$f{He{yBNQ^_-P^6EE0EKk;n=@cEq)A)Y%&LZzN_=^27>WjshTcs#f8d1gj*M=%dHy z7vp*K+Wbmwl)VXX>Q$0oX4l{fy14uYW~f1elY$b_f+W1Ss%lLgJ7UMn=i(^+w7dkr zM)5)iuBHVG&l?kIle>%FS-8GV%^UPovc&L_C+Xmd56Y~`)RL<;hW<+yT5X6oU|+(_LT-QUKtsH^`~hO}n4JzU>c#m~u9)iW;@v_b zwQ8Gx+s^h-wO^4Uvze>m!M8?Fo*wPlf0rH@zI1Hl-NAdmx$yUkeItGQMxv*N&-Dxs zzCGIW*1b0e?jAXRH+DGoRmD3gEF0aPe`7~%SIuAX8nrti$>bLd2|g_C2$LUyC6rW%RHjhfRIZpeeuuGde z<#1rL9BT8lM?&miO3F*Iw`)JrbT_)SenCvTG%H} zfy=ZPeZg0Z@hw=e4k!XB*g^`abT|G@yzZM!ccBiYYt=2+yOs;~}L=DI_ zHcSX|s3Q_i2*e+1lhm~mI+68tn61vUr=s4=?i95g3Er>BA@T>B-<*d_X?b%!{!?sk z^Ii@+D7UsAU#2V9?wSjma%;%Puo?vB)+b|7H}dV}AIC)>t$h^_(^p>n(yx1J;r%`s#vegABn~?JM=0+Y3V@Ks}UjnIv=pwH3Qa9Q4p?39ZuEszd_h zn?2lscj{q*Z(f2^wnmcsx(zQ*)7Ets!{3+)ouydm-gTAkDgj&nfq)O|3@>49jg~w_ Y@O)U!RbW$e#Y4m%V>>bZV%^360#}j(4gdfE delta 2656 zcmZ{leQZvx5m&;E0Z*B5Jb#u=-x1av;+#|0{D{Exup+^Z} zFUl_2Ef>gzKQ+bI%4^~tfhcZy?L5Urgiyl!h048t+^cv;H|FP7Q}L{{OQZgrSC}xvwMrZ91d#qD z7EPH)3((PO*<8YPk4aNfKbbPG?p2UX;mW2F!p>1*BT(om6EXzc#X;~{pA)?+b~;y9 zro`1&lENVAC*QDSreu)+WyMKy#571I=}H@wpwjj)E5j4m6}7_?_Fa;wrN`6^oUuPj zE%1iD(rs0aD8uPQ=AdTbYVc2ct4-v|ogqu!BB*l=xB}%@S}wF)Y@6G%7}x~AaD*g> zEx07u;bX@RSE%yJu?xp8PS5>dF|-9*ofX@P`0RhQdT#4Pdvk|GuD3~?HzZpuY`Rg{ z-W)3s7MzrK77A>!pt#^SP=Qduc7!@^`jGP;5jrA(|0u5gtSf zq7~7G*oJ6F>_BwD@BF2XP87Qk-Eha>MYUXG$-hP0ZM;xX2ipQop$M&kr$c9^8~Bj! zR8yl$GSj2&Onra+!JeV9e#9QclZfvj1`%$kzn$b;TN@|tko@reE zbx5lM!HK;bQ76M{*X>$noGHU9dWh$%+f*&h)MpaOER#`r1P7(jd<^?=WYsZXcZfrC za)iJB!R~Ggd=ZY&=X1XGM+AB!_d>->)aBGB(h57k#wRs}!L|*x5e)IR$gztb;3nSc zqLyK5niX-Gbs!>eVMF;!8C>5Gi~OFCYBL-&`o$l9J(VpHm)hd#@VpFkglqx zC*VqzN^jNa_T-^yenqp-s`_`v$ZiTktM`HeJ33-TU4EYe#Noq~VVlu~!j`S^DQ+6BY4VR{~BYJ+qZ zF4acpX1Gz?%yauyZM{J2puS;uF`lAsQpOY}p(H-l*FMnA@6Dx#8u~o^p`nVNhW|B$ zXd9GneN$vvt^|MCy1&~97!#k*4ZhgSg%-?XDz5}1S4MKMNb(snGI8p9#m5!+s7wTy!;hy zFgM%%hLBs|TWpe!qNO@$-5m?z-t2V_UU&SSjwP~+tP2`rui?Zm;p*-r{Z&rv+i$Y` zmXCC@w_&vZ$Fvu|>K~TsQRf|y2R6vYvxwi8sEgeT$}r5{MXh`=C|&2!MKzV4$mk+V zq(&5DFWn;ZTxa<1X5MNn&DEmTeASr~nwnw@@b`grbR$^z>~y|I`Hkh@I(}n6g%|oN zb3fYCXQBt-wa&R-GuiCPtjX25Wh8TV=v*l zmk~clyn-+)>o+L9hgd}Dh*uGX2&2~LQ9?Y4URH47B)MsBTrv+*v1CrWOR&B3j8Guf z-6{8qzPnY0q9?x|SLs$bzjuay0KR=yl@IEJE2+T^e{kz5thhd9@Pz#Ql%?a)L%%$qp&Dg=l8 q_P=tG2gjdjXdP+}9yimHF9`C>4*MQ~dd~KKNw8f?o8jf5xBd^PX=0)P diff --git a/app/amazon/__pycache__/main.cpython-312.pyc b/app/amazon/__pycache__/main.cpython-312.pyc index e5f9bdadb57b1b737022f09e0e8975f52047f90f..d385bf61142918d97e988fd19030d306b131c837 100644 GIT binary patch delta 6120 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 s|BcK0Ub9wDioWF#zpJzu$zswsl2e;@Z@A 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 batchErrors = new ArrayList<>(); + int matchedShopCount = 0; + int skippedUnmatchedCount = 0; + int waitingCount = 0; + int assembledCount = 0; + int fallbackMatchedCount = 0; for (FileResultEntity fr : resultRows) { String shopKey = fr.getSourceFilename(); @@ -411,14 +421,17 @@ public class ProductRiskTaskService { // 兼容单店任务：若规范化店名偶发不一致（空格/符号差异）导致未命中，且任务与回传都只有 1 个店时按唯一店回填。 if (payload == null && resultRows.size() == 1 && payloadByShop.size() == 1) { payload = payloadByShop.values().iterator().next(); + fallbackMatchedCount++; log.warn("[product-risk] single-shop fallback matched taskId={} dbShop={} payloadShop={}", taskId, shopKey, payload.getShopName()); } if (payload == null) { + skippedUnmatchedCount++; // 与删除品牌一致：支持队列逐条处理、分次回传，未在本次 payload 中的店铺保持待处理 continue; } + matchedShopCount++; if (payload.getError() != null && !payload.getError().isBlank()) { markResultFailed(fr, payload.getError()); batchErrors.add(shopKey + ": " + payload.getError()); @@ -428,7 +441,16 @@ public class ProductRiskTaskService { // 分次上报累积：合并到 Redis 缓存，再按“合并后是否完成”决定是否出包。 ProductRiskShopPayloadDto mergedPayload = mergeShopPayload(taskId, shopKey, payload); - if (!isShopPayloadCompleted(mergedPayload)) { + boolean shopDone = isShopPayloadCompleted(mergedPayload); + log.info("[product-risk] shop merged taskId={} shop={} incomingDone={} mergedDone={} mergedRows={} payloadCountries={}", + taskId, + shopKey, + payloadHasAnyDoneTrue(payload), + shopDone, + countPayloadRows(mergedPayload), + mergedPayload.getCountries() == null ? 0 : mergedPayload.getCountries().size()); + if (!shopDone) { + waitingCount++; continue; } @@ -451,6 +473,9 @@ public class ProductRiskTaskService { fr.setSuccess(1); fr.setErrorMessage(null); fileResultMapper.updateById(fr); + assembledCount++; + log.info("[product-risk] shop assembled taskId={} shop={} rowCount={} file={}", + taskId, shopKey, fr.getRowCount(), fr.getResultFilename()); FileUtil.del(xlsx); FileUtil.del(zip); productRiskTaskCacheService.removeShopMergedPayload(taskId, shopKey); @@ -708,6 +733,20 @@ public class ProductRiskTaskService { if (row == null) { continue; } + + // 兼容 Python 末次“空行 done=true”心跳：视为当前国家已有行全部完成。 + if (isDoneValue(row.getDone()) && isEmptyBusinessRow(row) && !byKey.isEmpty()) { + for (Map.Entry entry : byKey.entrySet()) { + ProductRiskRowDto existed = entry.getValue(); + ProductRiskRowDto doneMerged = mergeRow(existed, row); + if (doneMerged.getDone() == null || doneMerged.getDone().isBlank()) { + doneMerged.setDone("true"); + } + entry.setValue(doneMerged); + } + continue; + } + String key = buildRowKey(row); ProductRiskRowDto prev = byKey.get(key); byKey.put(key, mergeRow(prev, row)); @@ -760,6 +799,22 @@ public class ProductRiskTaskService { return out; } + private boolean isEmptyBusinessRow(ProductRiskRowDto row) { + if (row == null) { + return true; + } + // 注意：shopName 只是上下文信息，不作为业务行是否为空的判定条件。 + // Python 末次心跳行通常只带 shopName + done=true，其他业务字段为空。 + return isBlank(row.getProductAsinSku()) + && isBlank(row.getRemoveAsin()) + && isBlank(row.getStatus()) + && isBlank(row.getRemoveStatus()); + } + + private boolean isBlank(String val) { + return val == null || val.trim().isEmpty(); + } + private String firstNonBlank(String preferred, String fallback) { if (preferred != null && !preferred.isBlank()) { return preferred; @@ -771,22 +826,61 @@ public class ProductRiskTaskService { if (payload == null || payload.getCountries() == null || payload.getCountries().isEmpty()) { return false; } - boolean hasAnyRow = false; + boolean hasAnyBusinessRow = false; for (List rows : payload.getCountries().values()) { if (rows == null || rows.isEmpty()) { continue; } for (ProductRiskRowDto row : rows) { - if (row == null) { + if (row == null || isEmptyBusinessRow(row)) { continue; } - hasAnyRow = true; + hasAnyBusinessRow = true; if (!isDoneValue(row.getDone())) { return false; } } } - return hasAnyRow; + return hasAnyBusinessRow; + } + + private int countPayloadRows(ProductRiskShopPayloadDto payload) { + if (payload == null || payload.getCountries() == null || payload.getCountries().isEmpty()) { + return 0; + } + int n = 0; + for (List rows : payload.getCountries().values()) { + if (rows == null) { + continue; + } + for (ProductRiskRowDto row : rows) { + if (row == null || isEmptyBusinessRow(row)) { + continue; + } + n++; + } + } + return n; + } + + private boolean payloadHasAnyDoneTrue(ProductRiskShopPayloadDto payload) { + if (payload == null || payload.getCountries() == null) { + return false; + } + for (List rows : payload.getCountries().values()) { + if (rows == null) { + continue; + } + for (ProductRiskRowDto row : rows) { + if (row == null || isEmptyBusinessRow(row)) { + continue; + } + if (isDoneValue(row.getDone())) { + return true; + } + } + } + return false; } private boolean isDoneValue(String value) { diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/dto/ShopManageCreateRequest.java b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/dto/ShopManageCreateRequest.java index 71ccced..b9148a0 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/dto/ShopManageCreateRequest.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/dto/ShopManageCreateRequest.java @@ -13,6 +13,9 @@ public class ShopManageCreateRequest { @NotBlank(message = "店铺名不能为空") private String shopName; + @NotBlank(message = "店铺商城名不能为空") + private String mallName; + @NotBlank(message = "账号不能为空") private String account; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/dto/ShopManageUpdateRequest.java b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/dto/ShopManageUpdateRequest.java index 193b46c..2f2fe5e 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/dto/ShopManageUpdateRequest.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/dto/ShopManageUpdateRequest.java @@ -13,6 +13,9 @@ public class ShopManageUpdateRequest { @NotBlank(message = "店铺名不能为空") private String shopName; + @NotBlank(message = "店铺商城名不能为空") + private String mallName; + @NotBlank(message = "账号不能为空") private String account; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/entity/ShopManageEntity.java b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/entity/ShopManageEntity.java index 5f4c00a..502110c 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/entity/ShopManageEntity.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/entity/ShopManageEntity.java @@ -1,6 +1,7 @@ package com.nanri.aiimage.modules.shopkey.model.entity; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -16,6 +17,8 @@ public class ShopManageEntity { private Long groupId; private String groupName; private String shopName; + @TableField("mall_name") + private String mallName; private String account; private String password; private LocalDateTime createdAt; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/vo/ShopManageCredentialVo.java b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/vo/ShopManageCredentialVo.java index d7dd379..fc4890d 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/vo/ShopManageCredentialVo.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/vo/ShopManageCredentialVo.java @@ -8,6 +8,7 @@ public class ShopManageCredentialVo { private Long groupId; private String groupName; private String shopName; + private String mallName; private String account; private String password; } diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/vo/ShopManageItemVo.java b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/vo/ShopManageItemVo.java index 6967d77..709772a 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/vo/ShopManageItemVo.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/vo/ShopManageItemVo.java @@ -11,6 +11,7 @@ public class ShopManageItemVo { private Long groupId; private String groupName; private String shopName; + private String mallName; private String account; private String password; private String passwordMasked; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/service/ShopManageService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/service/ShopManageService.java index 6aea8b0..661824b 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/service/ShopManageService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/service/ShopManageService.java @@ -57,12 +57,14 @@ Map groupNameById = buildGroupNameMap(rows.stream() public ShopManageItemVo create(ShopManageCreateRequest request) { ShopManageGroupEntity group = shopManageGroupService.getById(request.getGroupId()); String shopName = normalizeRequired(request.getShopName(), "店铺名不能为空"); + String mallName = normalizeRequired(request.getMallName(), "店铺商城名不能为空"); ensureShopNameUnique(shopName, null); ShopManageEntity entity = new ShopManageEntity(); entity.setGroupId(group.getId()); entity.setGroupName(group.getGroupName()); entity.setShopName(shopName); + entity.setMallName(mallName); entity.setAccount(normalizeRequired(request.getAccount(), "账号不能为空")); entity.setPassword(shopCredentialCryptoService.encrypt(normalizeRequired(request.getPassword(), "密码不能为空"))); shopManageMapper.insert(entity); @@ -75,11 +77,13 @@ Map groupNameById = buildGroupNameMap(rows.stream() ShopManageEntity entity = getById(id); ShopManageGroupEntity group = shopManageGroupService.getById(request.getGroupId()); String shopName = normalizeRequired(request.getShopName(), "店铺名不能为空"); + String mallName = normalizeRequired(request.getMallName(), "店铺商城名不能为空"); ensureShopNameUnique(shopName, id); entity.setGroupId(group.getId()); entity.setGroupName(group.getGroupName()); entity.setShopName(shopName); + entity.setMallName(mallName); entity.setAccount(normalizeRequired(request.getAccount(), "账号不能为空")); entity.setPassword(shopCredentialCryptoService.encrypt(normalizeRequired(request.getPassword(), "密码不能为空"))); shopManageMapper.updateById(entity); @@ -105,6 +109,7 @@ Map groupNameById = buildGroupNameMap(rows.stream() vo.setId(entity.getId()); vo.setGroupId(entity.getGroupId()); vo.setShopName(entity.getShopName()); + vo.setMallName(entity.getMallName()); vo.setAccount(entity.getAccount()); vo.setPassword(shopCredentialCryptoService.decrypt(entity.getPassword())); try { @@ -166,6 +171,7 @@ Map groupNameById = buildGroupNameMap(rows.stream() vo.setGroupId(entity.getGroupId()); vo.setGroupName(groupName == null ? "" : groupName); vo.setShopName(entity.getShopName()); + vo.setMallName(entity.getMallName()); vo.setAccount(entity.getAccount()); String masked = entity.getPassword() == null || entity.getPassword().isBlank() ? "" : "******"; // 兼容旧前端字段：password 继续返回脱敏值 diff --git a/backend-java/src/main/resources/db/V16__add_mall_name_to_shop_manage.sql b/backend-java/src/main/resources/db/V16__add_mall_name_to_shop_manage.sql new file mode 100644 index 0000000..8d530d9 --- /dev/null +++ b/backend-java/src/main/resources/db/V16__add_mall_name_to_shop_manage.sql @@ -0,0 +1,17 @@ +SET @db_name = DATABASE(); + +SET @mall_name_col_exists := ( + SELECT COUNT(*) + FROM information_schema.COLUMNS + WHERE TABLE_SCHEMA = @db_name + AND TABLE_NAME = 'biz_shop_manage' + AND COLUMN_NAME = 'mall_name' +); + +SET @sql_add_mall_name_col := IF(@mall_name_col_exists = 0, + 'ALTER TABLE biz_shop_manage ADD COLUMN mall_name VARCHAR(128) NOT NULL DEFAULT '''' COMMENT ''店铺商城名'' AFTER shop_name', + 'SELECT 1' +); +PREPARE stmt_add_mall_name_col FROM @sql_add_mall_name_col; +EXECUTE stmt_add_mall_name_col; +DEALLOCATE PREPARE stmt_add_mall_name_col; diff --git a/backend/__pycache__/config.cpython-312.pyc b/backend/__pycache__/config.cpython-312.pyc index 768411177acb955f3ec17c5ceb48729380f50ebb..7003e12b6bf9047916f6dbe5d7c9de415ec98161 100644 GIT binary patch delta 19 ZcmaFH{fwLIG%qg~0}u#b+Q@Z>6#zJI1zi9D delta 19 ZcmaFH{fwLIG%qg~0}%Ah+{kr@6#zOk1)l%_ diff --git a/backend/blueprints/__pycache__/admin_api.cpython-312.pyc b/backend/blueprints/__pycache__/admin_api.cpython-312.pyc index cc9225fef22717df6c15888586cd489667df620d..7fa3a6a47d45033b4464ed4be400de8df416af58 100644 GIT binary patch delta 1381 zcmaiz{ZCU@7{|}KeZ3djdmCE%LZKaQINaPA)5s4SZ8l=rpg2XtWbvhN{b89!y~VJX zRvFnQCd62uxM}Q?&6rFgZiN;E5yn`|)Z!?DZn7+yf55g9{Kf5;J*QPhn8}*kbDrlp z-}5}@ex7qX2UTAUtBfgwK_K|!f1G=J=3>8b%YZ1NtHS@{4IDosaBtwX#PGlxN`C@( zR}HLAUV}|ZD?I3u;E!aXXpsvqa4ZEOGLfzDTbCWYCq?)@X)jE{0Xchw}K zi)h^oMq!q=j zTtwSJ%3WX@I#{X?2KMf42n6@c>jJH<`wq6X&l~p#LZOa*itG=B-q|C=%rQIH%fr`0 zWrlg4$#=D(Ua5sULruaaJV!qQ2;G7GA2&nvQZ;oz`jSPm8w}b78!4>luE|(Pffa=D z4Nx)ubYA+27iMjhw`^7M7T6qr3J!fzW+@POAybIrjGbtN48gtko!~y@7mLvh>F`}A zt6p{b+`x}G1qt0O`927ER>2!KJ$!LpfZ!1~d^9oz`IoJ*6D0U^q}V3wVwwnT=a&HL zWj;*%1Tb{3hhJ+&=({Y^d;?&PO3SRKzK-!}ZiEu#B07Ex34_b!8BwDF^t+RzvexgFa6yYCC=R zjSwG;VlN`50>LCK=!|CVA~ELcGQP~F z@;MjgknqCI9N`ZpL{)xR1z)bSJY-DI<`~aTFvceM8)wG&uZbMvy6-$$w#;X&ku9hP z&7hq&gMso;l`2Nxv|hHw^!TMLN9gz;gvw^{O!^)Yvz60f+ucpRf&s z4;aJv;~5_Qz6Tkeginv3rd#30%(JlVs#(*7yPS!(s|rW!;oc8H&083FCee89IhB+x zlkMw!tm<}%rZ&)KY}(739jNjq@}>eR+!mZ}!Ek!ITG)-@?P@%OglF(3-b^2$bQjjz zsA<6!C1JUBn?A`tL4|c(VMkWj2^3aUVM!I1LTLfxoI^N(CO#yzE>SsmPJP%#b&D#( zNo*+1sL{>f{o?YDxIT0pFF9X!-qz`wrIkNZae-T|eQ||0ZCX35iFYuuCo3*lme@-( aYVuXR5J7i&h)5rIT;Zc`V^hU3RJ9bp=+dqjneFf8?zPxwt zIrn>e?zx|H`}rhyaGWdp&g~W%e6mNbzP5a3w5WN^Q-mRhUv3!fQ3ie*Ye-Ixts`U( z)*Pyb2hU#ybzFwhISGC~B!Qa<&@{(`GOpm9uTs+ae{}l zN!1rPP4Y8uk~m8ky#&4=uZ6$13u1mELG&_MJE4+tc>Tiwv`n;%e7K_{dZ4q*NWkvJ zQg*}%Hz$Iu5rXmyZQ?VSZWK$6ryvTyw;miUaCH!_t$i zoe6SA0C(?Z7#Q|IX1by#&f;G-&d=Ohu;qZAcL>Dx8?5lj- zeP?_p=v z-QzeIy6uAF-way3FV9C{ex_3V=b8lzXsv^$*@be87JCmZ=40j)Ho+pZAN%smW-fZT zRS6DGZjvo(?63ke4FaesO3n*4DGeyOT8t^N{#30+5NY^U>;3{%Qh)(6tP&Y6W*&I* zUz)BA@kpzXl=lCmj2&=pE`)S6ePKdngulk>(e2z8ROq5tDgU6CC&HUxtq`W zJWii@i+4$m9OH8Fcr~Ga-~`zXv6c1k$G4Kb6?3Uc>5{>cMtJv1#J&e7g2~^nJj{8m zeXTyeMay^&7EV0^u_Zfc!?rzP--|0BPmV5zIsB=A>1DQ!Ky|tTK3WQhFQC?H!xFt% zVgNFW!Q`JyZxHf4ZoJk0BC3(()XFuojsE=%+I)ka%An;Kv;>1@H)tAzt{!0wjn<%` z$vUeeQT@RFeKkfWO87GIjmhiRKD9~ZgwJsd>!s#?(}tn>6bxiFsjNWQXxcC|>)`8b Yv0Pdp)DhE$u~`E*vo}Z!T)Oen-^K5Dga7~l diff --git a/backend/blueprints/admin_api.py b/backend/blueprints/admin_api.py index 1497c40..31a69f4 100644 --- a/backend/blueprints/admin_api.py +++ b/backend/blueprints/admin_api.py @@ -961,6 +961,7 @@ def list_shop_manages(): 'group_id': item.get('groupId'), 'group_name': item.get('groupName') or '', 'shop_name': item.get('shopName') or '', + 'mall_name': item.get('mallName') or '', 'account': item.get('account') or '', 'password': item.get('passwordMasked') or '', 'created_at': (item.get('createdAt') or '').replace('T', ' ')[:16], @@ -984,6 +985,7 @@ def create_shop_manage(): payload = { 'groupId': data.get('group_id'), 'shopName': (data.get('shop_name') or '').strip(), + 'mallName': (data.get('mall_name') or '').strip(), 'account': (data.get('account') or '').strip(), 'password': (data.get('password') or '').strip(), } @@ -1003,6 +1005,7 @@ def create_shop_manage(): 'group_id': item.get('groupId'), 'group_name': item.get('groupName') or '', 'shop_name': item.get('shopName') or '', + 'mall_name': item.get('mallName') or '', 'account': item.get('account') or '', 'password': item.get('password') or '', 'created_at': (item.get('createdAt') or '').replace('T', ' ')[:16], @@ -1018,6 +1021,7 @@ def update_shop_manage(item_id): payload = { 'groupId': data.get('group_id'), 'shopName': (data.get('shop_name') or '').strip(), + 'mallName': (data.get('mall_name') or '').strip(), 'account': (data.get('account') or '').strip(), 'password': (data.get('password') or '').strip(), } @@ -1036,6 +1040,7 @@ def update_shop_manage(item_id): 'id': item.get('id'), 'group_name': item.get('groupName') or '', 'shop_name': item.get('shopName') or '', + 'mall_name': item.get('mallName') or '', 'account': item.get('account') or '', 'password': item.get('password') or '', 'created_at': (item.get('createdAt') or '').replace('T', ' ')[:16], diff --git a/backend/config.py b/backend/config.py index 6692838..97a3eb7 100644 --- a/backend/config.py +++ b/backend/config.py @@ -23,8 +23,8 @@ bucket_path = "nanri-image/" file_url_pre = f"https://{bucket}.oss-cn-hangzhou.aliyuncs.com/" import os -# backend_java_base_url = os.environ.get('BACKEND_JAVA_BASE_URL', 'http://127.0.0.1:18080').rstrip('/') -backend_java_base_url = os.environ.get('BACKEND_JAVA_BASE_URL', 'http://8.136.19.173:18080').rstrip('/') +backend_java_base_url = os.environ.get('BACKEND_JAVA_BASE_URL', 'http://127.0.0.1:18080').rstrip('/') +# backend_java_base_url = os.environ.get('BACKEND_JAVA_BASE_URL', 'http://8.136.19.173:18080').rstrip('/') os.environ['OSS_ACCESS_KEY_ID'] = accessKeyId os.environ['OSS_ACCESS_KEY_SECRET'] = accessKeySecret os.environ['SECRET_KEY'] = "ddffc7c1d02121d9554d7b080b2511b6" diff --git a/backend/web_source/admin.html b/backend/web_source/admin.html index 668b502..d098ab0 100644 --- a/backend/web_source/admin.html +++ b/backend/web_source/admin.html @@ -364,6 +364,10 @@ +
+ + +
@@ -384,6 +388,7 @@ 序号 分组 店铺名 + 店铺商城名 账号 密码 创建时间 @@ -556,6 +561,10 @@
+
+ + +
@@ -1538,16 +1547,16 @@ .then(function(res) { var tbody = document.getElementById('shopManageListBody'); if (!res.success) { - tbody.innerHTML = '加载失败: ' + (res.error || '') + ''; + tbody.innerHTML = '加载失败: ' + (res.error || '') + ''; return; } var items = res.items || []; if (items.length === 0) { - tbody.innerHTML = '暂无店铺'; + tbody.innerHTML = '暂无店铺'; } else { tbody.innerHTML = items.map(function(item, index) { var rowNo = (shopManagePage - 1) * shopManagePageSize + index + 1; - return '' + rowNo + '' + (item.group_name || '') + '' + (item.shop_name || '') + '' + (item.account || '') + '' + (item.password || '') + '' + (item.created_at || '') + '' + (item.updated_at || '') + '' + + return '' + rowNo + '' + (item.group_name || '') + '' + (item.shop_name || '') + '' + (item.mall_name || '') + '' + (item.account || '') + '' + (item.password || '') + '' + (item.created_at || '') + '' + (item.updated_at || '') + '' + ' ' + '' + ''; @@ -1557,7 +1566,7 @@ bindShopManageActions(); }) .catch(function() { - document.getElementById('shopManageListBody').innerHTML = '请求失败'; + document.getElementById('shopManageListBody').innerHTML = '请求失败'; }); } @@ -1568,6 +1577,7 @@ try { item = JSON.parse((btn.dataset.shopManage || '').replace(/"/g, '"')); } catch (e) { item = {}; } document.getElementById('editShopManageId').value = item.id || ''; document.getElementById('editShopManageShopName').value = item.shop_name || ''; + document.getElementById('editShopManageMallName').value = item.mall_name || ''; document.getElementById('editShopManageAccount').value = item.account || ''; document.getElementById('editShopManagePassword').value = item.password || ''; document.getElementById('msgEditShopManage').textContent = ''; @@ -1643,26 +1653,28 @@ document.getElementById('btnCreateShopManage').onclick = function() { var groupId = (document.getElementById('shopManageGroupSelect').value || '').trim(); var shopName = (document.getElementById('shopManageShopName').value || '').trim(); + var mallName = (document.getElementById('shopManageMallName').value || '').trim(); var account = (document.getElementById('shopManageAccount').value || '').trim(); var password = (document.getElementById('shopManagePassword').value || '').trim(); var msgEl = document.getElementById('msgShopManage'); msgEl.textContent = ''; msgEl.className = 'msg'; - if (!groupId || !shopName || !account || !password) { - msgEl.textContent = '请完整填写分组、店铺名、账号、密码'; + if (!groupId || !shopName || !mallName || !account || !password) { + msgEl.textContent = '请完整填写分组、店铺名、店铺商城名、账号、密码'; msgEl.classList.add('err'); return; } fetch('/api/admin/shop-manage', { method: 'POST', headers: { 'Content-Type': 'application/json' }, - body: JSON.stringify({ group_id: Number(groupId), shop_name: shopName, account: account, password: password }) + body: JSON.stringify({ group_id: Number(groupId), shop_name: shopName, mall_name: mallName, account: account, password: password }) }) .then(function(r) { return r.json(); }) .then(function(res) { if (res.success) { document.getElementById('shopManageGroupSelect').value = ''; document.getElementById('shopManageShopName').value = ''; + document.getElementById('shopManageMallName').value = ''; document.getElementById('shopManageAccount').value = ''; document.getElementById('shopManagePassword').value = ''; msgEl.textContent = res.msg || '创建成功'; @@ -1683,20 +1695,21 @@ var itemId = document.getElementById('editShopManageId').value; var groupId = (document.getElementById('editShopManageGroupSelect').value || '').trim(); var shopName = (document.getElementById('editShopManageShopName').value || '').trim(); + var mallName = (document.getElementById('editShopManageMallName').value || '').trim(); var account = (document.getElementById('editShopManageAccount').value || '').trim(); var password = (document.getElementById('editShopManagePassword').value || '').trim(); var msgEl = document.getElementById('msgEditShopManage'); msgEl.textContent = ''; msgEl.className = 'msg'; - if (!groupId || !shopName || !account || !password) { - msgEl.textContent = '请完整填写分组、店铺名、账号、密码'; + if (!groupId || !shopName || !mallName || !account || !password) { + msgEl.textContent = '请完整填写分组、店铺名、店铺商城名、账号、密码'; msgEl.classList.add('err'); return; } fetch('/api/admin/shop-manage/' + itemId, { method: 'PUT', headers: { 'Content-Type': 'application/json' }, - body: JSON.stringify({ group_id: Number(groupId), shop_name: shopName, account: account, password: password }) + body: JSON.stringify({ group_id: Number(groupId), shop_name: shopName, mall_name: mallName, account: account, password: password }) }) .then(function(r) { return r.json(); }) .then(function(res) { diff --git a/frontend-vue/src/pages/brand/components/BrandProductRiskTab.vue b/frontend-vue/src/pages/brand/components/BrandProductRiskTab.vue index 899cde4..d3d648a 100644 --- a/frontend-vue/src/pages/brand/components/BrandProductRiskTab.vue +++ b/frontend-vue/src/pages/brand/components/BrandProductRiskTab.vue @@ -37,6 +37,7 @@
@@ -278,9 +279,18 @@ function isCountrySelected(code: string) { return orderedCountryCodes.value.includes(code) } +function isCountrySelectionLocked(code: string) { + return orderedCountryCodes.value.length === 1 && orderedCountryCodes.value[0] === code +} + function onCountryNativeChange(code: string, e: Event) { const el = e.target as HTMLInputElement | null if (!el) return + if (!el.checked && isCountrySelectionLocked(code)) { + el.checked = true + ElMessage.warning('至少保留 1 个国家') + return + } onCountryToggle(code, el.checked) }