diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopAccountServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopAccountServiceImpl.java index b7603e4ee..1c71d6202 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopAccountServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopAccountServiceImpl.java @@ -244,30 +244,16 @@ public class ShopAccountServiceImpl implements ShopAccountService { } List accountDOS = shopAccountDAO.selectByShopId(shopId); if (CollectionUtils.isEmpty(accountDOS)) { - throw new ServiceException(ErrorCodeEnum.SYSTEM_DATA_ERROR); + return "ZXA8_"+shopInfo.getShopCode(); } Map map = accountDOS.stream().collect(Collectors.toMap(ShopAccountDO::getSystemName, data -> data)); ShopAccountDO shopAccountDO = map.get(ShopAccountEnum.YLS.getSystemName()); if (Objects.isNull(shopAccountDO)) { - throw new ServiceException(ErrorCodeEnum.SYSTEM_DATA_ERROR); + return "ZXA8_"+shopInfo.getShopCode(); } return StringUtil.isEmpty(shopAccountDO.getAccount()) ? shopInfo.getShopCode() : shopAccountDO.getAccount(); } - @Override - public String shopCodeToYlsCode(String shopCode) { - ShopInfoDO shopInfoDO = shopInfoDAO.selectByStoreCode(shopCode); - if (!Objects.isNull(shopInfoDO)) { - return this.shopIdToYlsCode(shopInfoDO.getId()); - } - //查询老店关联表数据 - OldShopDO oldShopDO = oldShopDAO.getByCode(shopCode); - if (Objects.isNull(oldShopDO)) { - throw new ServiceException(ErrorCodeEnum.GET_YLS_CODE_FAIL); - } - return oldShopDO.getYlsShopCode(); - } - @Override @Transactional(rollbackFor = Exception.class) public Boolean handleOldData() { @@ -316,6 +302,20 @@ public class ShopAccountServiceImpl implements ShopAccountService { return true; } + @Override + public String shopCodeToYlsCode(String shopCode) { + ShopInfoDO shopInfoDO = shopInfoDAO.selectByStoreCode(shopCode); + if (!Objects.isNull(shopInfoDO)) { + return this.shopIdToYlsCode(shopInfoDO.getId()); + } + //查询老店关联表数据 + OldShopDO oldShopDO = oldShopDAO.getByCode(shopCode); + if (Objects.isNull(oldShopDO)) { + throw new ServiceException(ErrorCodeEnum.GET_YLS_CODE_FAIL); + } + return oldShopDO.getYlsShopCode(); + } + @Override @Transactional(rollbackFor = Exception.class) public Boolean handleAccountPassword() {