suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
shuo.wang
2025-04-13 20:09:23 +08:00
parent c4b6fbc705
commit 0d32d59e4c
1 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java
View File

@@ -582,29 +582,36 @@ public class ShopServiceImpl implements ShopService {
public ShopResponse getShopNameAndCode(Long shopId, Long lineId) { public ShopResponse getShopNameAndCode(Long shopId, Long lineId) {
boolean flag = false; boolean flag = false;
LineInfoDO lineInfoDO = lineInfoDAO.getLineInfo(lineId); LineInfoDO lineInfoDO = lineInfoDAO.getLineInfo(lineId);
MiniShopsResponse shopInfo = shopInfoDAO.currentShopWhetherOpen(shopId,eid); if (lineInfoDO == null){
ShopResponse response = new ShopResponse(); throw new ServiceException(ErrorCodeEnum.LINE_ID_IS_NOT_EXIST);
if (Objects.nonNull(shopInfo)&&StringUtils.isNotBlank(shopInfo.getShopCode())) {
ShopNameAndCodeDTO currentShop = new ShopNameAndCodeDTO();
currentShop.setShopName(shopInfo.getShopName());
currentShop.setShopCode(shopInfo.getShopCode());
response.setCurrentShop(currentShop);
flag = true;
} }
List<MiniShopsResponse> shopList = shopInfoDAO.getShopListSuccessOpen(eid,lineId); ShopResponse response = new ShopResponse();
List<ShopNameAndCodeDTO> list = new ArrayList<>(); if (shopId != null) {
if (CollectionUtils.isNotEmpty(shopList)) { MiniShopsResponse shopInfo = shopInfoDAO.currentShopWhetherOpen(shopId, eid);
for (MiniShopsResponse shopInfoDO : shopList) { if (Objects.nonNull(shopInfo) && StringUtils.isNotBlank(shopInfo.getShopCode())) {
ShopNameAndCodeDTO dto = new ShopNameAndCodeDTO(); ShopNameAndCodeDTO currentShop = new ShopNameAndCodeDTO();
dto.setShopName(shopInfoDO.getShopName()); currentShop.setShopName(shopInfo.getShopName());
dto.setShopCode(shopInfoDO.getShopCode()); currentShop.setShopCode(shopInfo.getShopCode());
list.add(dto); response.setCurrentShop(currentShop);
flag = true;
}
}
List<ShopNameAndCodeDTO> list = new ArrayList<>();
if (lineId != null) {
List<MiniShopsResponse> shopList = shopInfoDAO.getShopListSuccessOpen(eid, lineId);
if (CollectionUtils.isNotEmpty(shopList)) {
for (MiniShopsResponse shopInfoDO : shopList) {
ShopNameAndCodeDTO dto = new ShopNameAndCodeDTO();
dto.setShopName(shopInfoDO.getShopName());
dto.setShopCode(shopInfoDO.getShopCode());
list.add(dto);
}
flag = true;
} }
flag = true;
} }
List<OldShopDO> oldMobile = oldShopDAO.getByMobile(lineInfoDO.getMobile()); List<OldShopDO> oldMobile = oldShopDAO.getByMobile(lineInfoDO.getMobile());
if (CollectionUtils.isNotEmpty(oldMobile)){ if (CollectionUtils.isNotEmpty(oldMobile)) {
for (OldShopDO oldShopDO : oldMobile){ for (OldShopDO oldShopDO : oldMobile) {
ShopNameAndCodeDTO dto = new ShopNameAndCodeDTO(); ShopNameAndCodeDTO dto = new ShopNameAndCodeDTO();
dto.setShopName(oldShopDO.getShopName()); dto.setShopName(oldShopDO.getShopName());
dto.setShopCode(oldShopDO.getShopCode()); dto.setShopCode(oldShopDO.getShopCode());