From fd8957d658a8d2880ed550c35ec8005ae3670680 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Fri, 14 Nov 2025 14:30:02 +0800
Subject: [PATCH] =?UTF-8?q?pad=20=E5=B8=83=E5=B1=80=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/admin/PadProdController.java   |  5 --
 .../service/impl/PadProdServiceImpl.java      |  3 +-
 .../mapper/PadProductCategoryDetailMapper.xml | 47 +++++++++++++------
 3 files changed, 34 insertions(+), 21 deletions(-)

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-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/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>