diff --git a/cash-api/account-server/src/main/java/com/czg/controller/admin/PadProdController.java b/cash-api/account-server/src/main/java/com/czg/controller/admin/PadProdController.java
index 1c004a6ed..d01493e03 100644
--- a/cash-api/account-server/src/main/java/com/czg/controller/admin/PadProdController.java
+++ b/cash-api/account-server/src/main/java/com/czg/controller/admin/PadProdController.java
@@ -1,9 +1,7 @@
 package com.czg.controller.admin;
 
-import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.czg.account.dto.pad.*;
 import com.czg.account.entity.PadLayout;
-import com.czg.account.entity.PadProductCategoryDetail;
 import com.czg.account.service.PadLayoutService;
 import com.czg.account.service.PadProdService;
 import com.czg.annotation.SaAdminCheckPermission;
@@ -12,12 +10,9 @@ import com.czg.sa.StpKit;
 import com.czg.utils.PageUtil;
 import com.mybatisflex.core.paginate.Page;
 import jakarta.annotation.Resource;
-import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Map;
-
 /**
  * pad点餐相关
  * @author Administrator
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 6b174de46..c98237820 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
@@ -3,9 +3,11 @@ package com.czg.account.service;
 import com.czg.account.dto.PageDTO;
 import com.czg.account.dto.shopinfo.*;
 import com.czg.account.entity.ShopInfo;
+import com.czg.exception.CzgException;
 import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.service.IService;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.List;
 
@@ -13,6 +15,8 @@ import java.util.List;
  * @author Administrator
  */
 public interface ShopInfoService extends IService<ShopInfo> {
+
+    ShopInfo getById(Serializable id) throws CzgException;
     Page<ShopInfo> get(PageDTO pageDTO, String shopName, Integer status, Integer isHeadShop);
 
     Page<ShopInfo> getShopByMainId(PageDTO pageDTO, String shopName, Integer status);
@@ -21,7 +25,7 @@ public interface ShopInfoService extends IService<ShopInfo> {
 
     Boolean edit(ShopInfoEditDTO shopInfoEditDTO);
 
-    ShopDetailDTO detail(Long id);
+    ShopDetailDTO detail(Long id) throws CzgException;
 
     ShopInfoByCodeDTO getByCode(String tableCode, String lat, String lng, boolean checkState);
 
@@ -31,7 +35,7 @@ public interface ShopInfoService extends IService<ShopInfo> {
 
     List<ShopBranchSelectDTO> findShopBranch(Long shopId);
 
-    Long getMainIdByShopId(Long shopId);
+    Long getMainIdByShopId(Long shopId) throws CzgException;
 
     List<ShopInfo> getByMainIdOrList(Long mainShopId, List<Long> shopIdList, String shopName);
 
diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/HandoverRecordServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/HandoverRecordServiceImpl.java
index df60d432d..560f7d44d 100644
--- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/HandoverRecordServiceImpl.java
+++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/HandoverRecordServiceImpl.java
@@ -85,6 +85,9 @@ public class HandoverRecordServiceImpl extends ServiceImpl<HandoverRecordMapper,
         LocalDateTime handoverTime = LocalDateTime.now();
         HandoverRecord record = super.getOne(query().eq(HandoverRecord::getShopId, shopId).isNull(HandoverRecord::getHandoverTime));
         HandoverTotalVo data = new HandoverTotalVo();
+        if (record == null) {
+            return data;
+        }
         data.setId(record.getId());
         data.setShopId(record.getShopId());
         data.setShopName(record.getShopName());
diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/PadProdServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/PadProdServiceImpl.java
index d91d183b0..849b4a615 100644
--- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/PadProdServiceImpl.java
+++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/PadProdServiceImpl.java
@@ -107,7 +107,8 @@ public class PadProdServiceImpl implements PadProdService {
         PadDetailDTO padDetailDTO = new PadDetailDTO();
         padDetailDTO.setId(padProductCategory);
         padDetailDTO.setPadLayoutId(padCategory.getPadLayoutId());
-        List<Long> productIds = padProductCategoryDetailMapper.selectListByQuery(new QueryWrapper().eq(PadProductCategoryDetail::getPadProductCategoryId, padProductCategory)).stream().map(PadProductCategoryDetail::getProductId).toList();
+        List<Long> productIds = padProductCategoryDetailMapper.selectListByQuery(new QueryWrapper()
+                .eq(PadProductCategoryDetail::getPadProductCategoryId, padProductCategory)).stream().map(PadProductCategoryDetail::getProductId).toList();
         padDetailDTO.setProductIdList(productIds);
         if (!productIds.isEmpty()) {
             List<ProductVO> products = productRpcService.listAndLowPrice(shopId, productIds);
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 f9c151c6d..03bbe6edd 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
@@ -121,8 +121,6 @@ public class ShopInfoServiceImpl extends ServiceImpl<ShopInfoMapper, ShopInfo> i
         if (isHeadShop != null) {
             queryWrapper.eq(ShopInfo::getIsHeadShop, isHeadShop);
         }
-        CzgResult<SysParamsDTO> shopOrderPayBaseUrl = sysParamsService.getParamsByCode("shop_order_pay_base_url");
-        CzgResult<SysParamsDTO> shopOrderPayBaseUrl2 = sysParamsService.getParamsByCode("ali_account_app_id");
 
         List<ShopInfo> shopAllList = getMapper().selectListByQuery(query().select(ShopInfo::getId, ShopInfo::getShopName));
         Map<Long, String> shopKv = shopAllList.stream().collect(Collectors.toMap(ShopInfo::getId, ShopInfo::getShopName));
@@ -321,7 +319,7 @@ public class ShopInfoServiceImpl extends ServiceImpl<ShopInfoMapper, ShopInfo> i
     }
 
     @Override
-    public ShopDetailDTO detail(Long id) {
+    public ShopDetailDTO detail(Long id) throws CzgException {
         ShopInfo shopInfo = queryChain().eq(ShopInfo::getId, id == null ? StpKit.USER.getShopId() : id).one();
         if (shopInfo == null) {
             throw new CzgException("店铺信息不存在");
diff --git a/cash-service/account-service/src/main/resources/mapper/PadProductCategoryDetailMapper.xml b/cash-service/account-service/src/main/resources/mapper/PadProductCategoryDetailMapper.xml
index 358721332..378f61180 100644
--- a/cash-service/account-service/src/main/resources/mapper/PadProductCategoryDetailMapper.xml
+++ b/cash-service/account-service/src/main/resources/mapper/PadProductCategoryDetailMapper.xml
@@ -6,22 +6,39 @@
 
     <select id="selectPageByKeyAndShopId" resultType="com.czg.account.dto.pad.PadProductCategoryDTO">
         SELECT tb_pad_product_category.id,
-               tb_shop_prod_category.`name`  AS productCategoryName,
-               GROUP_CONCAT(tb_product.NAME) AS productNames,
-               tb_pad_layout.code            AS padLayoutCode,
-               tb_pad_layout.NAME            AS padLayoutName
+        tb_shop_prod_category.id AS productCategoryId,
+        tb_shop_prod_category.`name` AS productCategoryName,
+        tb_pad_layout.code AS padLayoutCode,
+        tb_pad_layout.NAME AS padLayoutName
         FROM tb_pad_product_category
-                 LEFT JOIN tb_pad_product_category_detail
-                           ON tb_pad_product_category.id = tb_pad_product_category_detail.pad_product_category_id
-                 LEFT JOIN tb_shop_prod_category
-                           ON tb_pad_product_category.product_category_id = tb_shop_prod_category.id
-                 LEFT JOIN tb_product ON tb_pad_product_category_detail.product_id = tb_product.id
-                 LEFT JOIN tb_pad_layout ON tb_pad_product_category.pad_layout_id = tb_pad_layout.id
-            where tb_pad_product_category.shop_id=#{shopId}
-                <if test="categoryId != null">
-                    and tb_pad_product_category.product_category_id=#{categoryId}
-                </if>
-        group by tb_pad_product_category.id
+        LEFT JOIN tb_shop_prod_category ON tb_pad_product_category.product_category_id = tb_shop_prod_category.id and tb_shop_prod_category.shop_id=#{shopId}
+
+        LEFT JOIN tb_pad_layout ON tb_pad_product_category.pad_layout_id = tb_pad_layout.id
+        where tb_pad_product_category.shop_id=#{shopId}
+        <if test="categoryId != null">
+            and tb_pad_product_category.product_category_id=#{categoryId}
+        </if>
+        group by tb_pad_product_category.id,tb_pad_product_category.sort
+        order by tb_pad_product_category.sort desc
+    </select>
+
+    <select id="selectPageByKeyAndShopId1" resultType="com.czg.account.dto.pad.PadProductCategoryDTO">
+        SELECT tb_pad_product_category.id,
+        tb_shop_prod_category.id AS productCategoryId,
+        tb_shop_prod_category.`name` AS productCategoryName,
+        #         GROUP_CONCAT(tb_product.NAME) AS productNames,
+        tb_pad_layout.code AS padLayoutCode,
+        tb_pad_layout.NAME AS padLayoutName
+        FROM tb_pad_product_category
+        #         LEFT JOIN tb_pad_product_category_detail ON tb_pad_product_category.id = tb_pad_product_category_detail.pad_product_category_id
+        LEFT JOIN tb_shop_prod_category ON tb_pad_product_category.product_category_id = tb_shop_prod_category.id and tb_shop_prod_category.shop_id=#{shopId}
+        #         LEFT JOIN tb_product ON tb_pad_product_category_detail.product_id = tb_product.id
+        LEFT JOIN tb_pad_layout ON tb_pad_product_category.pad_layout_id = tb_pad_layout.id
+        where tb_pad_product_category.shop_id=#{shopId}
+        <if test="categoryId != null">
+            and tb_pad_product_category.product_category_id=#{categoryId}
+        </if>
+        group by tb_pad_product_category.id,tb_pad_product_category.sort
         order by tb_pad_product_category.sort desc
     </select>