From 0741e41c69a186b1fbb2b73bf4c0b0f37fd7a35f Mon Sep 17 00:00:00 2001
From: wangff <feifan.wang@hao168.com>
Date: Fri, 24 Oct 2025 16:10:10 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=A1=E7=AE=A1=E5=AE=B6=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=8E=A8=E9=80=81=E9=97=A8=E5=BA=97=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/SyncDataServiceImpl.java     | 36 +++++--------------
 1 file changed, 9 insertions(+), 27 deletions(-)

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 e6c61a1a1..bf79e356f 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
@@ -289,43 +289,31 @@ public class SyncDataServiceImpl implements SyncDataService {
         if (String.valueOf(FranchiseBrandEnum.ZXJP.getCode()).equals(shopInfoDO.getFranchiseBrand())) {
             //M10001
             if (shopCode.matches("M\\d*")) {
-                return partnershipSignatorySecondIsNull
-                        ? "MX" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + ")"
-                        : "MX" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + "/"+signFranchiseDO.getPartnershipSignatorySecond()+")";
+                return "MX" + shopInfoDO.getShopName();
             }
             //FS10001
             if (shopCode.matches("FS\\d*")) {
-                return partnershipSignatorySecondIsNull
-                        ? "FS" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + ")"
-                        : "FS" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + "/"+signFranchiseDO.getPartnershipSignatorySecond()+")";
+                return "FS" + shopInfoDO.getShopName();
             }
             // MS10001
             if (shopCode.matches("MS\\d*")) {
-                return partnershipSignatorySecondIsNull
-                        ? "MS" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + ")"
-                        : "MS" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + "/"+signFranchiseDO.getPartnershipSignatorySecond()+")";
+                return "MS" + shopInfoDO.getShopName();
             }
             // S10001
             if (shopCode.matches("S\\d*")) {
-                return partnershipSignatorySecondIsNull
-                        ? "S" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + ")"
-                        : "S" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + "/"+signFranchiseDO.getPartnershipSignatorySecond()+")";
+                return "S" + shopInfoDO.getShopName();
             }
             // ZX0001
             if (shopCode.matches("ZX\\d*")) {
                 return "ZX" + shopInfoDO.getShopName();
             }
             if(shopCode.matches("HL\\d*")){
-                return partnershipSignatorySecondIsNull
-                        ? "HL" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + ")"
-                        : "HL" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + "/"+signFranchiseDO.getPartnershipSignatorySecond()+")";
+                return "HL" + shopInfoDO.getShopName();
             }
         }
         if (String.valueOf(FranchiseBrandEnum.MZG.getCode()).equals(shopInfoDO.getFranchiseBrand())) {
             if (shopCode.matches("MZGM\\d*")) {
-                return partnershipSignatorySecondIsNull
-                        ? "MZGM" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + ")"
-                        : "MZGM" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + "/"+signFranchiseDO.getPartnershipSignatorySecond()+")";
+                return "MZGM" + shopInfoDO.getShopName();
             }
             if (shopCode.matches("MZGS\\d*")) {
                 return FranchiseBrandEnum.MZG.getDesc() + shopInfoDO.getShopName();
@@ -333,19 +321,13 @@ public class SyncDataServiceImpl implements SyncDataService {
         }
         if (String.valueOf(FranchiseBrandEnum.ZJS.getCode()).equals(shopInfoDO.getFranchiseBrand())) {
             if (shopCode.matches("LX\\d*")) {
-                return partnershipSignatorySecondIsNull
-                        ? "LX" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + ")"
-                        : "LX" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + "/"+signFranchiseDO.getPartnershipSignatorySecond()+")";
+                return "LX" + shopInfoDO.getShopName();
             }
             if (shopCode.matches("X\\d*")) {
-                return partnershipSignatorySecondIsNull
-                        ? "X" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + ")"
-                        : "X" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + "/"+signFranchiseDO.getPartnershipSignatorySecond()+")";
+                return "X" + shopInfoDO.getShopName();
             }
             if (shopCode.matches("Q\\d*")) {
-                return partnershipSignatorySecondIsNull
-                        ? "Q" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + ")"
-                        : "Q" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + "/"+signFranchiseDO.getPartnershipSignatorySecond()+")";
+                return "Q" + shopInfoDO.getShopName();
             }
             if (shopCode.matches("Z\\d*")) {
                 return FranchiseBrandEnum.ZJS.getDesc() + shopInfoDO.getShopName();