Merge branch 'cc_20250716_pushdate' into 'master'
Cc 20250716 pushdate See merge request hangzhou/java/custom_zxjp!130
This commit is contained in:
@@ -314,6 +314,11 @@ public class SyncDataServiceImpl implements SyncDataService {
|
||||
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()+")";
|
||||
}
|
||||
}
|
||||
if (String.valueOf(FranchiseBrandEnum.MZG.getCode()).equals(shopInfoDO.getFranchiseBrand())) {
|
||||
if (shopCode.matches("MZGM\\d*")) {
|
||||
|
||||
Reference in New Issue
Block a user