diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java index 3bad2049a..932ed4a79 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java @@ -259,7 +259,7 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu //如果已经签约 修改之后从新推送数据 ContractCallbackDTO contractCallbackDTO = pushContractRequest(shopInfoDO, request.getShopId()); if (!Objects.isNull(contractCallbackDTO)){ - if (StringUtils.isNoneEmpty(contractCallbackDTO.getStoreCode())){ + if (StringUtils.isNoneEmpty(contractCallbackDTO.getStoreCode())&&StringUtils.isBlank(shopInfoDO.getShopCode())){ shopInfoDO.setShopCode(contractCallbackDTO.getStoreCode()); shopInfoDAO.updateShopInfo(shopInfoDO); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/wallet/impl/WalletServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/wallet/impl/WalletServiceImpl.java index 806c30928..b752e2de1 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/wallet/impl/WalletServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/wallet/impl/WalletServiceImpl.java @@ -582,8 +582,10 @@ public class WalletServiceImpl implements WalletService { oldStoreAccountCreateRequest.setLegalNo(request.getLegalIdCard()); oldStoreAccountCreateRequest.setLegalPhone(request.getLegalPhone()); oldStoreAccountCreateRequest.setLegalIdcardExpireTime(request.getLegalIdCardExpireTime()); - //账户简称使用营业执照名称 - oldStoreAccountCreateRequest.setAccountAliasName(request.getBusinessLicenseName()); + //账户简称使用编码+名称 + String code = StringUtils.isNotBlank(store.getStoreNum())?store.getStoreNum():""; + String name = StringUtils.isNotBlank(store.getMiniProgramOrderStoreName())?store.getMiniProgramOrderStoreName():store.getStoreName(); + oldStoreAccountCreateRequest.setAccountAliasName(code+name); oldStoreAccountCreateRequest.setAccountCardNo(request.getSettlementCard()); oldStoreAccountCreateRequest.setAccountPhone(request.getBankReservedPhone()); oldStoreAccountCreateRequest.setBankNo(request.getBankBranchCode());