From d8aadb2d4779ccebd040839f05bb7d1bc3571040 Mon Sep 17 00:00:00 2001
From: liyj <1617420630@qq.com>
Date: Tue, 25 Nov 2025 16:23:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=BA=97=E9=93=BA=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/admin/ShopPageAppController.java     | 13 ++++++++++---
 .../page/service/impl/ShopPageAppServiceImpl.java   | 11 +++++++++--
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/page/controller/admin/ShopPageAppController.java b/mall-shop/src/main/java/com/suisung/mall/shop/page/controller/admin/ShopPageAppController.java
index f52f7ea9..db728f64 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/page/controller/admin/ShopPageAppController.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/page/controller/admin/ShopPageAppController.java
@@ -77,6 +77,7 @@ public class ShopPageAppController extends BaseControllerImpl {
         Map data_arr = null;
         JSONArray items_arr =null;
         List<Map> items =null;
+        boolean isNewFlag=false;
         try {
            // data_arr = cloundService.getAppTpl(accountBaseConfigService.getConfig("service_user_id", 0), accountBaseConfigService.getConfig("service_app_key", ""), null);
             if(user.isStore()) {
@@ -89,6 +90,7 @@ public class ShopPageAppController extends BaseControllerImpl {
                     data_arr = (Map)jsonObject.get("data");
                     items_arr = (JSONArray) data_arr.get("items");
                     items = JSONUtil.toList(items_arr, Map.class);
+                    isNewFlag=true;
                 }else {
                     Gson gson = new Gson();
                     String gsonStrList= gson.toJson(shopPageAppList);
@@ -125,9 +127,12 @@ public class ShopPageAppController extends BaseControllerImpl {
                     continue;
                 }
                 //String appId= String.valueOf(item.get("tpl_label"));
-                if (is_use==1&&(shopStoreInfo.getStore_template().equals(tpl_label)||
-                        shopStoreInfo.getStore_template().equals(String.valueOf(item.get("tpl_label"))))) {
+                if(isNewFlag&&shopStoreInfo.getStore_template().equals(String.valueOf(item.get("tpl_label")))){
                     current_tpl = item;
+                }else {
+                    if (is_use==1&&(shopStoreInfo.getStore_template().equals(tpl_label))) {
+                        current_tpl = item;
+                    }
                 }
             } else {
 
@@ -175,7 +180,9 @@ public class ShopPageAppController extends BaseControllerImpl {
             queryWrapper.eq("store_id", 0);
         }
          */
-
+        if(isNewFlag){
+            items=new ArrayList<>();
+        }
         data.put("items", items);
         data.put("current_tpl", current_tpl);
         return CommonResult.success(data);
diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/page/service/impl/ShopPageAppServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/page/service/impl/ShopPageAppServiceImpl.java
index 4141e94a..89ecc618 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/page/service/impl/ShopPageAppServiceImpl.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/page/service/impl/ShopPageAppServiceImpl.java
@@ -665,7 +665,10 @@ public class ShopPageAppServiceImpl extends BaseServiceImpl<ShopPageAppMapper, S
             } else {
                 Map app_row = null;
                 try {
-                    app_row = cloundService.getAppTpl(accountBaseConfigService.getConfig("service_user_id", 0), accountBaseConfigService.getConfig("service_app_key", ""), tpl_id);
+                   // app_row = cloundService.getAppTpl(accountBaseConfigService.getConfig("service_user_id", 0), accountBaseConfigService.getConfig("service_app_key", ""), tpl_id);
+                    String resultStr= accountBaseConfigService.getSystemConfig("service_app_tpl");
+                    JSONObject jsonObject = JSONUtil.parseObj(resultStr);
+                    app_row = (Map)jsonObject.get("data");
                 } catch (Exception e) {
                     throw new RuntimeException(e);
                 }
@@ -733,7 +736,10 @@ public class ShopPageAppServiceImpl extends BaseServiceImpl<ShopPageAppMapper, S
         } else {
             Map app_row = null;
             try {
-                app_row = cloundService.getAppTpl(accountBaseConfigService.getConfig("service_user_id", 0), accountBaseConfigService.getConfig("service_app_key", ""), tpl_id);
+               // app_row = cloundService.getAppTpl(accountBaseConfigService.getConfig("service_user_id", 0), accountBaseConfigService.getConfig("service_app_key", ""), tpl_id);
+                String resultStr= accountBaseConfigService.getSystemConfig("service_app_tpl");
+                JSONObject jsonObject = JSONUtil.parseObj(resultStr);
+                app_row = (Map)jsonObject.get("data");
             } catch (Exception e) {
                 throw new RuntimeException(e);
             }
@@ -780,6 +786,7 @@ public class ShopPageAppServiceImpl extends BaseServiceImpl<ShopPageAppMapper, S
             page_cloud_row.setPage_share_image("");
             page_cloud_row.setPage_qrcode("");
             page_cloud_row.setApp_id(shopPageApp.getApp_id());
+            page_cloud_row.setPage_tpl(shopPageApp.getTpl_id());
 
 
             shopPageBaseService.add(page_cloud_row);