From fc8599d36c2daee817d1ecff8dc9ca30d343a8c9 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Wed, 28 Jan 2026 17:07:50 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=A9=BA=E6=8C=87=E9=92=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../market/service/impl/MkCarouselServiceImpl.java        | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

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<MkCarouselMapper, MkCarou
         }
         List<MkCarousel> 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;

From abcd0fbc7b5224ce3ff93d2061254d17906b65f8 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Wed, 28 Jan 2026 17:27:54 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=B8=8D=E7=9F=A5=E9=81=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/czg/account/service/ShopConfigService.java   | 3 +--
 .../service/account/service/impl/ShopConfigServiceImpl.java    | 3 +--
 .../czg/service/account/service/impl/ShopInfoServiceImpl.java  | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

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<ShopConfig> {
 
-    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<Long> 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<ShopConfigMapper, ShopCon
 
     @Override
     @Cacheable(cacheNames = "shopInfo",key = "#id")
-    public ShopInfo getShopInfoAndConfig(Serializable id) throws CzgException {
+    public ShopInfo getShopInfoAndConfig(Long id) throws CzgException {
         ShopInfo shopInfo = shopInfoMapper.selectOneById(id);
         if (shopInfo == null) {
             throw new CzgException("店铺不存在");
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 49ed510e4..112d081c6 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
@@ -83,7 +83,7 @@ public class ShopInfoServiceImpl extends ServiceImpl<ShopInfoMapper, ShopInfo> i
 
     @Override
     public ShopInfo getById(Serializable id) throws CzgException {
-        return shopConfigService.getShopInfoAndConfig(id);
+        return shopConfigService.getShopInfoAndConfig((Long) id);
     }
 
     @Override