推送数据新管家店名优化
This commit is contained in:
@@ -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();
|
||||
|
||||
Reference in New Issue
Block a user