From f8e4f985f74f84a8943217c8f3db73d1d9e8805e Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Wed, 28 May 2025 18:28:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E9=80=81=E6=95=B0=E6=8D=AE=E6=96=B0?= =?UTF-8?q?=E7=AE=A1=E5=AE=B6=E5=BA=97=E5=90=8D=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SyncDataServiceImpl.java | 37 ++++++++++++++----- 1 file changed, 27 insertions(+), 10 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 b7ae47254..bebd2b97f 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 @@ -137,7 +137,7 @@ public class SyncDataServiceImpl implements SyncDataService { request.setWqfAccount(shopInfo.getShopCode()); request.setDownstreamSystemShopName(shopInfo.getShopName()); if (DownSystemTypeEnum.XGJ.equals(systemType)) { - request.setDownstreamSystemShopName(getXgjShopName(lineInfoDO, shopInfo)); + request.setDownstreamSystemShopName(getXgjShopName(lineInfoDO, shopInfo,signFranchiseDO)); } if (DownSystemTypeEnum.POS.equals(systemType)) { if (buildInformationDO != null) { @@ -274,32 +274,43 @@ public class SyncDataServiceImpl implements SyncDataService { return null; } - public String getXgjShopName(LineInfoDO lineInfoDO, ShopInfoDO shopInfoDO) { + public String getXgjShopName(LineInfoDO lineInfoDO, ShopInfoDO shopInfoDO,SignFranchiseDO signFranchiseDO) { if (StringUtils.isBlank(shopInfoDO.getShopCode())) { return null; } String shopCode = shopInfoDO.getShopCode().trim(); + Boolean partnershipSignatorySecondIsNull = StringUtils.isBlank(signFranchiseDO.getPartnershipSignatorySecond()); if (String.valueOf(FranchiseBrandEnum.ZXJP.getCode()).equals(shopInfoDO.getFranchiseBrand())) { //M10001 if (shopCode.matches("M\\d*")) { - return "MX" + shopInfoDO.getShopName() + "(" + lineInfoDO.getUsername() + ")"; + return partnershipSignatorySecondIsNull + ? "MX" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + ")" + : "MX" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + "/"+signFranchiseDO.getPartnershipSignatorySecond()+")"; } //FS10001 if (shopCode.matches("FS\\d*")) { - return "FS" + shopInfoDO.getShopName() + "(" + lineInfoDO.getUsername() + ")"; + return partnershipSignatorySecondIsNull + ? "FS" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + ")" + : "FS" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + "/"+signFranchiseDO.getPartnershipSignatorySecond()+")"; } // MS10001 if (shopCode.matches("MS\\d*")) { - return "MS" + shopInfoDO.getShopName() + "(" + lineInfoDO.getUsername() + ")"; + return partnershipSignatorySecondIsNull + ? "MS" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + ")" + : "MS" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + "/"+signFranchiseDO.getPartnershipSignatorySecond()+")"; } // S10001 if (shopCode.matches("S\\d*")) { - return shopInfoDO.getShopName() + "(" + lineInfoDO.getUsername() + ")"; + return partnershipSignatorySecondIsNull + ? "S" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + ")" + : "S" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + "/"+signFranchiseDO.getPartnershipSignatorySecond()+")"; } } if (String.valueOf(FranchiseBrandEnum.MZG.getCode()).equals(shopInfoDO.getFranchiseBrand())) { if (shopCode.matches("MZGM\\d*")) { - return FranchiseBrandEnum.MZG.getDesc() + shopInfoDO.getShopName() + "(" + lineInfoDO.getUsername() + ")"; + return partnershipSignatorySecondIsNull + ? "MZGM" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + ")" + : "MZGM" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + "/"+signFranchiseDO.getPartnershipSignatorySecond()+")"; } if (shopCode.matches("MZGS\\d*")) { return FranchiseBrandEnum.MZG.getDesc() + shopInfoDO.getShopName(); @@ -307,13 +318,19 @@ public class SyncDataServiceImpl implements SyncDataService { } if (String.valueOf(FranchiseBrandEnum.ZJS.getCode()).equals(shopInfoDO.getFranchiseBrand())) { if (shopCode.matches("LX\\d*")) { - return "LX" + FranchiseBrandEnum.ZJS.getDesc() + shopInfoDO.getShopName() + "(" + lineInfoDO.getUsername() + ")"; + return partnershipSignatorySecondIsNull + ? "LX" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + ")" + : "LX" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + "/"+signFranchiseDO.getPartnershipSignatorySecond()+")"; } if (shopCode.matches("X\\d*")) { - return "X" + FranchiseBrandEnum.ZJS.getDesc() + shopInfoDO.getShopName() + "(" + lineInfoDO.getUsername() + ")"; + return partnershipSignatorySecondIsNull + ? "X" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + ")" + : "X" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + "/"+signFranchiseDO.getPartnershipSignatorySecond()+")"; } if (shopCode.matches("Q\\d*")) { - return "Q" + FranchiseBrandEnum.ZJS.getDesc() + shopInfoDO.getShopName() + "(" + lineInfoDO.getUsername() + ")"; + return partnershipSignatorySecondIsNull + ? "Q" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + ")" + : "Q" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + "/"+signFranchiseDO.getPartnershipSignatorySecond()+")"; } if (shopCode.matches("Z\\d*")) { return FranchiseBrandEnum.ZJS.getDesc() + shopInfoDO.getShopName();