diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopConfigService.java b/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopConfigService.java index f4f21941c..a7bc942a9 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopConfigService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopConfigService.java @@ -5,7 +5,6 @@ import com.czg.account.entity.ShopInfo; import com.czg.exception.CzgException; import com.mybatisflex.core.service.IService; -import java.io.Serializable; import java.util.List; /** @@ -16,7 +15,7 @@ import java.util.List; */ public interface ShopConfigService extends IService { - ShopInfo getShopInfoAndConfig(Serializable id) throws CzgException; + ShopInfo getShopInfoAndConfig(Long id) throws CzgException; void editStatusByShopIdList(Long mainShopId, Integer isEnable, boolean onyUpValid, String name, String useShopType, List shopIdList); diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopConfigServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopConfigServiceImpl.java index d74b8b2be..e411597cf 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopConfigServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopConfigServiceImpl.java @@ -14,7 +14,6 @@ import jakarta.annotation.Resource; import org.apache.dubbo.config.annotation.DubboService; import org.springframework.cache.annotation.Cacheable; -import java.io.Serializable; import java.util.ArrayList; import java.util.List; import java.util.Set; @@ -37,7 +36,7 @@ public class ShopConfigServiceImpl extends ServiceImpl i @Override public ShopInfo getById(Serializable id) throws CzgException { - return shopConfigService.getShopInfoAndConfig(id); + return shopConfigService.getShopInfoAndConfig((Long) id); } @Override diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkCarouselServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkCarouselServiceImpl.java index a660ce30d..e00c742d9 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkCarouselServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkCarouselServiceImpl.java @@ -36,9 +36,11 @@ public class MkCarouselServiceImpl extends ServiceImpl list = list(queryWrapper); list.forEach(mkCarousel -> { - MiniAppPages miniAppPages = miniAppPageService.getById(mkCarousel.getJumpPageId()); - if (miniAppPages != null) { - mkCarousel.setJumpPagePath(miniAppPages.getPath()); + if (mkCarousel.getJumpPageId() != null) { + MiniAppPages miniAppPages = miniAppPageService.getById(mkCarousel.getJumpPageId()); + if (miniAppPages != null) { + mkCarousel.setJumpPagePath(miniAppPages.getPath()); + } } }); return list;