From cd6966ec4167ec9e367f8cef792e2b25d43d4910 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Wed, 16 Jul 2025 10:24:24 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=B0=E7=AE=A1=E5=AE=B6=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E9=97=A8=E5=BA=97=E7=BC=96=E7=A0=81=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/service/impl/SyncDataServiceImpl.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java index 1fa894be2..0ed2d9fba 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java @@ -314,6 +314,11 @@ public class SyncDataServiceImpl implements SyncDataService { if (shopCode.matches("ZX\\d*")) { return "ZX" + shopInfoDO.getShopName(); } + if(shopCode.startsWith("HL")){ + return partnershipSignatorySecondIsNull + ? "HL" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + ")" + : "HL" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + "/"+signFranchiseDO.getPartnershipSignatorySecond()+")"; + } } if (String.valueOf(FranchiseBrandEnum.MZG.getCode()).equals(shopInfoDO.getFranchiseBrand())) { if (shopCode.matches("MZGM\\d*")) { From 5417c9de4d378e491ab1c66596c18a028ebb2ce5 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Wed, 16 Jul 2025 10:31:16 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=96=B0=E7=AE=A1=E5=AE=B6=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E9=97=A8=E5=BA=97=E7=BC=96=E7=A0=81=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cool/store/service/impl/SyncDataServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java index 0ed2d9fba..d870d8eb1 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java @@ -314,7 +314,7 @@ public class SyncDataServiceImpl implements SyncDataService { if (shopCode.matches("ZX\\d*")) { return "ZX" + shopInfoDO.getShopName(); } - if(shopCode.startsWith("HL")){ + if(shopCode.matches("HL\\d*")){ return partnershipSignatorySecondIsNull ? "HL" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + ")" : "HL" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + "/"+signFranchiseDO.getPartnershipSignatorySecond()+")";