diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopInfoService.java b/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopInfoService.java index 560f1dae2..885b6f681 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopInfoService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopInfoService.java @@ -31,4 +31,6 @@ public interface ShopInfoService extends IService { List findShopBranch(Long shopId); Long getMainIdByShopId(Long shopId); + + List getByMainIdOrList(Long mainShopId, List shopIdList, String shopName); } diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java index 42560eb0a..b940b0a8e 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java @@ -428,4 +428,21 @@ public class ShopInfoServiceImpl extends ServiceImpl i return shopInfo.getMainId() == null ? shopId : shopInfo.getMainId(); } + + @Override + public List getByMainIdOrList(Long mainShopId, List shopIdList, String shopName) { + QueryWrapper queryWrapper = new QueryWrapper().like(ShopInfo::getShopName, shopName); + if (shopIdList == null) { + queryWrapper.and(q -> { + q.eq(ShopInfo::getMainId, mainShopId).or(q1 -> { + q1.eq(ShopInfo::getId, mainShopId); + }); + }); + }else { + shopIdList.add(mainShopId); + queryWrapper.in(ShopInfo::getId, shopIdList); + } + + return list(queryWrapper); + } } diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopRechargeServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopRechargeServiceImpl.java index 1928a2961..5429c797f 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopRechargeServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopRechargeServiceImpl.java @@ -225,13 +225,14 @@ public class MkShopRechargeServiceImpl extends ServiceImpl BeanUtil.copyProperties(shop, MkShopRechargeShopListVO.class)) .toList();